Simplify single-file vs. multi-file modes

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

diff --git a/blib2to3/pgen2/driver.py b/blib2to3/pgen2/driver.py
index eabc72b779571f2aa2b46b25ce81f2d495660819..5cdd2e59e6156cecd8ffa3cebc822b4be20ef7ae 100644 (file)
--- a/blib2to3/pgen2/driver.py
+++ b/blib2to3/pgen2/driver.py
@@ -69,7 +69,7 @@ class Driver(object):
             if debug:
                 self.logger.debug("%s %r (prefix=%r)",
                                   token.tok_name[type], value, prefix)
             if debug:
                 self.logger.debug("%s %r (prefix=%r)",
                                   token.tok_name[type], value, prefix)

-            if type == token.DEDENT:
+            if type in {token.INDENT, token.DEDENT}:

                 _prefix = prefix
                 prefix = ""
             if p.addtoken(type, value, (prefix, start)):
                 _prefix = prefix
                 prefix = ""
             if p.addtoken(type, value, (prefix, start)):


@@ -77,7 +77,13 @@ class Driver(object):
                     self.logger.debug("Stop.")
                 break
             prefix = ""
                     self.logger.debug("Stop.")
                 break
             prefix = ""

-            if type == token.DEDENT:
+            if type == token.INDENT:
+                if _prefix.startswith(value):
+                    # Don't double-indent.  Since we're delaying the prefix that
+                    # would normally belong to INDENT, we need to put the value
+                    # at the end versus at the beginning.
+                    _prefix = _prefix[len(value):] + value
+            if type in {token.INDENT, token.DEDENT}:

                 prefix = _prefix
             lineno, column = end
             if value.endswith("\n"):
                 prefix = _prefix
             lineno, column = end
             if value.endswith("\n"):