1.1 --- a/translator.py Sun Jan 15 17:37:00 2023 +0100
1.2 +++ b/translator.py Sat Sep 02 01:19:04 2023 +0200
1.3 @@ -885,7 +885,7 @@
1.4
1.5 # Produce the body and any additional return statement.
1.6
1.7 - expr = self.process_structure_node(n.code) or \
1.8 + expr = self.process_statement_node(n.code) or \
1.9 self.in_method() and \
1.10 function_name.rsplit(".", 1)[-1] == "__init__" and \
1.11 TrResolvedNameRef("self", self.importer.function_locals[function_name]["self"]) or \
1.12 @@ -1038,12 +1038,12 @@
1.13
1.14 first = True
1.15 for test, body in n.tests:
1.16 - test_ref = self.process_structure_node(test)
1.17 + test_ref = self.process_statement_node(test)
1.18 self.start_if(first, test_ref)
1.19
1.20 in_conditional = self.in_conditional
1.21 self.in_conditional = True
1.22 - self.process_structure_node(body)
1.23 + self.process_statement_node(body)
1.24 self.in_conditional = in_conditional
1.25
1.26 self.end_if()
1.27 @@ -1051,7 +1051,7 @@
1.28
1.29 if n.else_:
1.30 self.start_else()
1.31 - self.process_structure_node(n.else_)
1.32 + self.process_statement_node(n.else_)
1.33 self.end_else()
1.34
1.35 print >>self.out
1.36 @@ -1769,7 +1769,7 @@
1.37 self.writestmt("__Try")
1.38 self.writeline("{")
1.39 self.indent += 1
1.40 - self.process_structure_node(n.body)
1.41 + self.process_statement_node(n.body)
1.42
1.43 # Put the else statement in another try block that handles any raised
1.44 # exceptions and converts them to exceptions that will not be handled by
1.45 @@ -1779,7 +1779,7 @@
1.46 self.writestmt("__Try")
1.47 self.writeline("{")
1.48 self.indent += 1
1.49 - self.process_structure_node(n.else_)
1.50 + self.process_statement_node(n.else_)
1.51 self.indent -= 1
1.52 self.writeline("}")
1.53 self.writeline("__Catch (__tmp_exc)")
1.54 @@ -1823,7 +1823,7 @@
1.55 # Test for specific exceptions.
1.56
1.57 if name is not None:
1.58 - name_ref = self.process_structure_node(name)
1.59 + name_ref = self.process_statement_node(name)
1.60 self.writeline("else if (__ISINSTANCE(__tmp_exc.arg, %s))" % name_ref)
1.61 else:
1.62 self.writeline("else if (1)")
1.63 @@ -1837,7 +1837,7 @@
1.64 self.writestmt("%s;" % self.process_name_node(var, make_expression("__tmp_exc.arg")))
1.65
1.66 if handler is not None:
1.67 - self.process_structure_node(handler)
1.68 + self.process_statement_node(handler)
1.69
1.70 self.indent -= 1
1.71 self.writeline("}")
1.72 @@ -1866,7 +1866,7 @@
1.73 self.writestmt("__Try")
1.74 self.writeline("{")
1.75 self.indent += 1
1.76 - self.process_structure_node(n.body)
1.77 + self.process_statement_node(n.body)
1.78 self.indent -= 1
1.79 self.writeline("}")
1.80
1.81 @@ -1877,7 +1877,7 @@
1.82 self.writeline("__Catch (__tmp_exc)")
1.83 self.writeline("{")
1.84 self.indent += 1
1.85 - self.process_structure_node(n.final)
1.86 + self.process_statement_node(n.final)
1.87
1.88 # Introduce an if statement to handle the completion of a try block.
1.89
1.90 @@ -1918,7 +1918,7 @@
1.91 self.writeline("while (1)")
1.92 self.writeline("{")
1.93 self.indent += 1
1.94 - test = self.process_structure_node(n.test)
1.95 + test = self.process_statement_node(n.test)
1.96
1.97 # Emit the loop termination condition unless "while <true value>" is
1.98 # indicated.
1.99 @@ -1929,13 +1929,13 @@
1.100
1.101 self.start_if(True, self.make_negation(test))
1.102 if n.else_:
1.103 - self.process_structure_node(n.else_)
1.104 + self.process_statement_node(n.else_)
1.105 self.writestmt("break;")
1.106 self.end_if()
1.107
1.108 in_conditional = self.in_conditional
1.109 self.in_conditional = True
1.110 - self.process_structure_node(n.body)
1.111 + self.process_statement_node(n.body)
1.112 self.in_conditional = in_conditional
1.113
1.114 self.indent -= 1