obstruct 0.6.0__tar.gz → 0.6.2__tar.gz

{obstruct-0.6.0 → obstruct-0.6.2}/.idea/workspace.xml

@@ -4,29 +4,13 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="b482b6b4-48ce-4be1-bf3c-a72ec254fa35" name="更改" comment="fix: 错误的别名&#10;&#10;+ version: 0.5.2">
-      <change afterPath="$PROJECT_DIR$/BENCHMARK_TEST-v0.6.0.md" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/USAGE.md" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/obstruct/aot/field.py" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/obstruct/aot/schema.py" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/obstruct/schema_methods.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/BENCHMARK_TEST.md" beforeDir="false" afterPath="$PROJECT_DIR$/BENCHMARK_TEST-v0.5.0.md" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/README.md" beforeDir="false" afterPath="$PROJECT_DIR$/README.md" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/pyproject.toml" beforeDir="false" afterPath="$PROJECT_DIR$/pyproject.toml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/obstruct/__init__.py" beforeDir="false" afterPath="$PROJECT_DIR$/src/obstruct/__init__.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/obstruct/aot/__init__.py" beforeDir="false" afterPath="$PROJECT_DIR$/src/obstruct/aot/__init__.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/obstruct/aot/aot.py" beforeDir="false" afterPath="$PROJECT_DIR$/src/obstruct/aot/aot.py" afterDir="false" />
+    <list default="true" id="b482b6b4-48ce-4be1-bf3c-a72ec254fa35" name="更改" comment="fix: 未删除的调试语句&#10;&#10;+ update version to 0.6.1">
+      <change afterPath="$PROJECT_DIR$/test/test_str_field.py" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/obstruct/aot/base.py" beforeDir="false" afterPath="$PROJECT_DIR$/src/obstruct/aot/base.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/obstruct/aot/pack.py" beforeDir="false" afterPath="$PROJECT_DIR$/src/obstruct/aot/pack.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/obstruct/aot/field.py" beforeDir="false" afterPath="$PROJECT_DIR$/src/obstruct/aot/field.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/obstruct/aot/schema.py" beforeDir="false" afterPath="$PROJECT_DIR$/src/obstruct/aot/schema.py" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/obstruct/aot/unpack.py" beforeDir="false" afterPath="$PROJECT_DIR$/src/obstruct/aot/unpack.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/obstruct/metadata_marks.py" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/obstruct/methods.py" beforeDir="false" afterPath="$PROJECT_DIR$/src/obstruct/methods.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/obstruct/struct_type.py" beforeDir="false" afterPath="$PROJECT_DIR$/src/obstruct/struct_type.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/obstruct/types/__init__.py" beforeDir="false" afterPath="$PROJECT_DIR$/src/obstruct/types/__init__.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/obstruct/types/base.py" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/obstruct/types/types.py" beforeDir="false" afterPath="$PROJECT_DIR$/src/obstruct/types/types.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/test/test_speed.py" beforeDir="false" afterPath="$PROJECT_DIR$/test/test_speed.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/uv.lock" beforeDir="false" afterPath="$PROJECT_DIR$/uv.lock" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/obstruct/schema_methods.py" beforeDir="false" afterPath="$PROJECT_DIR$/src/obstruct/schema_methods.py" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -41,6 +25,11 @@
     </option>
   </component>
   <component name="Git.Settings">
