[pypy-svn] r77735 - pypy/trunk/pypy/interpreter/pyparser

[afa at codespeak.net]

Author: afa
Date: Fri Oct  8 22:44:00 2010
New Revision: 77735

Modified:
   pypy/trunk/pypy/interpreter/pyparser/genpytokenize.py
   pypy/trunk/pypy/interpreter/pyparser/pytokenize.py
Log:
Merge r77734 from the fast-forward branch.
Should fix the failure in test_syntax.py


Modified: pypy/trunk/pypy/interpreter/pyparser/genpytokenize.py
==============================================================================
--- pypy/trunk/pypy/interpreter/pyparser/genpytokenize.py	(original)
+++ pypy/trunk/pypy/interpreter/pyparser/genpytokenize.py	Fri Oct  8 22:44:00 2010
@@ -176,6 +176,7 @@
     pseudoToken = chain(states,
                         makeWhitespace(),
                         group(states,
+                              newArcPair(states, EMPTY),
                               pseudoExtras, number, funny, contStr, name))
     dfaStates, dfaAccepts = nfaToDfa(states, *pseudoToken)
     return DFA(dfaStates, dfaAccepts)

Modified: pypy/trunk/pypy/interpreter/pyparser/pytokenize.py
==============================================================================
--- pypy/trunk/pypy/interpreter/pyparser/pytokenize.py	(original)
+++ pypy/trunk/pypy/interpreter/pyparser/pytokenize.py	Fri Oct  8 22:44:00 2010
@@ -23,7 +23,7 @@
 # ______________________________________________________________________
 # Automatically generated DFA's
 
-accepts = [False, True, True, True, True, True, True, True,
+accepts = [True, True, True, True, True, True, True, True,
            True, True, False, True, True, True, False, False,
            False, False, True, True, True, False, True,
            False, True, False, True, False, False, True,