1.1 --- a/simplified.py Mon Jul 31 01:01:34 2006 +0200
1.2 +++ b/simplified.py Mon Jul 31 21:20:33 2006 +0200
1.3 @@ -62,7 +62,6 @@
1.4 expr Any contributing expression.
1.5 lvalue Any target expression.
1.6 test Any test expression in a conditional instruction.
1.7 - handler Any exception handler selector expression.
1.8
1.9 Invocation and subprogram attributes:
1.10
1.11 @@ -73,6 +72,7 @@
1.12
1.13 body Any conditional code depending on the success of a test.
1.14 else_ Any conditional code depending on the failure of a test.
1.15 + handler Any exception handler code.
1.16 finally_ Any code which will be executed regardless.
1.17 code Any unconditional code.
1.18 choices Any choices which may be included in the final program.
1.19 @@ -123,14 +123,12 @@
1.20 self._pprint(indent + 2, "( ", "structure '%s'" % self.structure.name)
1.21 if hasattr(self, "test"):
1.22 self.test.pprint(indent + 2, "? ")
1.23 - for attr in "code", "body", "else_", "finally_", "choices":
1.24 + for attr in "code", "body", "else_", "handler", "finally_", "choices":
1.25 if hasattr(self, attr) and getattr(self, attr):
1.26 self._pprint(indent, "", "{ (%s)" % attr)
1.27 for node in getattr(self, attr):
1.28 node.pprint(indent + 2)
1.29 self._pprint(indent, "", "}")
1.30 - if hasattr(self, "handler"):
1.31 - self.handler.pprint(indent + 2, "! ")
1.32 if hasattr(self, "expr"):
1.33 self.expr.pprint(indent + 2, "- ")
1.34 if hasattr(self, "nodes"):