Merge hell

rocky · rocky · commit 5a367717fa3d · 2024-02-24T10:14:31.000-05:00
diff --git a/uncompyle6/scanners/scanner37base.py b/uncompyle6/scanners/scanner37base.py
@@ -306,6 +306,7 @@ def tokens_append(j, token):
                         has_arg=jump_inst.has_arg,
                         inst_size=jump_inst.inst_size,
                         has_extended_arg=inst.has_extended_arg,
+                        fallthrough=False,
                         tos_str=None,
                         start_offset=None,
                     )
diff --git a/uncompyle6/semantics/n_actions.py b/uncompyle6/semantics/n_actions.py
@@ -268,7 +268,7 @@ def n_const_list(self, node: SyntaxTree):
                     elem = elem[0]
                 if elem == "ADD_VALUE":
                     if self.version < (3, 0, 0):
-                        value = "%r" % elem.pattr
+                        value = "%r" % repr(elem.pattr)
                     else:
                         value = "%s" % str(elem.pattr)
                 else:

Original file line number	Diff line number	Diff line change
`@@ -306,6 +306,7 @@ def tokens_append(j, token):`
`306`	`306`	`has_arg=jump_inst.has_arg,`
`307`	`307`	`inst_size=jump_inst.inst_size,`
`308`	`308`	`has_extended_arg=inst.has_extended_arg,`
	`309`	`+ fallthrough=False,`
`309`	`310`	`tos_str=None,`
`310`	`311`	`start_offset=None,`
`311`	`312`	`)`