[pypy-svn] r77635 - pypy/branch/fast-forward/pypy/interpreter/pyparser
afa at codespeak.net
afa at codespeak.net
Tue Oct 5 22:01:25 CEST 2010
Author: afa
Date: Tue Oct 5 22:01:23 2010
New Revision: 77635
Modified:
pypy/branch/fast-forward/pypy/interpreter/pyparser/genpytokenize.py
pypy/branch/fast-forward/pypy/interpreter/pyparser/pytokenize.py
Log:
Fix an error in the tokenizer's grammar:
triple-quoted string with prefix were not correctly decoded
r""" """
Modified: pypy/branch/fast-forward/pypy/interpreter/pyparser/genpytokenize.py
==============================================================================
--- pypy/branch/fast-forward/pypy/interpreter/pyparser/genpytokenize.py (original)
+++ pypy/branch/fast-forward/pypy/interpreter/pyparser/genpytokenize.py Tue Oct 5 22:01:23 2010
@@ -170,7 +170,7 @@
group(states,
newArcPair(states, '"'),
makeLineCont())))
- triple = group(states,
+ triple = chain(states,
makeStrPrefix(),
group(states,
chainStr(states, "'''"),
Modified: pypy/branch/fast-forward/pypy/interpreter/pyparser/pytokenize.py
==============================================================================
--- pypy/branch/fast-forward/pypy/interpreter/pyparser/pytokenize.py (original)
+++ pypy/branch/fast-forward/pypy/interpreter/pyparser/pytokenize.py Tue Oct 5 22:01:23 2010
@@ -23,11 +23,11 @@
# ______________________________________________________________________
# Automatically generated DFA's
-accepts = [True, True, True, True, True, True, True, True,
+accepts = [False, True, True, True, True, True, True, True,
True, True, False, True, True, True, False, False,
- False, False, True, False, False, True, True,
- True, True, False, True, False, True, False, True,
- False, True, False, False, False, True, False,
+ False, False, True, True, True, True, True, False,
+ True, False, True, False, True, False, False,
+ True, False, False, False, False, True, False,
False, False, True]
states = [
{'\t': 0, '\n': 13, '\x0c': 0,
@@ -73,7 +73,7 @@
't': 1, 'u': 1, 'v': 1, 'w': 1,
'x': 1, 'y': 1, 'z': 1},
- {'"': 20, "'": 19, '0': 1, '1': 1,
+ {'"': 16, "'": 15, '0': 1, '1': 1,
'2': 1, '3': 1, '4': 1, '5': 1,
'6': 1, '7': 1, '8': 1, '9': 1,
'A': 1, 'B': 1, 'C': 1, 'D': 1,
@@ -91,7 +91,7 @@
'v': 1, 'w': 1, 'x': 1, 'y': 1,
'z': 1},
- {'"': 20, "'": 19, '0': 1, '1': 1,
+ {'"': 16, "'": 15, '0': 1, '1': 1,
'2': 1, '3': 1, '4': 1, '5': 1,
'6': 1, '7': 1, '8': 1, '9': 1,
'A': 1, 'B': 1, 'C': 1, 'D': 1,
@@ -109,22 +109,22 @@
'v': 1, 'w': 1, 'x': 1, 'y': 1,
'z': 1},
- {'.': 26, '0': 23, '1': 23, '2': 23,
- '3': 23, '4': 23, '5': 23, '6': 23,
- '7': 23, '8': 25, '9': 25, 'B': 24,
- 'E': 27, 'J': 13, 'L': 13, 'O': 22,
- 'X': 21, 'b': 24, 'e': 27, 'j': 13,
- 'l': 13, 'o': 22, 'x': 21},
+ {'.': 24, '0': 21, '1': 21, '2': 21,
+ '3': 21, '4': 21, '5': 21, '6': 21,
+ '7': 21, '8': 23, '9': 23, 'B': 22,
+ 'E': 25, 'J': 13, 'L': 13, 'O': 20,
+ 'X': 19, 'b': 22, 'e': 25, 'j': 13,
+ 'l': 13, 'o': 20, 'x': 19},
- {'.': 26, '0': 5, '1': 5, '2': 5,
+ {'.': 24, '0': 5, '1': 5, '2': 5,
'3': 5, '4': 5, '5': 5, '6': 5,
- '7': 5, '8': 5, '9': 5, 'E': 27,
- 'J': 13, 'L': 13, 'e': 27, 'j': 13,
+ '7': 5, '8': 5, '9': 5, 'E': 25,
+ 'J': 13, 'L': 13, 'e': 25, 'j': 13,
'l': 13},
- {'0': 28, '1': 28, '2': 28, '3': 28,
- '4': 28, '5': 28, '6': 28, '7': 28,
- '8': 28, '9': 28},
+ {'0': 26, '1': 26, '2': 26, '3': 26,
+ '4': 26, '5': 26, '6': 26, '7': 26,
+ '8': 26, '9': 26},
{'*': 12, '=': 13},
@@ -142,52 +142,46 @@
{'\n': 13},
- {automata.DEFAULT: 19, '\n': 29,
- "'": 30, '\\': 31},
+ {automata.DEFAULT: 30, '\n': 27,
+ "'": 28, '\\': 29},
- {automata.DEFAULT: 20, '\n': 29,
- '"': 32, '\\': 33},
+ {automata.DEFAULT: 33, '\n': 27,
+ '"': 31, '\\': 32},
{'\n': 13, '\r': 14},
- {automata.DEFAULT: 18, '\n': 29,
- '\r': 29},
-
- {automata.DEFAULT: 19, '\n': 29,
- "'": 13, '\\': 31},
+ {automata.DEFAULT: 18, '\n': 27,
+ '\r': 27},
- {automata.DEFAULT: 20, '\n': 29,
- '"': 13, '\\': 33},
-
- {'0': 21, '1': 21, '2': 21, '3': 21,
- '4': 21, '5': 21, '6': 21, '7': 21,
- '8': 21, '9': 21, 'A': 21, 'B': 21,
- 'C': 21, 'D': 21, 'E': 21, 'F': 21,
- 'L': 13, 'a': 21, 'b': 21, 'c': 21,
- 'd': 21, 'e': 21, 'f': 21,
+ {'0': 19, '1': 19, '2': 19, '3': 19,
+ '4': 19, '5': 19, '6': 19, '7': 19,
+ '8': 19, '9': 19, 'A': 19, 'B': 19,
+ 'C': 19, 'D': 19, 'E': 19, 'F': 19,
+ 'L': 13, 'a': 19, 'b': 19, 'c': 19,
+ 'd': 19, 'e': 19, 'f': 19,
'l': 13},
- {'0': 22, '1': 22, '2': 22, '3': 22,
- '4': 22, '5': 22, '6': 22, '7': 22,
+ {'0': 20, '1': 20, '2': 20, '3': 20,
+ '4': 20, '5': 20, '6': 20, '7': 20,
'L': 13, 'l': 13},
- {'.': 26, '0': 23, '1': 23, '2': 23,
- '3': 23, '4': 23, '5': 23, '6': 23,
- '7': 23, '8': 25, '9': 25, 'E': 27,
- 'J': 13, 'L': 13, 'e': 27, 'j': 13,
+ {'.': 24, '0': 21, '1': 21, '2': 21,
+ '3': 21, '4': 21, '5': 21, '6': 21,
+ '7': 21, '8': 23, '9': 23, 'E': 25,
+ 'J': 13, 'L': 13, 'e': 25, 'j': 13,
'l': 13},
- {'0': 24, '1': 24, 'L': 13,
+ {'0': 22, '1': 22, 'L': 13,
'l': 13},
- {'.': 26, '0': 25, '1': 25, '2': 25,
- '3': 25, '4': 25, '5': 25, '6': 25,
- '7': 25, '8': 25, '9': 25, 'E': 27,
- 'J': 13, 'e': 27, 'j': 13},
+ {'.': 24, '0': 23, '1': 23, '2': 23,
+ '3': 23, '4': 23, '5': 23, '6': 23,
+ '7': 23, '8': 23, '9': 23, 'E': 25,
+ 'J': 13, 'e': 25, 'j': 13},
- {'0': 26, '1': 26, '2': 26, '3': 26,
- '4': 26, '5': 26, '6': 26, '7': 26,
- '8': 26, '9': 26, 'E': 34, 'J': 13,
+ {'0': 24, '1': 24, '2': 24, '3': 24,
+ '4': 24, '5': 24, '6': 24, '7': 24,
+ '8': 24, '9': 24, 'E': 34, 'J': 13,
'e': 34, 'j': 13},
{'+': 35, '-': 35, '0': 36, '1': 36,
@@ -195,9 +189,9 @@
'6': 36, '7': 36, '8': 36,
'9': 36},
- {'0': 28, '1': 28, '2': 28, '3': 28,
- '4': 28, '5': 28, '6': 28, '7': 28,
- '8': 28, '9': 28, 'E': 34, 'J': 13,
+ {'0': 26, '1': 26, '2': 26, '3': 26,
+ '4': 26, '5': 26, '6': 26, '7': 26,
+ '8': 26, '9': 26, 'E': 34, 'J': 13,
'e': 34, 'j': 13},
{},
@@ -207,11 +201,17 @@
{automata.DEFAULT: 37, '\n': 13,
'\r': 14},
+ {automata.DEFAULT: 30, '\n': 27,
+ "'": 13, '\\': 29},
+
{'"': 13},
{automata.DEFAULT: 38, '\n': 13,
'\r': 14},
+ {automata.DEFAULT: 33, '\n': 27,
+ '"': 13, '\\': 32},
+
{'+': 39, '-': 39, '0': 40, '1': 40,
'2': 40, '3': 40, '4': 40, '5': 40,
'6': 40, '7': 40, '8': 40,
@@ -226,11 +226,11 @@
'8': 36, '9': 36, 'J': 13,
'j': 13},
- {automata.DEFAULT: 37, '\n': 29,
- "'": 13, '\\': 31},
+ {automata.DEFAULT: 37, '\n': 27,
+ "'": 13, '\\': 29},
- {automata.DEFAULT: 38, '\n': 29,
- '"': 13, '\\': 33},
+ {automata.DEFAULT: 38, '\n': 27,
+ '"': 13, '\\': 32},
{'0': 40, '1': 40, '2': 40, '3': 40,
'4': 40, '5': 40, '6': 40, '7': 40,
More information about the Pypy-commit
mailing list