CPunch/LuaDecompy
1
0
Fork 0
mirror of https://github.com/CPunch/LuaDecompy.git synced 2024-11-22 14:50:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

lparser.py: minor refactoring, cleanup

Browse Source
This commit is contained in:
CPunch 2022-08-11 23:10:36 -05:00
parent 95ca3bb26b
commit b8bf02f7d0
1 changed files with 24 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
lparser.py
View File

@ -31,7 +31,7 @@ class LuaDecomp:
# parse instructions # parse instructions
while self.pc < len(self.chunk.instructions): while self.pc < len(self.chunk.instructions):
self.parseExpr() self.parseInstr()
self.pc += 1 self.pc += 1
# end the scope (if we're supposed too) # end the scope (if we're supposed too)
@ -40,18 +40,7 @@ class LuaDecomp:
print("\n==== [[" + str(self.chunk.name) + "'s decompiled source]] ====\n") print("\n==== [[" + str(self.chunk.name) + "'s decompiled source]] ====\n")
print(self.src) print(self.src)
def __makeLocalIdentifier(self, indx: int) -> str: # =======================================[[ Helpers ]]=========================================
self.locals[indx] = "__unknLocal%d" % self.unknownLocalCount
self.unknownLocalCount += 1
return self.locals[indx]
def __newLocal(self, indx: int, expr: str) -> None:
# TODO: grab identifier from chunk(?)
self.__makeLocalIdentifier(indx)
self.__startStatement()
self.__addExpr("local " + self.locals[indx] + " = " + expr)
def __getInstrAtPC(self, pc: int) -> Instruction: def __getInstrAtPC(self, pc: int) -> Instruction:
if pc < len(self.chunk.instructions): if pc < len(self.chunk.instructions):
@ -60,13 +49,10 @@ class LuaDecomp:
raise Exception("Decompilation failed!") raise Exception("Decompilation failed!")
def __getNextInstr(self) -> Instruction: def __getNextInstr(self) -> Instruction:
if self.pc + 1 < len(self.chunk.instructions): return self.__getInstrAtPC(self.pc + 1)
return self.chunk.instructions[self.pc + 1]
raise Exception("Decompilation failed!")
def __getCurrInstr(self) -> Instruction: def __getCurrInstr(self) -> Instruction:
return self.chunk.instructions[self.pc] return self.__getInstrAtPC(self.pc)
def __addExpr(self, code: str) -> None: def __addExpr(self, code: str) -> None:
self.src += code self.src += code
@ -88,6 +74,23 @@ class LuaDecomp:
self.top[indx] = code self.top[indx] = code
# ========================================[[ Locals ]]=========================================
def __makeLocalIdentifier(self, indx: int) -> str:
self.locals[indx] = "__unknLocal%d" % self.unknownLocalCount
self.unknownLocalCount += 1
return self.locals[indx]
def __newLocal(self, indx: int, expr: str) -> None:
# TODO: grab identifier from chunk(?)
self.__makeLocalIdentifier(indx)
self.__startStatement()
self.__addExpr("local " + self.locals[indx] + " = " + expr)
# ========================================[[ Scopes ]]=========================================
def __startScope(self, scopeType: str, size: int) -> None: def __startScope(self, scopeType: str, size: int) -> None:
self.__addExpr(scopeType) self.__addExpr(scopeType)
self.scope.append(_Scope(self.pc, self.pc + size)) self.scope.append(_Scope(self.pc, self.pc + size))
@ -105,6 +108,8 @@ class LuaDecomp:
self.__startStatement() self.__startStatement()
self.__addExpr("end") self.__addExpr("end")
# =====================================[[ Instructions ]]======================================
def __emitOperand(self, a: int, b: str, c: str, op: str) -> None: def __emitOperand(self, a: int, b: str, c: str, op: str) -> None:
self.__setReg(a, "(" + b + op + c + ")") self.__setReg(a, "(" + b + op + c + ")")
@ -139,7 +144,7 @@ class LuaDecomp:
else: else:
return self.__getReg(rk) return self.__getReg(rk)
def parseExpr(self): def parseInstr(self):
instr = self.__getCurrInstr() instr = self.__getCurrInstr()
# python, add switch statements *please* # python, add switch statements *please*