Reorder Instruction() parameters...

to follow disassemble-based order
rocky · Mar 8, 2024 · bd1637d · bd1637d
1 parent 16c08fa
commit bd1637d
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/decompyle3/scanners/scanner37base.py b/decompyle3/scanners/scanner37base.py
@@ -372,20 +372,20 @@ def tokens_append(j, token):
                     # but the operator and operand properties come from the other
                     # instruction
                     self.insts[i] = Instruction(
-                        opcode=jump_inst.opcode,
+                        is_jump_target=inst.is_jump_target,
+                        starts_line=inst.starts_line,
+                        offset=inst.offset,
                         opname=jump_inst.opname,
+                        opcode=jump_inst.opcode,
+                        has_arg=jump_inst.has_arg,
                         arg=jump_inst.arg,
                         argval=jump_inst.argval,
                         argrepr=jump_inst.argrepr,
-                        offset=inst.offset,
-                        starts_line=inst.starts_line,
-                        is_jump_target=inst.is_jump_target,
+                        tos_str=None,
                         positions=None,
                         optype=jump_inst.optype,
-                        has_arg=jump_inst.has_arg,
                         inst_size=jump_inst.inst_size,
                         has_extended_arg=inst.has_extended_arg,
-                        tos_str=None,
                         start_offset=None,
                     )
 

diff --git a/test/bytecode_3.7pypy/run/08_test_contextmanager.pyc b/test/bytecode_3.7pypy/run/08_test_contextmanager.pyc
diff --git a/test/bytecode_3.8pypy/run/08_test_contextmanager.pyc b/test/bytecode_3.8pypy/run/08_test_contextmanager.pyc