1.1 --- a/common.py Fri Sep 01 23:43:05 2023 +0200
1.2 +++ b/common.py Sat Sep 02 01:19:29 2023 +0200
1.3 @@ -362,9 +362,15 @@
1.4
1.5 l = []
1.6 for n in node.getChildNodes():
1.7 - l.append(self.process_structure_node(n))
1.8 + l.append(self.process_statement_node(n))
1.9 return l
1.10
1.11 + def process_statement_node(self, node):
1.12 +
1.13 + "Process the given statement 'node'."
1.14 +
1.15 + return self.process_structure_node(node)
1.16 +
1.17 def process_augassign_node(self, n):
1.18
1.19 "Process the given augmented assignment node 'n'."
2.1 --- a/translator.py Fri Sep 01 23:43:05 2023 +0200
2.2 +++ b/translator.py Sat Sep 02 01:19:29 2023 +0200
2.3 @@ -885,7 +885,7 @@
2.4
2.5 # Produce the body and any additional return statement.
2.6
2.7 - expr = self.process_structure_node(n.code) or \
2.8 + expr = self.process_statement_node(n.code) or \
2.9 self.in_method() and \
2.10 function_name.rsplit(".", 1)[-1] == "__init__" and \
2.11 TrResolvedNameRef("self", self.importer.function_locals[function_name]["self"]) or \
2.12 @@ -1038,12 +1038,12 @@
2.13
2.14 first = True
2.15 for test, body in n.tests:
2.16 - test_ref = self.process_structure_node(test)
2.17 + test_ref = self.process_statement_node(test)
2.18 self.start_if(first, test_ref)
2.19
2.20 in_conditional = self.in_conditional
2.21 self.in_conditional = True
2.22 - self.process_structure_node(body)
2.23 + self.process_statement_node(body)
2.24 self.in_conditional = in_conditional
2.25
2.26 self.end_if()
2.27 @@ -1051,7 +1051,7 @@
2.28
2.29 if n.else_:
2.30 self.start_else()
2.31 - self.process_structure_node(n.else_)
2.32 + self.process_statement_node(n.else_)
2.33 self.end_else()
2.34
2.35 print >>self.out
2.36 @@ -1769,7 +1769,7 @@
2.37 self.writestmt("__Try")
2.38 self.writeline("{")
2.39 self.indent += 1
2.40 - self.process_structure_node(n.body)
2.41 + self.process_statement_node(n.body)
2.42
2.43 # Put the else statement in another try block that handles any raised
2.44 # exceptions and converts them to exceptions that will not be handled by
2.45 @@ -1779,7 +1779,7 @@
2.46 self.writestmt("__Try")
2.47 self.writeline("{")
2.48 self.indent += 1
2.49 - self.process_structure_node(n.else_)
2.50 + self.process_statement_node(n.else_)
2.51 self.indent -= 1
2.52 self.writeline("}")
2.53 self.writeline("__Catch (__tmp_exc)")
2.54 @@ -1823,7 +1823,7 @@
2.55 # Test for specific exceptions.
2.56
2.57 if name is not None:
2.58 - name_ref = self.process_structure_node(name)
2.59 + name_ref = self.process_statement_node(name)
2.60 self.writeline("else if (__ISINSTANCE(__tmp_exc.arg, %s))" % name_ref)
2.61 else:
2.62 self.writeline("else if (1)")
2.63 @@ -1837,7 +1837,7 @@
2.64 self.writestmt("%s;" % self.process_name_node(var, make_expression("__tmp_exc.arg")))
2.65
2.66 if handler is not None:
2.67 - self.process_structure_node(handler)
2.68 + self.process_statement_node(handler)
2.69
2.70 self.indent -= 1
2.71 self.writeline("}")
2.72 @@ -1866,7 +1866,7 @@
2.73 self.writestmt("__Try")
2.74 self.writeline("{")
2.75 self.indent += 1
2.76 - self.process_structure_node(n.body)
2.77 + self.process_statement_node(n.body)
2.78 self.indent -= 1
2.79 self.writeline("}")
2.80
2.81 @@ -1877,7 +1877,7 @@
2.82 self.writeline("__Catch (__tmp_exc)")
2.83 self.writeline("{")
2.84 self.indent += 1
2.85 - self.process_structure_node(n.final)
2.86 + self.process_statement_node(n.final)
2.87
2.88 # Introduce an if statement to handle the completion of a try block.
2.89
2.90 @@ -1918,7 +1918,7 @@
2.91 self.writeline("while (1)")
2.92 self.writeline("{")
2.93 self.indent += 1
2.94 - test = self.process_structure_node(n.test)
2.95 + test = self.process_statement_node(n.test)
2.96
2.97 # Emit the loop termination condition unless "while <true value>" is
2.98 # indicated.
2.99 @@ -1929,13 +1929,13 @@
2.100
2.101 self.start_if(True, self.make_negation(test))
2.102 if n.else_:
2.103 - self.process_structure_node(n.else_)
2.104 + self.process_statement_node(n.else_)
2.105 self.writestmt("break;")
2.106 self.end_if()
2.107
2.108 in_conditional = self.in_conditional
2.109 self.in_conditional = True
2.110 - self.process_structure_node(n.body)
2.111 + self.process_statement_node(n.body)
2.112 self.in_conditional = in_conditional
2.113
2.114 self.indent -= 1