[pypy-svn] r16480 - pypy/dist/pypy/interpreter/pyparser

ludal at codespeak.net ludal at codespeak.net
Thu Aug 25 14:14:38 CEST 2005


Author: ludal
Date: Thu Aug 25 14:14:36 2005
New Revision: 16480

Modified:
   pypy/dist/pypy/interpreter/pyparser/pythonlexer.py
   pypy/dist/pypy/interpreter/pyparser/pytokenize.py
Log:
 change error message in an attempt pass test_eof (not yet)


Modified: pypy/dist/pypy/interpreter/pyparser/pythonlexer.py
==============================================================================
--- pypy/dist/pypy/interpreter/pyparser/pythonlexer.py	(original)
+++ pypy/dist/pypy/interpreter/pyparser/pythonlexer.py	Thu Aug 25 14:14:36 2005
@@ -123,7 +123,7 @@
 
         if contstr:                            # continued string
             if not line:
-                raise TokenError("EOF in multi-line string", line,
+                raise TokenError("EOF while scanning triple-quoted string", line,
                                  (lnum, 0), token_list)
             endmatch = endDFA.recognize(line)
             if endmatch >= 0:
@@ -259,7 +259,6 @@
                         tok = Token(pytoken.STRING, token)
                         token_list.append((tok, line, lnum, pos))
                         last_comment = ''
-                        # token_list.append((STRING, token, spos, epos, line))
                 elif initial in namechars:                 # ordinary name
                     tok = Token(pytoken.NAME, token)
                     token_list.append((tok, line, lnum, pos))

Modified: pypy/dist/pypy/interpreter/pyparser/pytokenize.py
==============================================================================
--- pypy/dist/pypy/interpreter/pyparser/pytokenize.py	(original)
+++ pypy/dist/pypy/interpreter/pyparser/pytokenize.py	Thu Aug 25 14:14:36 2005
@@ -20,7 +20,7 @@
 from __future__ import generators
 from pypy.interpreter.pyparser import automata
 
-__all__ = [ "tokenize", "generate_tokens", ]
+__all__ = [ "tokenize" ]
 
 # ______________________________________________________________________
 # Automatically generated DFA's (with one or two hand tweeks):



More information about the Pypy-commit mailing list