unidecompiler-plugin-lua 0.1.4__tar.gz → 0.2.1__tar.gz

{unidecompiler_plugin_lua-0.1.4 → unidecompiler_plugin_lua-0.2.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: unidecompiler-plugin-lua
-Version: 0.1.4
+Version: 0.2.1
 Summary: Lua bytecode frontend plugin for unidecompiler
 Author-email: Wker <1670133844@qq.com>
 License-Expression: AGPL-3.0-or-later
@@ -9,7 +9,7 @@ Project-URL: Repository, https://github.com/Wker666/unidecompiler
 Project-URL: Issues, https://github.com/Wker666/unidecompiler/issues
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown
-Requires-Dist: unidecompiler<0.2.0,>=0.1.10
+Requires-Dist: unidecompiler<0.3.0,>=0.2.1
 
 # unidecompiler-plugin-lua
 

{unidecompiler_plugin_lua-0.1.4 → unidecompiler_plugin_lua-0.2.1}/pyproject.toml

@@ -4,13 +4,13 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "unidecompiler-plugin-lua"
-version = "0.1.4"
+version = "0.2.1"
 description = "Lua bytecode frontend plugin for unidecompiler"
 readme = "README.md"
 license = "AGPL-3.0-or-later"
 authors = [{ name = "Wker", email = "1670133844@qq.com" }]
 requires-python = ">=3.11"
-dependencies = ["unidecompiler>=0.1.10,<0.2.0"]
+dependencies = ["unidecompiler>=0.2.1,<0.3.0"]
 
 [project.urls]
 Homepage = "https://github.com/Wker666/unidecompiler"

{unidecompiler_plugin_lua-0.1.4 → unidecompiler_plugin_lua-0.2.1}/src/unidecompiler_plugin_lua/lifter.py

@@ -41,6 +41,7 @@ from unidecompiler.core.vm_region import (
     VMStatefulCallbacks,
     build_hint_region_profile,
 )
+from unidecompiler.progress import ProgressReporter, report_progress
 from unidecompiler_plugin_lua.luac import LuaChunk, LuaFunctionListing
 
 
@@ -919,10 +920,17 @@ LUA_EFFECT_TABLE = VMEffectTable(
 )
 
 
-def lift_lua_chunk(chunk: LuaChunk, metadata: dict) -> ModuleIR:
+def lift_lua_chunk(
+    chunk: LuaChunk,
+    metadata: dict,
+    *,
+    reporter: ProgressReporter | None = None,
+) -> ModuleIR:
     functions: tuple[FunctionIR, ...]
     if chunk.functions:
-        root, next_index = _lift_lua_function_tree(chunk.functions, 0)
+        total = len(chunk.functions)
+        report_progress(reporter, phase="lift", status="started", completed=0, total=total, unit="function", message="lifting Lua functions")
+        root, next_index = _lift_lua_function_tree(chunk.functions, 0, reporter=reporter, total=total, progress=[0])
         if next_index != len(chunk.functions):
             raise ValueError("incomplete Lua function tree reconstruction")
         functions = (root,)
@@ -950,8 +958,23 @@ def lift_lua_chunk(chunk: LuaChunk, metadata: dict) -> ModuleIR:
 def _lift_lua_function_tree(
     listings: tuple[LuaFunctionListing, ...],
     index: int,
+    *,
+    reporter: ProgressReporter | None = None,
+    total: int | None = None,
+    progress: list[int] | None = None,
 ) -> tuple[FunctionIR, int]:
     listing = listings[index]
+    item_label = listing.inferred_name or listing.source or f"function {index + 1}"
+    if reporter is not None and total is not None and progress is not None:
+        report_progress(
+            reporter,
+            phase="lift",
+            completed=progress[0],
+            total=total,
+            unit="function",
+            item_label=item_label,
+            message=f"lifting {item_label}",
+        )
     function_ir = recover_vm_function(
         _lua_function_spec(listing),
         lambda: lift_lua_function(listing),
@@ -960,10 +983,27 @@ def _lift_lua_function_tree(
             for instruction in listing.instructions
         ),
     )
+    if reporter is not None and total is not None and progress is not None:
+        progress[0] += 1
+        report_progress(
+            reporter,
+            phase="lift",
+            completed=progress[0],
+            total=total,
+            unit="function",
+            item_label=item_label,
+            message=f"lifted {item_label}",
+        )
     next_index = index + 1
     nested_functions: list[FunctionIR] = []
     for _ in range(listing.child_function_count):
-        nested_function, next_index = _lift_lua_function_tree(listings, next_index)
+        nested_function, next_index = _lift_lua_function_tree(
+            listings,
+            next_index,
+            reporter=reporter,
+            total=total,
+            progress=progress,
+        )
         nested_functions.append(nested_function)
     return replace(function_ir, nested_functions=tuple(nested_functions)), next_index
 

{unidecompiler_plugin_lua-0.1.4 → unidecompiler_plugin_lua-0.2.1}/src/unidecompiler_plugin_lua/plugin.py

@@ -2,6 +2,7 @@ from __future__ import annotations
 
 from unidecompiler.core.ir import ModuleIR
 from unidecompiler.plugins import FrontendModule
+from unidecompiler.progress import ProgressReporter
 from unidecompiler_plugin_lua.lifter import lift_lua_chunk
 from unidecompiler_plugin_lua.chunk54 import decode_lua54_chunk, Lua54ChunkError
 from unidecompiler_plugin_lua.luac import (
@@ -69,6 +70,11 @@ class LuaFrontendPlugin:
 
         return lift_lua_chunk(module.payload, module.metadata)
 
+    def lift_with_progress(self, module: FrontendModule, reporter: ProgressReporter) -> ModuleIR:
+        if module.frontend_id != self.id:
+            raise TypeError(f"Lua frontend cannot lift module from {module.frontend_id!r}")
+        return lift_lua_chunk(module.payload, module.metadata, reporter=reporter)
+
 
 class Lua54BinaryChunkDecoder:
     id = "lua54-binary"

{unidecompiler_plugin_lua-0.1.4 → unidecompiler_plugin_lua-0.2.1}/src/unidecompiler_plugin_lua.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: unidecompiler-plugin-lua
-Version: 0.1.4
+Version: 0.2.1
 Summary: Lua bytecode frontend plugin for unidecompiler
 Author-email: Wker <1670133844@qq.com>
 License-Expression: AGPL-3.0-or-later
@@ -9,7 +9,7 @@ Project-URL: Repository, https://github.com/Wker666/unidecompiler
 Project-URL: Issues, https://github.com/Wker666/unidecompiler/issues
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown
-Requires-Dist: unidecompiler<0.2.0,>=0.1.10
+Requires-Dist: unidecompiler<0.3.0,>=0.2.1
 
 # unidecompiler-plugin-lua
 

unidecompiler_plugin_lua-0.2.1/src/unidecompiler_plugin_lua.egg-info/requires.txt

@@ -0,0 +1 @@
+unidecompiler<0.3.0,>=0.2.1

unidecompiler_plugin_lua-0.1.4/src/unidecompiler_plugin_lua.egg-info/requires.txt

@@ -1 +0,0 @@
-unidecompiler<0.2.0,>=0.1.10