+    <option name="RECENT_BRANCH_BY_REPOSITORY">
+      <map>
+        <entry key="$PROJECT_DIR$" value="cce909ac291c4d0b7cb243ecf0dc4845dd8cc422" />
+      </map>
+    </option>
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
   </component>
   <component name="GitHubPullRequestSearchHistory">{
@@ -64,35 +53,38 @@
     <option name="hideEmptyMiddlePackages" value="true" />
     <option name="showLibraryContents" value="true" />
   </component>
-  <component name="PropertiesComponent">{
-  &quot;keyToString&quot;: {
-    &quot;ModuleVcsDetector.initialDetectionPerformed&quot;: &quot;true&quot;,
-    &quot;Python.test.executor&quot;: &quot;Run&quot;,
-    &quot;Python.test_gen_from_schema.executor&quot;: &quot;Run&quot;,
-    &quot;Python.test_speed.executor&quot;: &quot;Run&quot;,
-    &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
-    &quot;RunOnceActivity.git.unshallow&quot;: &quot;true&quot;,
-    &quot;RunOnceActivity.typescript.service.memoryLimit.init&quot;: &quot;true&quot;,
-    &quot;codeWithMe.voiceChat.enabledByDefault&quot;: &quot;false&quot;,
-    &quot;git-widget-placeholder&quot;: &quot;main&quot;,
-    &quot;last_opened_file_path&quot;: &quot;E:/.projects/obstruct&quot;,
-    &quot;node.js.detected.package.eslint&quot;: &quot;true&quot;,
-    &quot;node.js.detected.package.jshint&quot;: &quot;true&quot;,
-    &quot;node.js.detected.package.tslint&quot;: &quot;true&quot;,
-    &quot;node.js.selected.package.eslint&quot;: &quot;(autodetect)&quot;,
-    &quot;node.js.selected.package.jshint&quot;: &quot;&quot;,
-    &quot;node.js.selected.package.tslint&quot;: &quot;(autodetect)&quot;,
-    &quot;nodejs_package_manager_path&quot;: &quot;npm&quot;,
-    &quot;settings.editor.selected.configurable&quot;: &quot;editing.templates&quot;
+  <component name="PropertiesComponent"><![CDATA[{
+  "keyToString": {
+    "ModuleVcsDetector.initialDetectionPerformed": "true",
+    "Python.test.executor": "Run",
+    "Python.test_gen_from_schema.executor": "Run",
+    "Python.test_new.executor": "Run",
+    "Python.test_s_and_x.executor": "Run",
+    "Python.test_speed.executor": "Run",
+    "Python.test_str_field.executor": "Run",
+    "RunOnceActivity.ShowReadmeOnStart": "true",
+    "RunOnceActivity.git.unshallow": "true",
+    "RunOnceActivity.typescript.service.memoryLimit.init": "true",
+    "codeWithMe.voiceChat.enabledByDefault": "false",
+    "git-widget-placeholder": "main",
+    "last_opened_file_path": "E:/.projects/obstruct",
+    "node.js.detected.package.eslint": "true",
+    "node.js.detected.package.jshint": "true",
+    "node.js.detected.package.tslint": "true",
+    "node.js.selected.package.eslint": "(autodetect)",
+    "node.js.selected.package.jshint": "",
+    "node.js.selected.package.tslint": "(autodetect)",
+    "nodejs_package_manager_path": "npm",
+    "settings.editor.selected.configurable": "editing.templates"
   }
-}</component>
+}]]></component>
   <component name="RecentsManager">
     <key name="MoveFile.RECENT_KEYS">
       <recent name="E:\.projects\obstruct\src\obstruct" />
       <recent name="E:\.projects\obstruct\src\obstruct\aot" />
     </key>
   </component>
-  <component name="RunManager" selected="Python.test">
+  <component name="RunManager" selected="Python.test_str_field">
     <configuration name="test" type="PythonConfigurationType" factoryName="Python" temporary="true" nameIsGenerated="true">
       <module name="obstruct" />
       <option name="ENV_FILES" value="" />
@@ -151,6 +143,30 @@
       <option name="INPUT_FILE" value="" />
       <method v="2" />
     </configuration>
+    <configuration name="test_s_and_x" type="PythonConfigurationType" factoryName="Python" temporary="true" nameIsGenerated="true">
+      <module name="obstruct" />
+      <option name="ENV_FILES" value="" />
+      <option name="INTERPRETER_OPTIONS" value="" />
+      <option name="PARENT_ENVS" value="true" />
+      <envs>
+        <env name="PYTHONUNBUFFERED" value="1" />
+      </envs>
+      <option name="SDK_HOME" value="" />
+      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/test" />
+      <option name="IS_MODULE_SDK" value="true" />
+      <option name="ADD_CONTENT_ROOTS" value="true" />
+      <option name="ADD_SOURCE_ROOTS" value="true" />
+      <option name="DEBUG_JUST_MY_CODE" value="false" />
+      <option name="RUN_TOOL" value="" />
+      <option name="SCRIPT_NAME" value="$PROJECT_DIR$/test/test_s_and_x.py" />
+      <option name="PARAMETERS" value="" />
+      <option name="SHOW_COMMAND_LINE" value="false" />
+      <option name="EMULATE_TERMINAL" value="false" />
+      <option name="MODULE_MODE" value="false" />
+      <option name="REDIRECT_INPUT" value="false" />
+      <option name="INPUT_FILE" value="" />
+      <method v="2" />
+    </configuration>
     <configuration name="test_speed" type="PythonConfigurationType" factoryName="Python" temporary="true" nameIsGenerated="true">
       <module name="obstruct" />
       <option name="ENV_FILES" value="" />
@@ -175,11 +191,37 @@
       <option name="INPUT_FILE" value="" />
       <method v="2" />
     </configuration>
+    <configuration name="test_str_field" type="PythonConfigurationType" factoryName="Python" temporary="true" nameIsGenerated="true">
+      <module name="obstruct" />
+      <option name="ENV_FILES" value="" />
+      <option name="INTERPRETER_OPTIONS" value="" />
+      <option name="PARENT_ENVS" value="true" />
+      <envs>
+        <env name="PYTHONUNBUFFERED" value="1" />
+      </envs>
+      <option name="SDK_HOME" value="" />
+      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/test" />
+      <option name="IS_MODULE_SDK" value="true" />
+      <option name="ADD_CONTENT_ROOTS" value="true" />
+      <option name="ADD_SOURCE_ROOTS" value="true" />
+      <option name="DEBUG_JUST_MY_CODE" value="false" />
+      <option name="RUN_TOOL" value="" />
+      <option name="SCRIPT_NAME" value="$PROJECT_DIR$/test/test_str_field.py" />
+      <option name="PARAMETERS" value="" />
+      <option name="SHOW_COMMAND_LINE" value="false" />
+      <option name="EMULATE_TERMINAL" value="false" />
+      <option name="MODULE_MODE" value="false" />
+      <option name="REDIRECT_INPUT" value="false" />
+      <option name="INPUT_FILE" value="" />
+      <method v="2" />
+    </configuration>
     <recent_temporary>
       <list>
-        <item itemvalue="Python.test" />
+        <item itemvalue="Python.test_str_field" />
+        <item itemvalue="Python.test_s_and_x" />
         <item itemvalue="Python.test_speed" />
         <item itemvalue="Python.test_gen_from_schema" />
+        <item itemvalue="Python.test" />
       </list>
     </recent_temporary>
   </component>
@@ -414,7 +456,23 @@
       <option name="project" value="LOCAL" />
       <updated>1787044545927</updated>
     </task>
-    <option name="localTasksCounter" value="28" />
+    <task id="LOCAL-00028" summary="refactor: 优化数组和复杂结构体的解析性能，将 AOT 重写数据驱动&#10;&#10;+ update version to 0.6.0&#10;+ 更新测速脚本，添加新的性能测试信息&#10;+ 更新 README.md&#10;- 移除了旧的 metadata_marks.py，全面转向新的 Meta 元数据类型">
+      <option name="closed" value="true" />
+      <created>1788678016647</created>
+      <option name="number" value="00028" />
+      <option name="presentableId" value="LOCAL-00028" />
+      <option name="project" value="LOCAL" />
+      <updated>1788678016647</updated>
+    </task>
+    <task id="LOCAL-00029" summary="fix: 未删除的调试语句&#10;&#10;+ update version to 0.6.1">
+      <option name="closed" value="true" />
+      <created>1788678088267</created>
+      <option name="number" value="00029" />
+      <option name="presentableId" value="LOCAL-00029" />
+      <option name="project" value="LOCAL" />
+      <updated>1788678088267</updated>
+    </task>
+    <option name="localTasksCounter" value="30" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -432,8 +490,6 @@
     </option>
   </component>
   <component name="VcsManagerConfiguration">
-    <MESSAGE value="增强类型系统，撰写 README.md" />
-    <MESSAGE value="补充：基准测试脚本" />
     <MESSAGE value="修正了一些命名" />
     <MESSAGE value="增强 array 类型的支持" />
     <MESSAGE value="增强 array 类型的支持 x2" />
@@ -457,6 +513,8 @@
     <MESSAGE value="fix: 未删除的调试语句" />
     <MESSAGE value="fix: 未删除的调试语句&#10;&#10;+ version: 0.5.1" />
     <MESSAGE value="fix: 错误的别名&#10;&#10;+ version: 0.5.2" />
-    <option name="LAST_COMMIT_MESSAGE" value="fix: 错误的别名&#10;&#10;+ version: 0.5.2" />
+    <MESSAGE value="refactor: 优化数组和复杂结构体的解析性能，将 AOT 重写数据驱动&#10;&#10;+ update version to 0.6.0&#10;+ 更新测速脚本，添加新的性能测试信息&#10;+ 更新 README.md&#10;- 移除了旧的 metadata_marks.py，全面转向新的 Meta 元数据类型" />
+    <MESSAGE value="fix: 未删除的调试语句&#10;&#10;+ update version to 0.6.1" />
+    <option name="LAST_COMMIT_MESSAGE" value="fix: 未删除的调试语句&#10;&#10;+ update version to 0.6.1" />
   </component>
 </project>

{obstruct-0.6.0 → obstruct-0.6.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: obstruct
-Version: 0.6.0
+Version: 0.6.2
 Author-email: LittleNightSong <LittleNightSongYO@outlook.com>
 License-File: LICENSE
 Classifier: Development Status :: 3 - Alpha

obstruct-0.6.2/src/obstruct/__version__.py

@@ -0,0 +1 @@
+version = "0.6.2"

{obstruct-0.6.0 → obstruct-0.6.2}/src/obstruct/aot/base.py

@@ -106,10 +106,45 @@ class for_stmt(_objective_node_operator):
 
 
 def name_generator(prefix='var_'):
-    cnt = 1
-    while True:
-        yield f'{prefix}{cnt}'
-        cnt += 1
+    return NameGenerator(prefix=prefix)
+
+
+class NameGenerator:
+    __slots__ = ['_prefix', '_cnt']
+
+    def __init__(self, prefix='var_'):
+        self._prefix = prefix
+        self._cnt = 0
+
+    @property
+    def prefix(self):
+        return self._prefix
+
+    @property
+    def cnt(self):
+        return self._cnt
+
+    def next(self):
+        self._cnt += 1
+        return f'{self._prefix}{self._cnt}'
+
+    def peek(self):
+        return f'{self._prefix}{self._cnt + 1}'
+
+    def pop(self):
+        self._cnt -= 1
+
+    def new(self):
+        return self.next()
+
+    def __call__(self):
+        return self.next()
+
+    def __next__(self):
+        return self.next()
+
+    def __iter__(self):
+        return self
 
 
 def to_tuple_expression(names, prefix='self.'):

{obstruct-0.6.0 → obstruct-0.6.2}/src/obstruct/aot/field.py

@@ -10,17 +10,17 @@ class Meta:
     # 基本控制标志
     not_a_field: bool = False
 
-    # 针对字符串的控制标志
-    encoding: str = 'utf-8'
+    # 针对字符串的控制参数
+    encoding: str | None = None
 
-    # 针对字节串的控制标志
+    # 针对字节串的控制参数
     trunc_nul: bool = False
 
-    # 针对数组类型的控制标志
+    # 针对数组类型的控制参数
     len: int = 0
     dtype: typing.Any = None
 
-    # 针对结构体类型的控制标志
+    # 针对结构体类型的控制参数
     unsafe_create: bool = False
 
 

{obstruct-0.6.0 → obstruct-0.6.2}/src/obstruct/aot/pack.py

@@ -66,8 +66,8 @@ def create_pack_methods(schema: StructType):
 
         # pack.add_return(f"_pack({expression})")
 
-        print("Pack\n", pack.generate_code(), sep='', end='\n\n')  # Debug
-        print("Pack Into\n", pack_into.generate_code(), sep='', end='\n\n')  # Debug
+        # print("Pack\n", pack.generate_code(), sep='', end='\n\n')  # Debug
+        # print("Pack Into\n", pack_into.generate_code(), sep='', end='\n\n')  # Debug
 
         format = schema.full_format_string
         # print("Final Struct Format string:", format)

{obstruct-0.6.0 → obstruct-0.6.2}/src/obstruct/aot/schema.py

@@ -71,7 +71,6 @@ class BasicType:
         from obstruct.types import force_endian
         return struct.calcsize(force_endian(self.format_string, endian='native'))
 
-
 @dataclass(slots=True)
 class ArrayType:
     dtype: str
@@ -96,5 +95,9 @@ class ArrayType:
     def format_string(self):
         return f'{self.size}s'
 
+    @property
+    def padmode_format_string(self):
+        return f'{self.size}x'
+
 
 SchemaTypes = StructType | UnionType | BasicType | ArrayType

{obstruct-0.6.0 → obstruct-0.6.2}/src/obstruct/aot/unpack.py

@@ -6,8 +6,8 @@ import struct
 import typing
 
 from .base import name_generator, function_def, for_stmt
-from .schema import StructType, ArrayType, BasicType
 from .field import Meta
+from .schema import StructType, ArrayType, BasicType
 
 if typing.TYPE_CHECKING:
     pass
@@ -57,44 +57,49 @@ def create_unpack_methods(schema: StructType, meta: Meta = Meta()):
 
         array_fields = []
         post_inits = []
+        post_patches: list[str] = []
+        rewrites: list[tuple[str, str]] = []
         ctx = {}
 
         def walk(
                 *,
-                schema: StructType,
-                meta: Meta,
-                absolute_xpath: tuple[str, ...],
-                name: str = 'self',
-                parent_xname=None,
-                current_unique_type_name='cls',
-                offset=0
+                schema: StructType,  # 当前处理的结构体的规格对象
+                meta: Meta,  # 附加其上的元数据
+                absolute_xpath: tuple[str, ...],  # 未经过修饰的字段路径（至当前字段）
+                name: str = 'self',  # 当前处理的结构体对象被分配的临时变量名称
+                parent_xname=None,  # 其父结构体对象被分配的临时变量名称
+                current_unique_type_name='cls',  # 结构体的类型名
+                offset=0  # 字段绝对偏移量（从根结构体开始）
         ):
 
             base = 'object' if meta.unsafe_create else current_unique_type_name
 
-            new_method_alias = f'{base}.__new__({current_unique_type_name})'
+            new_object_call = f'{base}.__new__({current_unique_type_name})'
 
-            # ctx[new_method_alias] = lambda tobj=current_type_obj: tobj.__new__(tobj)
+            # ctx[new_object_call] = lambda tobj=current_type_obj: tobj.__new__(tobj)
 
             if len(absolute_xpath) > 1:  # 在处理内嵌的结构体
+                # 需要分配临时变量储存新对象，减少 getattr 和 setattr 开销
                 current_field_name = absolute_xpath[-1]
 
                 update_add_code(f"{name} = {parent_xname}.{current_field_name}")
                 unpack_add_code(
-                    f"{parent_xname}.{current_field_name} = {name} = {new_method_alias}")  # 组合赋值
+                    f"{parent_xname}.{current_field_name} = {name} = {new_object_call}"
+                )  # 组合赋值
             else:
-                unpack_add_code(f"{name} = {new_method_alias}")  # 不需要临时变量存储根对象
+                unpack_add_code(f"{name} = {new_object_call}")  # 不需要临时变量存储根对象
                 # update 在这里不需要创建新对象
 
-            post_inits.append((name, schema.type_obj))
+            post_inits.append((name, schema.type_obj))  # 对于每个结构体，都可能需要调用后处理钩子，这里只添加。
 
             for field in schema.fields:  # 遍历字段
                 field_xpath = f'{name}.{field.name}'
+                m = field.meta
 
                 match field.type:
                     case StructType() as s:
-                        if s.type_obj not in inner_classes:
-                            typename = next(type_vars)
+                        if s.type_obj not in inner_classes:  # 如果这个类型不在类型映射中，那么添加到里面，同时分配类名变量
+                            typename = type_vars.new()
                             inner_classes[s.type_obj] = typename
                         else:
                             typename = inner_classes[s.type_obj]
@@ -116,10 +121,10 @@ def create_unpack_methods(schema: StructType, meta: Meta = Meta()):
                         dtype = a.dtype
                         nbytes = a.size
 
-                        array_name = next(tmp_vars)
+                        array_name = tmp_vars.new()
 
                         array_fields.append(
-                            (array_name, next(tmp_vars), field_xpath, dtype)
+                            (array_name, tmp_vars.new(), field_xpath, dtype)
                         )
 
                         assigns.append(array_name)
@@ -127,15 +132,33 @@ def create_unpack_methods(schema: StructType, meta: Meta = Meta()):
                         offset += nbytes
 
                     case BasicType() as b:
-                        assigns.append(field_xpath)
                         offset += b.size
 
+                        if m.trunc_nul:
+                            assigns.append(var := tmp_vars.new())
+
+                            if not m.encoding:
+                                post_patches.append(fr'{var} = {var}.rstrip(b"\x00")')
+                            else:
+                                post_patches.append(fr'{var} = {var}.rstrip(b"\x00").decode({m.encoding!r})')
+
+                            rewrites.append((var, field_xpath))
+
+                        elif m.encoding:
+                            assigns.append(var := tmp_vars.new())
+
+                            post_patches.append(fr'{var} = {var}.decode({m.encoding!r})')
+                            rewrites.append((var, field_xpath))
+
+                        else:
+                            assigns.append(field_xpath)
+
                     case x:
                         raise TypeError(f"Unexpected schema {x}")
 
         walk(
             schema=schema, meta=meta,
-            absolute_xpath=('self', ),
+            absolute_xpath=('self',),
         )
 
         assigns_expr = ', '.join(assigns)
@@ -148,7 +171,7 @@ def create_unpack_methods(schema: StructType, meta: Meta = Meta()):
         iter_unpack_inner.add_code(assign_code)
         iter_update_inner.add_code(assign_code)
 
-        assign_code = f"{assigns_expr} = _unpack_from(buffer, offset)"  # 生成 xxx_from 的赋值语句
+        assign_code = f"{assigns_expr} = _unpack_from(buffer, offset)"  # 生成 unpack_from 的赋值语句
         unpack_from.add_code(assign_code)
         update_from.add_code(assign_code)
 
@@ -204,6 +227,18 @@ def create_unpack_methods(schema: StructType, meta: Meta = Meta()):
             )
             node.target = ast.Name('values', ast.Store())
 
+        for i in post_patches:
+            batch_add_code(
+                [unpack, unpack_from, iter_unpack_inner, iter_update_inner, update, update_from],
+                i
+            )
+
+        for src, dst in rewrites:
+            batch_add_code(
+                [unpack, unpack_from, iter_unpack_inner, iter_update_inner, update, update_from],
+                f'{dst} = {src}'
+            )
+
         for field_xpath, type_obj in reversed(post_inits):
             if hasattr(type_obj, '__post_unpack__'):
                 batch_add_code(
@@ -224,15 +259,15 @@ def create_unpack_methods(schema: StructType, meta: Meta = Meta()):
         iter_unpack_inner.add_code('yield self')
         iter_update_inner.add_code('yield self')
 
-        for _, array_obj_var, *_ in array_fields:
+        for _, array_obj_var, *_ in array_fields:  # 对于 iter update，每次返回完需要清理已有的数据，才能进行下一次的填充
             iter_update_inner.add_code(f'{array_obj_var}.clear()')
 
-        print("Unpack\n", unpack.generate_code(), sep='', end='\n\n')
-        print("Update\n", update.generate_code(), sep='', end='\n\n')
-        print("Unpack_from\n", unpack_from.generate_code(), sep='', end='\n\n')
-        print("Update_from\n", update_from.generate_code(), sep='', end='\n\n')
-        print("Iter_unpack\n", iter_unpack.generate_code(), sep='', end='\n\n')
-        print("Iter_update\n", iter_update.generate_code(), sep='', end='\n\n')
+        # print("Unpack\n", unpack.generate_code(), sep='', end='\n\n')
+        # print("Update\n", update.generate_code(), sep='', end='\n\n')
+        # print("Unpack_from\n", unpack_from.generate_code(), sep='', end='\n\n')
+        # print("Update_from\n", update_from.generate_code(), sep='', end='\n\n')
+        # print("Iter_unpack\n", iter_unpack.generate_code(), sep='', end='\n\n')
+        # print("Iter_update\n", iter_update.generate_code(), sep='', end='\n\n')
 
         generated_struct = struct.Struct(schema.full_format_string)
 

{obstruct-0.6.0 → obstruct-0.6.2}/src/obstruct/schema_methods.py

@@ -1,4 +1,5 @@
 import array
+import builtins
 import sys
 from typing import get_origin, Annotated, get_args
 
@@ -34,6 +35,7 @@ def parse_annotation(anno, disallow_custom_type=False) -> tuple[ArrayType | Basi
 
             if hasattr(dtype, '__obstruct_schema__'):
                 dt = dtype.__obstruct_schema__
+                assert isinstance(dt, BasicType)
 
             elif dtype in builtins_type_mapping:
                 dt = builtins_type_mapping[dtype]
@@ -48,6 +50,14 @@ def parse_annotation(anno, disallow_custom_type=False) -> tuple[ArrayType | Basi
                 meta.len
             ), meta
 
+        case builtins.str:
+            meta.encoding = 'utf-8'
+            return BasicType(f'{meta.len}s'), meta
+
+
+        case builtins.bytes:
+            return BasicType(f'{meta.len}s'), meta
+
         case t if hasattr(t, '__obstruct_schema__'):
             schema = t.__obstruct_schema__
 

obstruct-0.6.2/test/test_new.py

@@ -0,0 +1,53 @@
+def test_timeit(name, code, extra=''):
+    import timeit
+    import time
+    import dis
+
+    print()
+    print("Test: ", name)
+
+    code_obj = compile(code, '<string>', 'exec')
+
+    print("ByteCode for this Test")
+    dis.dis(code_obj)
+
+    res = timeit.repeat(
+        code,
+        number=NUMBER,
+        repeat=REPEAT,
+        timer=time.perf_counter_ns,
+        globals=globals(),
+
+    )
+
+
+    original_samples_len = len(res)
+
+    for i in range(TRIM_COUNT):
+        res.remove(max(res))
+        res.remove(min(res))
+
+    print("Original samples: ", original_samples_len)
+    print("Final samples:", len(res))
+
+    print(f'{NUMBER} steps finished in {sum(res) / (len(res)):.3f} ns in average. ({sum(res) / (len(res)) / NUMBER:.3f} ns per step)')
+
+    exec(extra, globals=globals()) if extra else None
+
+
+
+NUMBER = 100000
+TRIM_COUNT = 10
+REPEAT = 100
+
+
+new = object.__new__
+
+
+class MyObject: ...
+
+
+test_timeit('Call Directly', 'new(MyObject)')
+test_timeit('Call from This Type', 'MyObject.__new__(MyObject)')
+test_timeit('Call from object base', 'object.__new__(MyObject)')
+

obstruct-0.6.2/test/test_s_and_x.py

@@ -0,0 +1,52 @@
+import time
+from array import array
+
+
+def test_timeit(name, code, extra=''):
+    import timeit
+
+    res = timeit.repeat(
+        code,
+        number=NUMBER,
+        repeat=REPEAT,
+        timer=time.perf_counter_ns,
+        globals=globals()
+    )
+
+    print()
+
+    original_samples_len = len(res)
+
+    for i in range(TRIM_COUNT):
+        res.remove(max(res))
+        res.remove(min(res))
+
+    print("Test: ", name)
+    print("Original samples: ", original_samples_len)
+    print("Final samples:", len(res))
+
+    print(f'{NUMBER} steps finished in {sum(res) / (len(res)):.3f} ns in average. ({sum(res) / (len(res)) / NUMBER:.3f} ns per step)')
+
+    exec(extra, globals=globals()) if extra else None
+
+
+# print("\n\nMyStruct:", MyStruct.__cstruct__.size)
+
+NUMBER = 1000
+REPEAT = 256
+TRIM_COUNT = 32
+
+import struct
+
+s1 = struct.Struct('i400si')
+s2 = struct.Struct('i400xi')
+
+data1 = memoryview(b'\x01' * s1.size)
+data2 = memoryview(b'\x02' * s2.size)
+
+
+test_timeit('string', "_, a, _ = s1.unpack(data1); array('i').frombytes(a)")
+test_timeit('pad', "s2.unpack(data2); array('i').frombytes(data2[4:-4])")
+
+
+

obstruct-0.6.2/test/test_str_field.py

@@ -0,0 +1,21 @@
+import dataclasses
+from typing import Annotated
+
+from obstruct import Struct, Meta
+
+
+@dataclasses.dataclass()
+class SomeStruct(Struct):
+    a: Annotated[bytes, Meta(len=10, trunc_nul=True)]
+    b: Annotated[str, Meta(len=10, trunc_nul=True)]
+
+
+SomeStruct.__compile_struct__()
+
+
+
+data = b'12345'.ljust(10, b'\x00') + '你好'.encode().ljust(10, b'\x00')
+print(len(data), data)
+
+print(SomeStruct.unpack_from(data))
+

obstruct-0.6.2/v0.5.2-speed-log.log

@@ -0,0 +1,137 @@
+"D:\Program Files\uv\uv.exe" run E:/.projects/obstruct/.venv/Scripts/python.exe E:\.projects\obstruct\test\test_speed.py
+@classmethod
+def unpack(cls, buffer):
+    self = __new__(cls)
+    self.a, self.b, self.c, self.d, self.e, self.f, self.g, self.h, self.i, self.j, self.k, self.l = _unpack(buffer)
+    return self
+@classmethod
+def unpack(cls, buffer):
+    buffer = memoryview(buffer)
+    self = __new__(cls)
+    self.x = B = __new__(A)
+    self.z = D = __new__(A)
+    B.a, B.b, B.c, B.d, B.e, B.f, B.g, B.h, B.i, B.j, B.k, B.l, D.a, D.b, D.c, D.d, D.e, D.f, D.g, D.h, D.i, D.j, D.k, D.l = _unpack(buffer)
+    self.y = _ = array('i')
+    _.frombytes(buffer[42:442])
+    B.__post_unpack__()
+    D.__post_unpack__()
+    return self
+MyStruct size 42
+AnotherStruct size 484
+AnotherStruct: 484
+
+
+
+Test:  Pack
+Results Length: 64
+1000 steps finished in 241676.562 ns
+Average: 241.677 ns per step
+
+
+Post Hook Called: False
+
+Test:  Unpack
+Results Length: 64
+1000 steps finished in 574932.812 ns
+Average: 574.933 ns per step
+
+
+Post Hook Called: False
+
+Test:  Complex Pack
+Results Length: 64
+1000 steps finished in 1274254.688 ns
+Average: 1274.255 ns per step
+
+
+Post Hook Called: False
+
+Test:  Complex Unpack
+Results Length: 64
+1000 steps finished in 1800114.062 ns
+Average: 1800.114 ns per step
+
+
+Post Hook Called: True
+
+Test:  Update
+Results Length: 64
+1000 steps finished in 346839.062 ns
+Average: 346.839 ns per step
+
+
+Post Hook Called: False
+
+Test:  Iter Unpack (100x)
+Results Length: 64
+1000 steps finished in 40875885.938 ns
+Average: 40875.886 ns per step
+
+
+Post Hook Called: False
+
+Test:  Iter Update (100x)
+Results Length: 64
+1000 steps finished in 30352537.500 ns
+Average: 30352.537 ns per step
+
+
+Post Hook Called: False
+
+Test:  Unpack From
+Results Length: 64
+1000 steps finished in 480523.438 ns
+Average: 480.523 ns per step
+
+
+Post Hook Called: False
+
+Test:  Update From
+Results Length: 64
+1000 steps finished in 285021.875 ns
+Average: 285.022 ns per step
+
+
+Post Hook Called: False
+
+Test:  Complex Update
+Results Length: 64
+1000 steps finished in 813121.875 ns
+Average: 813.122 ns per step
+
+
+Post Hook Called: True
+
+Test:  Complex Iter Unpack (100x)
+Results Length: 64
+1000 steps finished in 131775840.625 ns
+Average: 131775.841 ns per step
+
+
+Post Hook Called: True
+
+Test:  Complex Iter Update (100x)
+Results Length: 64
+1000 steps finished in 88616110.938 ns
+Average: 88616.111 ns per step
+
+
+Post Hook Called: True
+
+Test:  Complex Unpack From (100x)
+Results Length: 64
+1000 steps finished in 1467882.812 ns
+Average: 1467.883 ns per step
+
+
+Post Hook Called: True
+
+Test:  Complex Update From (100x)
+Results Length: 64
+1000 steps finished in 909548.438 ns
+Average: 909.548 ns per step
+
+
+Post Hook Called: True
+
+进程已结束，退出代码为 0

obstruct-0.6.0/src/obstruct/__version__.py

@@ -1 +0,0 @@
-version = "0.6.0"