restore cursor to same line of code, not same line of buffer (#989)

[etc/vim.git] / blib2to3 / pgen2 / parse.py

diff --git a/blib2to3/pgen2/parse.py b/blib2to3/pgen2/parse.py
index 6bebdbba7e52d6bb10c39104cef4ba21922b436e..22f14c89d6cc788932cfc798f3ef70f74b6e1567 100644 (file)
--- a/blib2to3/pgen2/parse.py
+++ b/blib2to3/pgen2/parse.py
@@ -13,17 +13,20 @@ how this parsing engine works.
 # Local imports
 from . import token
 
 # Local imports
 from . import token
 

+

 class ParseError(Exception):
     """Exception to signal the parser is stuck."""
 
     def __init__(self, msg, type, value, context):
 class ParseError(Exception):
     """Exception to signal the parser is stuck."""
 
     def __init__(self, msg, type, value, context):

-        Exception.__init__(self, "%s: type=%r, value=%r, context=%r" %
-                           (msg, type, value, context))
+        Exception.__init__(
+            self, "%s: type=%r, value=%r, context=%r" % (msg, type, value, context)
+        )

         self.msg = msg
         self.type = type
         self.value = value
         self.context = context
 
         self.msg = msg
         self.type = type
         self.value = value
         self.context = context
 

+

 class Parser(object):
     """Parser engine.
 
 class Parser(object):
     """Parser engine.
 


@@ -108,7 +111,7 @@ class Parser(object):
         stackentry = (self.grammar.dfas[start], 0, newnode)
         self.stack = [stackentry]
         self.rootnode = None
         stackentry = (self.grammar.dfas[start], 0, newnode)
         self.stack = [stackentry]
         self.rootnode = None

-        self.used_names = set() # Aliased to self.rootnode.used_names in pop()
+        self.used_names = set()  # Aliased to self.rootnode.used_names in pop()

 
     def addtoken(self, type, value, context):
         """Add a token; return True iff this is the end of the program."""
 
     def addtoken(self, type, value, context):
         """Add a token; return True iff this is the end of the program."""


@@ -145,15 +148,14 @@ class Parser(object):
                     if ilabel in itsfirst:
                         # Push a symbol
                         self.push(t, self.grammar.dfas[t], newstate, context)
                     if ilabel in itsfirst:
                         # Push a symbol
                         self.push(t, self.grammar.dfas[t], newstate, context)

-                        break # To continue the outer while loop
+                        break  # To continue the outer while loop

             else:
                 if (0, state) in arcs:
                     # An accepting state, pop it and try something else
                     self.pop()
                     if not self.stack:
                         # Done parsing, but another token is input
             else:
                 if (0, state) in arcs:
                     # An accepting state, pop it and try something else
                     self.pop()
                     if not self.stack:
                         # Done parsing, but another token is input

-                        raise ParseError("too much input",
-                                         type, value, context)
+                        raise ParseError("too much input", type, value, context)

                 else:
                     # No success finding a transition
                     raise ParseError("bad input", type, value, context)
                 else:
                     # No success finding a transition
                     raise ParseError("bad input", type, value, context)