mirror of
https://github.com/python/cpython.git
synced 2024-12-01 11:15:56 +01:00
cd16bf6404
svn+ssh://pythondev@svn.python.org/python/branches/p3yk ................ r55837 | guido.van.rossum | 2007-06-08 16:04:42 -0700 (Fri, 08 Jun 2007) | 2 lines PEP 3119 -- the abc module. ................ r55838 | guido.van.rossum | 2007-06-08 17:38:55 -0700 (Fri, 08 Jun 2007) | 2 lines Implement part of PEP 3119 -- One Trick Ponies. ................ r55847 | guido.van.rossum | 2007-06-09 08:28:06 -0700 (Sat, 09 Jun 2007) | 2 lines Different way to do one trick ponies, allowing registration (per PEP strawman). ................ r55849 | guido.van.rossum | 2007-06-09 18:06:38 -0700 (Sat, 09 Jun 2007) | 3 lines Make sure that the magic looking for __hash__ (etc.) doesn't apply to real subclasses of Hashable. ................ r55852 | guido.van.rossum | 2007-06-10 08:29:51 -0700 (Sun, 10 Jun 2007) | 2 lines Add some more examples, e.g. generators and dict views. ................ r55853 | guido.van.rossum | 2007-06-10 08:31:59 -0700 (Sun, 10 Jun 2007) | 2 lines keys() and items() *are* containers -- just values() isn't. ................ r55864 | georg.brandl | 2007-06-10 15:29:40 -0700 (Sun, 10 Jun 2007) | 2 lines PEP 3127: new octal literals, binary literals. ................ r55865 | georg.brandl | 2007-06-10 15:31:37 -0700 (Sun, 10 Jun 2007) | 2 lines Some octal literal fixes in Tools. ................ r55866 | georg.brandl | 2007-06-10 15:37:43 -0700 (Sun, 10 Jun 2007) | 2 lines Tokenizer changes for PEP 3127. ................ r55867 | georg.brandl | 2007-06-10 15:37:55 -0700 (Sun, 10 Jun 2007) | 2 lines Some docs for PEP 3127. ................ r55868 | georg.brandl | 2007-06-10 15:44:39 -0700 (Sun, 10 Jun 2007) | 2 lines Missed a place in intobject.c. Is that used anymore anyway? ................ r55871 | neal.norwitz | 2007-06-10 18:31:49 -0700 (Sun, 10 Jun 2007) | 182 lines Merged revisions 55729-55868 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r55731 | neal.norwitz | 2007-06-01 00:29:12 -0700 (Fri, 01 Jun 2007) | 7 lines SF 1668596/1720897: distutils now copies data files even if package_dir is empty. This needs to be backported. I'm too tired tonight. It would be great if someone backports this if the buildbots are ok with it. Otherwise, I will try to get to it tomorrow. ........ r55732 | georg.brandl | 2007-06-01 04:33:33 -0700 (Fri, 01 Jun 2007) | 2 lines Bug #1722484: remove docstrings again when running with -OO. ........ r55735 | georg.brandl | 2007-06-01 12:20:27 -0700 (Fri, 01 Jun 2007) | 2 lines Fix wrong issue number. ........ r55739 | brett.cannon | 2007-06-01 20:02:29 -0700 (Fri, 01 Jun 2007) | 3 lines Have configure raise an error when building on AtheOS. Code specific to AtheOS will be removed in Python 2.7. ........ r55746 | neal.norwitz | 2007-06-02 11:33:53 -0700 (Sat, 02 Jun 2007) | 1 line Update expected birthday of 2.6 ........ r55751 | neal.norwitz | 2007-06-03 13:32:50 -0700 (Sun, 03 Jun 2007) | 10 lines Backout the original 'fix' to 1721309 which had no effect. Different versions of Berkeley DB handle this differently. The comments and bug report should have the details. Memory is allocated in 4.4 (and presumably earlier), but not in 4.5. Thus 4.5 has the free error, but not earlier versions. Mostly update comments, plus make the free conditional. This fix was already applied to the 2.5 branch. ........ r55752 | brett.cannon | 2007-06-03 16:13:41 -0700 (Sun, 03 Jun 2007) | 6 lines Make _strptime.TimeRE().pattern() use ``\s+`` for matching whitespace instead of ``\s*``. This prevents patterns from "stealing" bits from other patterns in order to make a match work. Closes bug #1730389. Will be backported. ........ r55766 | hyeshik.chang | 2007-06-05 11:16:52 -0700 (Tue, 05 Jun 2007) | 4 lines Fix build on FreeBSD. Bluetooth HCI API in FreeBSD is quite different from Linux's. Just fix the build for now but the code doesn't support the complete capability of HCI on FreeBSD yet. ........ r55770 | hyeshik.chang | 2007-06-05 11:58:51 -0700 (Tue, 05 Jun 2007) | 4 lines Bug #1728403: Fix a bug that CJKCodecs StreamReader hangs when it reads a file that ends with incomplete sequence and sizehint argument for .read() is specified. ........ r55775 | hyeshik.chang | 2007-06-05 12:28:15 -0700 (Tue, 05 Jun 2007) | 2 lines Fix for Windows: close a temporary file before trying to delete it. ........ r55783 | guido.van.rossum | 2007-06-05 14:24:47 -0700 (Tue, 05 Jun 2007) | 2 lines Patch by Tim Delany (missing DECREF). SF #1731330. ........ r55785 | collin.winter | 2007-06-05 17:17:35 -0700 (Tue, 05 Jun 2007) | 3 lines Patch #1731049: make threading.py use a proper "raise" when checking internal state, rather than assert statements (which get stripped out by -O). ........ r55786 | facundo.batista | 2007-06-06 08:13:37 -0700 (Wed, 06 Jun 2007) | 4 lines FTP.ntransfercmd method now uses create_connection when passive, using the timeout received in connection time. ........ r55792 | facundo.batista | 2007-06-06 10:15:23 -0700 (Wed, 06 Jun 2007) | 7 lines Added an optional timeout parameter to function urllib2.urlopen, with tests in test_urllib2net.py (must have network resource enabled to execute them). Also modified test_urllib2.py because testing mock classes must take it into acount. Docs are also updated. ........ r55793 | thomas.heller | 2007-06-06 13:19:19 -0700 (Wed, 06 Jun 2007) | 1 line Build _ctypes and _ctypes_test in the ReleaseAMD64 configuration. ........ r55802 | georg.brandl | 2007-06-07 06:23:24 -0700 (Thu, 07 Jun 2007) | 3 lines Disallow function calls like foo(None=1). Backport from py3k rev. 55708 by Guido. ........ r55804 | georg.brandl | 2007-06-07 06:30:24 -0700 (Thu, 07 Jun 2007) | 2 lines Make reindent.py executable. ........ r55805 | georg.brandl | 2007-06-07 06:34:10 -0700 (Thu, 07 Jun 2007) | 2 lines Patch #1667860: Fix UnboundLocalError in urllib2. ........ r55821 | kristjan.jonsson | 2007-06-07 16:53:49 -0700 (Thu, 07 Jun 2007) | 1 line Fixing changes to getbuildinfo.c that broke linux builds ........ r55828 | thomas.heller | 2007-06-08 09:10:27 -0700 (Fri, 08 Jun 2007) | 1 line Make this test work with older Python releases where struct has no 't' format character. ........ r55829 | martin.v.loewis | 2007-06-08 10:29:20 -0700 (Fri, 08 Jun 2007) | 3 lines Bug #1733488: Fix compilation of bufferobject.c on AIX. Will backport to 2.5. ........ r55831 | thomas.heller | 2007-06-08 11:20:09 -0700 (Fri, 08 Jun 2007) | 2 lines [ 1715718 ] x64 clean compile patch for _ctypes, by Kristj?n Valur with small modifications. ........ r55832 | thomas.heller | 2007-06-08 12:01:06 -0700 (Fri, 08 Jun 2007) | 1 line Fix gcc warnings intruduced by passing Py_ssize_t to PyErr_Format calls. ........ r55833 | thomas.heller | 2007-06-08 12:08:31 -0700 (Fri, 08 Jun 2007) | 2 lines Fix wrong documentation, and correct the punktuation. Closes [1700455]. ........ r55834 | thomas.heller | 2007-06-08 12:14:23 -0700 (Fri, 08 Jun 2007) | 1 line Fix warnings by using proper function prototype. ........ r55839 | neal.norwitz | 2007-06-08 20:36:34 -0700 (Fri, 08 Jun 2007) | 7 lines Prevent expandtabs() on string and unicode objects from causing a segfault when a large width is passed on 32-bit platforms. Found by Google. It would be good for people to review this especially carefully and verify I don't have an off by one error and there is no other way to cause overflow. ........ r55841 | neal.norwitz | 2007-06-08 21:48:22 -0700 (Fri, 08 Jun 2007) | 1 line Use macro version of GET_SIZE to avoid Coverity warning (#150) about a possible error. ........ r55842 | martin.v.loewis | 2007-06-09 00:42:52 -0700 (Sat, 09 Jun 2007) | 3 lines Patch #1733960: Allow T_LONGLONG to accept ints. Will backport to 2.5. ........ r55843 | martin.v.loewis | 2007-06-09 00:58:05 -0700 (Sat, 09 Jun 2007) | 2 lines Fix Windows build. ........ r55845 | martin.v.loewis | 2007-06-09 03:10:26 -0700 (Sat, 09 Jun 2007) | 2 lines Provide LLONG_MAX for S390. ........ r55854 | thomas.heller | 2007-06-10 08:59:17 -0700 (Sun, 10 Jun 2007) | 4 lines First version of build scripts for Windows/AMD64 (no external components are built yet, and 'kill_python' is disabled). ........ r55855 | thomas.heller | 2007-06-10 10:55:51 -0700 (Sun, 10 Jun 2007) | 3 lines For now, disable the _bsddb, _sqlite3, _ssl, _testcapi, _tkinter modules in the ReleaseAMD64 configuration because they do not compile. ........ r55856 | thomas.heller | 2007-06-10 11:27:54 -0700 (Sun, 10 Jun 2007) | 1 line Need to set the environment variables, otherwise devenv.com is not found. ........ r55860 | thomas.heller | 2007-06-10 14:01:17 -0700 (Sun, 10 Jun 2007) | 1 line Revert commit 55855. ........ ................ r55880 | neal.norwitz | 2007-06-10 22:07:36 -0700 (Sun, 10 Jun 2007) | 5 lines Fix the refleak counter on test_collections. The ABC metaclass creates a registry which must be cleared on each run. Otherwise, there *seem* to be refleaks when there really aren't any. (The class is held within the registry even though it's no longer needed.) ................ r55884 | neal.norwitz | 2007-06-10 22:46:33 -0700 (Sun, 10 Jun 2007) | 1 line These tests have been removed, so they are no longer needed here ................ r55886 | georg.brandl | 2007-06-11 00:26:37 -0700 (Mon, 11 Jun 2007) | 3 lines Optimize access to True and False in the compiler (if True) and the peepholer (LOAD_NAME True). ................ r55905 | georg.brandl | 2007-06-11 10:02:26 -0700 (Mon, 11 Jun 2007) | 5 lines Remove __oct__ and __hex__ and use __index__ for converting non-ints before formatting in a base. Add a bin() builtin. ................ r55906 | georg.brandl | 2007-06-11 10:04:44 -0700 (Mon, 11 Jun 2007) | 2 lines int(x, 0) does not "guess". ................ r55907 | georg.brandl | 2007-06-11 10:05:47 -0700 (Mon, 11 Jun 2007) | 2 lines Add a comment to explain that nb_oct and nb_hex are nonfunctional. ................ r55908 | guido.van.rossum | 2007-06-11 10:49:18 -0700 (Mon, 11 Jun 2007) | 2 lines Get rid of unused imports and comment. ................ r55910 | guido.van.rossum | 2007-06-11 13:05:17 -0700 (Mon, 11 Jun 2007) | 2 lines _Abstract.__new__ now requires either no arguments or __init__ overridden. ................ r55911 | guido.van.rossum | 2007-06-11 13:07:49 -0700 (Mon, 11 Jun 2007) | 7 lines Move the collections ABCs to a separate file, _abcoll.py, in order to avoid needing to import _collections.so during the bootstrap (this will become apparent in the next submit of os.py). Add (plain and mutable) ABCs for Set, Mapping, Sequence. ................ r55912 | guido.van.rossum | 2007-06-11 13:09:31 -0700 (Mon, 11 Jun 2007) | 2 lines Rewrite the _Environ class to use the new collections ABCs. ................ r55913 | guido.van.rossum | 2007-06-11 13:59:45 -0700 (Mon, 11 Jun 2007) | 72 lines Merged revisions 55869-55912 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r55869 | neal.norwitz | 2007-06-10 17:42:11 -0700 (Sun, 10 Jun 2007) | 1 line Add Atul Varma for patch # 1667860 ........ r55870 | neal.norwitz | 2007-06-10 18:22:03 -0700 (Sun, 10 Jun 2007) | 1 line Ignore valgrind problems on Ubuntu from ld ........ r55872 | neal.norwitz | 2007-06-10 18:48:46 -0700 (Sun, 10 Jun 2007) | 2 lines Ignore config.status.lineno which seems new (new autoconf?) ........ r55873 | neal.norwitz | 2007-06-10 19:14:39 -0700 (Sun, 10 Jun 2007) | 1 line Prevent these tests from running on Win64 since they don\'t apply there either ........ r55874 | neal.norwitz | 2007-06-10 19:16:10 -0700 (Sun, 10 Jun 2007) | 5 lines Fix a bug when there was a newline in the string expandtabs was called on. This also catches another condition that can overflow. Will backport. ........ r55879 | neal.norwitz | 2007-06-10 21:52:37 -0700 (Sun, 10 Jun 2007) | 1 line Prevent hang if the port cannot be opened. ........ r55881 | neal.norwitz | 2007-06-10 22:28:45 -0700 (Sun, 10 Jun 2007) | 4 lines Add all of the distuils modules that don't seem to have explicit tests. :-( Move an import in mworkscompiler so that this module can be imported on any platform. Hopefully this works on all platforms. ........ r55882 | neal.norwitz | 2007-06-10 22:35:10 -0700 (Sun, 10 Jun 2007) | 4 lines SF #1734732, lower case the module names per PEP 8. Will backport. ........ r55885 | neal.norwitz | 2007-06-10 23:16:48 -0700 (Sun, 10 Jun 2007) | 4 lines Not sure why this only fails sometimes on Unix machines. Better to disable it and only import msvccompiler on Windows since that's the only place it can work anyways. ........ r55887 | neal.norwitz | 2007-06-11 00:29:43 -0700 (Mon, 11 Jun 2007) | 4 lines Bug #1734723: Fix repr.Repr() so it doesn't ignore the maxtuple attribute. Will backport ........ r55889 | neal.norwitz | 2007-06-11 00:36:24 -0700 (Mon, 11 Jun 2007) | 1 line Reflow long line ........ r55896 | thomas.heller | 2007-06-11 08:58:33 -0700 (Mon, 11 Jun 2007) | 3 lines Use "O&" in calls to PyArg_Parse when we need a 'void*' instead of "k" or "K" codes. ........ r55901 | facundo.batista | 2007-06-11 09:27:08 -0700 (Mon, 11 Jun 2007) | 5 lines Added versionchanged flag to all the methods which received a new optional timeout parameter, and a versionadded flag to the socket.create_connection function. ........ ................ r55914 | guido.van.rossum | 2007-06-11 14:19:50 -0700 (Mon, 11 Jun 2007) | 3 lines New super() implementation, for PEP 3135 (though the PEP is not yet updated to this design, and small tweaks may still be made later). ................ r55923 | guido.van.rossum | 2007-06-11 21:15:24 -0700 (Mon, 11 Jun 2007) | 4 lines I'm guessing this module broke when Neal ripped out the types module -- it used 'list' both as a local variable and as the built-in list type. Renamed the local variable since that was easier. ................ r55924 | guido.van.rossum | 2007-06-11 21:20:05 -0700 (Mon, 11 Jun 2007) | 5 lines Change all occurrences of super(<thisclass>, <firstarg>) to super(). Seems to have worked, all the tests still pass. Exception: test_descr and test_descrtut, which have tons of these and are there to test the various usages. ................ r55939 | collin.winter | 2007-06-12 13:57:33 -0700 (Tue, 12 Jun 2007) | 1 line Patch #1735485: remove StandardError from the exception hierarchy. ................ r55954 | neal.norwitz | 2007-06-12 21:56:32 -0700 (Tue, 12 Jun 2007) | 51 lines Merged revisions 55913-55950 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r55926 | marc-andre.lemburg | 2007-06-12 02:09:58 -0700 (Tue, 12 Jun 2007) | 3 lines Apply patch #1734945 to support TurboLinux as distribution. ........ r55927 | marc-andre.lemburg | 2007-06-12 02:26:49 -0700 (Tue, 12 Jun 2007) | 3 lines Add patch #1726668: Windows Vista support. ........ r55929 | thomas.heller | 2007-06-12 08:36:22 -0700 (Tue, 12 Jun 2007) | 1 line Checkout, but do not yet try to build, exernal sources. ........ r55930 | thomas.heller | 2007-06-12 09:08:27 -0700 (Tue, 12 Jun 2007) | 6 lines Add bufferoverflowU.lib to the libraries needed by _ssl (is this the right thing to do?). Set the /XP64 /RETAIL build enviroment in the makefile when building ReleaseAMD64. ........ r55931 | thomas.heller | 2007-06-12 09:23:19 -0700 (Tue, 12 Jun 2007) | 5 lines Revert this change, since it breaks the win32 build: Add bufferoverflowU.lib to the libraries needed by _ssl (is this the right thing to do?). ........ r55934 | thomas.heller | 2007-06-12 10:28:31 -0700 (Tue, 12 Jun 2007) | 3 lines Specify the bufferoverflowU.lib to the makefile on the command line (for ReleaseAMD64 builds). ........ r55937 | thomas.heller | 2007-06-12 12:02:59 -0700 (Tue, 12 Jun 2007) | 3 lines Add bufferoverflowU.lib to PCBuild\_bsddb.vcproj. Build sqlite3.dll and bsddb. ........ r55938 | thomas.heller | 2007-06-12 12:56:12 -0700 (Tue, 12 Jun 2007) | 2 lines Don't rebuild Berkeley DB if not needed (this was committed by accident). ........ r55948 | martin.v.loewis | 2007-06-12 20:42:19 -0700 (Tue, 12 Jun 2007) | 3 lines Provide PY_LLONG_MAX on all systems having long long. Will backport to 2.5. ........ ................ r55959 | guido.van.rossum | 2007-06-13 09:22:41 -0700 (Wed, 13 Jun 2007) | 2 lines Fix a compilation warning. ................
392 lines
15 KiB
Python
392 lines
15 KiB
Python
"""Tokenization help for Python programs.
|
|
|
|
generate_tokens(readline) is a generator that breaks a stream of
|
|
text into Python tokens. It accepts a readline-like method which is called
|
|
repeatedly to get the next line of input (or "" for EOF). It generates
|
|
5-tuples with these members:
|
|
|
|
the token type (see token.py)
|
|
the token (a string)
|
|
the starting (row, column) indices of the token (a 2-tuple of ints)
|
|
the ending (row, column) indices of the token (a 2-tuple of ints)
|
|
the original line (string)
|
|
|
|
It is designed to match the working of the Python tokenizer exactly, except
|
|
that it produces COMMENT tokens for comments and gives type OP for all
|
|
operators
|
|
|
|
Older entry points
|
|
tokenize_loop(readline, tokeneater)
|
|
tokenize(readline, tokeneater=printtoken)
|
|
are the same, except instead of generating tokens, tokeneater is a callback
|
|
function to which the 5 fields described above are passed as 5 arguments,
|
|
each time a new token is found."""
|
|
|
|
__author__ = 'Ka-Ping Yee <ping@lfw.org>'
|
|
__credits__ = \
|
|
'GvR, ESR, Tim Peters, Thomas Wouters, Fred Drake, Skip Montanaro, Raymond Hettinger'
|
|
|
|
import string, re
|
|
from token import *
|
|
|
|
import token
|
|
__all__ = [x for x in dir(token) if x[0] != '_'] + ["COMMENT", "tokenize",
|
|
"generate_tokens", "NL", "untokenize"]
|
|
del token
|
|
|
|
COMMENT = N_TOKENS
|
|
tok_name[COMMENT] = 'COMMENT'
|
|
NL = N_TOKENS + 1
|
|
tok_name[NL] = 'NL'
|
|
N_TOKENS += 2
|
|
|
|
def group(*choices): return '(' + '|'.join(choices) + ')'
|
|
def any(*choices): return group(*choices) + '*'
|
|
def maybe(*choices): return group(*choices) + '?'
|
|
|
|
Whitespace = r'[ \f\t]*'
|
|
Comment = r'#[^\r\n]*'
|
|
Ignore = Whitespace + any(r'\\\r?\n' + Whitespace) + maybe(Comment)
|
|
Name = r'[a-zA-Z_]\w*'
|
|
|
|
Hexnumber = r'0[xX][\da-fA-F]*'
|
|
Binnumber = r'0[bB][01]*'
|
|
Octnumber = r'0[oO][0-7]*'
|
|
Decnumber = r'(?:0+|[1-9]\d*)'
|
|
Intnumber = group(Hexnumber, Binnumber, Octnumber, Decnumber)
|
|
Exponent = r'[eE][-+]?\d+'
|
|
Pointfloat = group(r'\d+\.\d*', r'\.\d+') + maybe(Exponent)
|
|
Expfloat = r'\d+' + Exponent
|
|
Floatnumber = group(Pointfloat, Expfloat)
|
|
Imagnumber = group(r'\d+[jJ]', Floatnumber + r'[jJ]')
|
|
Number = group(Imagnumber, Floatnumber, Intnumber)
|
|
|
|
# Tail end of ' string.
|
|
Single = r"[^'\\]*(?:\\.[^'\\]*)*'"
|
|
# Tail end of " string.
|
|
Double = r'[^"\\]*(?:\\.[^"\\]*)*"'
|
|
# Tail end of ''' string.
|
|
Single3 = r"[^'\\]*(?:(?:\\.|'(?!''))[^'\\]*)*'''"
|
|
# Tail end of """ string.
|
|
Double3 = r'[^"\\]*(?:(?:\\.|"(?!""))[^"\\]*)*"""'
|
|
Triple = group("[uU]?[rR]?'''", '[uU]?[rR]?"""')
|
|
# Single-line ' or " string.
|
|
String = group(r"[uU]?[rR]?'[^\n'\\]*(?:\\.[^\n'\\]*)*'",
|
|
r'[uU]?[rR]?"[^\n"\\]*(?:\\.[^\n"\\]*)*"')
|
|
|
|
# Because of leftmost-then-longest match semantics, be sure to put the
|
|
# longest operators first (e.g., if = came before ==, == would get
|
|
# recognized as two instances of =).
|
|
Operator = group(r"\*\*=?", r">>=?", r"<<=?", r"!=",
|
|
r"//=?", r"->",
|
|
r"[+\-*/%&|^=<>]=?",
|
|
r"~")
|
|
|
|
Bracket = '[][(){}]'
|
|
Special = group(r'\r?\n', r'\.\.\.', r'[:;.,@]')
|
|
Funny = group(Operator, Bracket, Special)
|
|
|
|
PlainToken = group(Number, Funny, String, Name)
|
|
Token = Ignore + PlainToken
|
|
|
|
# First (or only) line of ' or " string.
|
|
ContStr = group(r"[uU]?[rR]?'[^\n'\\]*(?:\\.[^\n'\\]*)*" +
|
|
group("'", r'\\\r?\n'),
|
|
r'[uU]?[rR]?"[^\n"\\]*(?:\\.[^\n"\\]*)*' +
|
|
group('"', r'\\\r?\n'))
|
|
PseudoExtras = group(r'\\\r?\n', Comment, Triple)
|
|
PseudoToken = Whitespace + group(PseudoExtras, Number, Funny, ContStr, Name)
|
|
|
|
tokenprog, pseudoprog, single3prog, double3prog = map(
|
|
re.compile, (Token, PseudoToken, Single3, Double3))
|
|
endprogs = {"'": re.compile(Single), '"': re.compile(Double),
|
|
"'''": single3prog, '"""': double3prog,
|
|
"r'''": single3prog, 'r"""': double3prog,
|
|
"u'''": single3prog, 'u"""': double3prog,
|
|
"ur'''": single3prog, 'ur"""': double3prog,
|
|
"R'''": single3prog, 'R"""': double3prog,
|
|
"U'''": single3prog, 'U"""': double3prog,
|
|
"uR'''": single3prog, 'uR"""': double3prog,
|
|
"Ur'''": single3prog, 'Ur"""': double3prog,
|
|
"UR'''": single3prog, 'UR"""': double3prog,
|
|
'r': None, 'R': None, 'u': None, 'U': None}
|
|
|
|
triple_quoted = {}
|
|
for t in ("'''", '"""',
|
|
"r'''", 'r"""', "R'''", 'R"""',
|
|
"u'''", 'u"""', "U'''", 'U"""',
|
|
"ur'''", 'ur"""', "Ur'''", 'Ur"""',
|
|
"uR'''", 'uR"""', "UR'''", 'UR"""'):
|
|
triple_quoted[t] = t
|
|
single_quoted = {}
|
|
for t in ("'", '"',
|
|
"r'", 'r"', "R'", 'R"',
|
|
"u'", 'u"', "U'", 'U"',
|
|
"ur'", 'ur"', "Ur'", 'Ur"',
|
|
"uR'", 'uR"', "UR'", 'UR"' ):
|
|
single_quoted[t] = t
|
|
|
|
tabsize = 8
|
|
|
|
class TokenError(Exception): pass
|
|
|
|
class StopTokenizing(Exception): pass
|
|
|
|
def printtoken(type, token, startrowcol, endrowcol, line): # for testing
|
|
(srow, scol), (erow, ecol) = startrowcol, endrowcol
|
|
print("%d,%d-%d,%d:\t%s\t%s" % \
|
|
(srow, scol, erow, ecol, tok_name[type], repr(token)))
|
|
|
|
def tokenize(readline, tokeneater=printtoken):
|
|
"""
|
|
The tokenize() function accepts two parameters: one representing the
|
|
input stream, and one providing an output mechanism for tokenize().
|
|
|
|
The first parameter, readline, must be a callable object which provides
|
|
the same interface as the readline() method of built-in file objects.
|
|
Each call to the function should return one line of input as a string.
|
|
|
|
The second parameter, tokeneater, must also be a callable object. It is
|
|
called once for each token, with five arguments, corresponding to the
|
|
tuples generated by generate_tokens().
|
|
"""
|
|
try:
|
|
tokenize_loop(readline, tokeneater)
|
|
except StopTokenizing:
|
|
pass
|
|
|
|
# backwards compatible interface
|
|
def tokenize_loop(readline, tokeneater):
|
|
for token_info in generate_tokens(readline):
|
|
tokeneater(*token_info)
|
|
|
|
class Untokenizer:
|
|
|
|
def __init__(self):
|
|
self.tokens = []
|
|
self.prev_row = 1
|
|
self.prev_col = 0
|
|
|
|
def add_whitespace(self, start):
|
|
row, col = start
|
|
assert row <= self.prev_row
|
|
col_offset = col - self.prev_col
|
|
if col_offset:
|
|
self.tokens.append(" " * col_offset)
|
|
|
|
def untokenize(self, iterable):
|
|
for t in iterable:
|
|
if len(t) == 2:
|
|
self.compat(t, iterable)
|
|
break
|
|
tok_type, token, start, end, line = t
|
|
self.add_whitespace(start)
|
|
self.tokens.append(token)
|
|
self.prev_row, self.prev_col = end
|
|
if tok_type in (NEWLINE, NL):
|
|
self.prev_row += 1
|
|
self.prev_col = 0
|
|
return "".join(self.tokens)
|
|
|
|
def compat(self, token, iterable):
|
|
startline = False
|
|
indents = []
|
|
toks_append = self.tokens.append
|
|
toknum, tokval = token
|
|
if toknum in (NAME, NUMBER):
|
|
tokval += ' '
|
|
if toknum in (NEWLINE, NL):
|
|
startline = True
|
|
for tok in iterable:
|
|
toknum, tokval = tok[:2]
|
|
|
|
if toknum in (NAME, NUMBER):
|
|
tokval += ' '
|
|
|
|
if toknum == INDENT:
|
|
indents.append(tokval)
|
|
continue
|
|
elif toknum == DEDENT:
|
|
indents.pop()
|
|
continue
|
|
elif toknum in (NEWLINE, NL):
|
|
startline = True
|
|
elif startline and indents:
|
|
toks_append(indents[-1])
|
|
startline = False
|
|
toks_append(tokval)
|
|
|
|
def untokenize(iterable):
|
|
"""Transform tokens back into Python source code.
|
|
|
|
Each element returned by the iterable must be a token sequence
|
|
with at least two elements, a token number and token value. If
|
|
only two tokens are passed, the resulting output is poor.
|
|
|
|
Round-trip invariant for full input:
|
|
Untokenized source will match input source exactly
|
|
|
|
Round-trip invariant for limited intput:
|
|
# Output text will tokenize the back to the input
|
|
t1 = [tok[:2] for tok in generate_tokens(f.readline)]
|
|
newcode = untokenize(t1)
|
|
readline = iter(newcode.splitlines(1)).__next__
|
|
t2 = [tok[:2] for tokin generate_tokens(readline)]
|
|
assert t1 == t2
|
|
"""
|
|
ut = Untokenizer()
|
|
return ut.untokenize(iterable)
|
|
|
|
def generate_tokens(readline):
|
|
"""
|
|
The generate_tokens() generator requires one argment, readline, which
|
|
must be a callable object which provides the same interface as the
|
|
readline() method of built-in file objects. Each call to the function
|
|
should return one line of input as a string. Alternately, readline
|
|
can be a callable function terminating with StopIteration:
|
|
readline = open(myfile).__next__ # Example of alternate readline
|
|
|
|
The generator produces 5-tuples with these members: the token type; the
|
|
token string; a 2-tuple (srow, scol) of ints specifying the row and
|
|
column where the token begins in the source; a 2-tuple (erow, ecol) of
|
|
ints specifying the row and column where the token ends in the source;
|
|
and the line on which the token was found. The line passed is the
|
|
logical line; continuation lines are included.
|
|
"""
|
|
lnum = parenlev = continued = 0
|
|
namechars, numchars = string.ascii_letters + '_', '0123456789'
|
|
contstr, needcont = '', 0
|
|
contline = None
|
|
indents = [0]
|
|
|
|
while 1: # loop over lines in stream
|
|
try:
|
|
line = readline()
|
|
except StopIteration:
|
|
line = ''
|
|
lnum = lnum + 1
|
|
pos, max = 0, len(line)
|
|
|
|
if contstr: # continued string
|
|
if not line:
|
|
raise TokenError, ("EOF in multi-line string", strstart)
|
|
endmatch = endprog.match(line)
|
|
if endmatch:
|
|
pos = end = endmatch.end(0)
|
|
yield (STRING, contstr + line[:end],
|
|
strstart, (lnum, end), contline + line)
|
|
contstr, needcont = '', 0
|
|
contline = None
|
|
elif needcont and line[-2:] != '\\\n' and line[-3:] != '\\\r\n':
|
|
yield (ERRORTOKEN, contstr + line,
|
|
strstart, (lnum, len(line)), contline)
|
|
contstr = ''
|
|
contline = None
|
|
continue
|
|
else:
|
|
contstr = contstr + line
|
|
contline = contline + line
|
|
continue
|
|
|
|
elif parenlev == 0 and not continued: # new statement
|
|
if not line: break
|
|
column = 0
|
|
while pos < max: # measure leading whitespace
|
|
if line[pos] == ' ': column = column + 1
|
|
elif line[pos] == '\t': column = (column/tabsize + 1)*tabsize
|
|
elif line[pos] == '\f': column = 0
|
|
else: break
|
|
pos = pos + 1
|
|
if pos == max: break
|
|
|
|
if line[pos] in '#\r\n': # skip comments or blank lines
|
|
if line[pos] == '#':
|
|
comment_token = line[pos:].rstrip('\r\n')
|
|
nl_pos = pos + len(comment_token)
|
|
yield (COMMENT, comment_token,
|
|
(lnum, pos), (lnum, pos + len(comment_token)), line)
|
|
yield (NL, line[nl_pos:],
|
|
(lnum, nl_pos), (lnum, len(line)), line)
|
|
else:
|
|
yield ((NL, COMMENT)[line[pos] == '#'], line[pos:],
|
|
(lnum, pos), (lnum, len(line)), line)
|
|
continue
|
|
|
|
if column > indents[-1]: # count indents or dedents
|
|
indents.append(column)
|
|
yield (INDENT, line[:pos], (lnum, 0), (lnum, pos), line)
|
|
while column < indents[-1]:
|
|
if column not in indents:
|
|
raise IndentationError(
|
|
"unindent does not match any outer indentation level",
|
|
("<tokenize>", lnum, pos, line))
|
|
indents = indents[:-1]
|
|
yield (DEDENT, '', (lnum, pos), (lnum, pos), line)
|
|
|
|
else: # continued statement
|
|
if not line:
|
|
raise TokenError, ("EOF in multi-line statement", (lnum, 0))
|
|
continued = 0
|
|
|
|
while pos < max:
|
|
pseudomatch = pseudoprog.match(line, pos)
|
|
if pseudomatch: # scan for tokens
|
|
start, end = pseudomatch.span(1)
|
|
spos, epos, pos = (lnum, start), (lnum, end), end
|
|
token, initial = line[start:end], line[start]
|
|
|
|
if (initial in numchars or # ordinary number
|
|
(initial == '.' and token != '.' and token != '...')):
|
|
yield (NUMBER, token, spos, epos, line)
|
|
elif initial in '\r\n':
|
|
yield (NL if parenlev > 0 else NEWLINE,
|
|
token, spos, epos, line)
|
|
elif initial == '#':
|
|
assert not token.endswith("\n")
|
|
yield (COMMENT, token, spos, epos, line)
|
|
elif token in triple_quoted:
|
|
endprog = endprogs[token]
|
|
endmatch = endprog.match(line, pos)
|
|
if endmatch: # all on one line
|
|
pos = endmatch.end(0)
|
|
token = line[start:pos]
|
|
yield (STRING, token, spos, (lnum, pos), line)
|
|
else:
|
|
strstart = (lnum, start) # multiple lines
|
|
contstr = line[start:]
|
|
contline = line
|
|
break
|
|
elif initial in single_quoted or \
|
|
token[:2] in single_quoted or \
|
|
token[:3] in single_quoted:
|
|
if token[-1] == '\n': # continued string
|
|
strstart = (lnum, start)
|
|
endprog = (endprogs[initial] or endprogs[token[1]] or
|
|
endprogs[token[2]])
|
|
contstr, needcont = line[start:], 1
|
|
contline = line
|
|
break
|
|
else: # ordinary string
|
|
yield (STRING, token, spos, epos, line)
|
|
elif initial in namechars: # ordinary name
|
|
yield (NAME, token, spos, epos, line)
|
|
elif initial == '\\': # continued stmt
|
|
continued = 1
|
|
else:
|
|
if initial in '([{': parenlev = parenlev + 1
|
|
elif initial in ')]}': parenlev = parenlev - 1
|
|
yield (OP, token, spos, epos, line)
|
|
else:
|
|
yield (ERRORTOKEN, line[pos],
|
|
(lnum, pos), (lnum, pos+1), line)
|
|
pos = pos + 1
|
|
|
|
for indent in indents[1:]: # pop remaining indent levels
|
|
yield (DEDENT, '', (lnum, 0), (lnum, 0), '')
|
|
yield (ENDMARKER, '', (lnum, 0), (lnum, 0), '')
|
|
|
|
if __name__ == '__main__': # testing
|
|
import sys
|
|
if len(sys.argv) > 1: tokenize(open(sys.argv[1]).readline)
|
|
else: tokenize(sys.stdin.readline)
|