Merge branch 'master' into python-2.4

uncompyle6/parsers/parse3.py

@@ -697,12 +697,21 @@ class Python3Parser(PythonParser):
         self.check_reduce['augassign1'] = 'AST'
         self.check_reduce['augassign2'] = 'AST'
         self.check_reduce['while1stmt'] = 'noAST'
+        # FIXME: remove parser errors caused by the below
+        # self.check_reduce['while1elsestmt'] = 'noAST'
         return
 
     def reduce_is_invalid(self, rule, ast, tokens, first, last):
         lhs = rule[0]
         if lhs in ('augassign1', 'augassign2') and ast[0][0] == 'and':
             return True
+        elif lhs == 'while1elsestmt':
+            # if SETUP_LOOP target spans the else part, then this is
+            # not while1else. Also do for whileTrue?
+            last += 1
+            while isinstance(tokens[last].offset, str):
+                last += 1
+            return tokens[first].attr == tokens[last].offset
         elif lhs == 'while1stmt':
             if tokens[last] in ('COME_FROM_LOOP', 'JUMP_BACK'):
                 # jump_back should be right afer SETUP_LOOP. Test?

uncompyle6/parsers/parse32.py

@@ -17,6 +17,11 @@ class Python32Parser(Python3Parser):
                               COME_FROM_LOOP
         whileTruestmt     ::= SETUP_LOOP return_stmts
                               COME_FROM_LOOP
+
+        # Python 3.2+ has more loop optimization that removes
+        # JUMP_FORWARD in some cases, and hence we also don't
+        # see COME_FROM
+        _ifstmts_jump ::= c_stmts_opt
         """
     pass
 

uncompyle6/parsers/parse33.py

@@ -20,11 +20,6 @@ class Python33Parser(Python32Parser):
         iflaststmt    ::= testexpr c_stmts_opt33
         c_stmts_opt33 ::= JUMP_BACK JUMP_ABSOLUTE c_stmts_opt
         _ifstmts_jump ::= c_stmts_opt JUMP_FORWARD _come_from
-
-        # Python 3.3+ has more loop optimization that removes
-        # JUMP_FORWARD in some cases, and hence we also don't
-        # see COME_FROM
-        _ifstmts_jump ::= c_stmts_opt
         """
 
 class Python33ParserSingle(Python33Parser, PythonParserSingle):

uncompyle6/scanners/tok.py

@@ -72,7 +72,8 @@ class Token:
             pattr = self.pattr
             if self.opc:
                 if self.op in self.opc.hasjrel:
-                    pattr = "to " + self.pattr
+                    if not self.pattr.startswith('to '):
+                        pattr = "to " + self.pattr
                 elif self.op in self.opc.hasjabs:
                     self.pattr= str(self.pattr)
                     if not self.pattr.startswith('to '):