mirror of
https://github.com/python/cpython.git
synced 2025-10-29 04:35:05 +00:00
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.
................
1446 lines
31 KiB
C
1446 lines
31 KiB
C
|
|
/* Tokenizer implementation */
|
|
|
|
#include "Python.h"
|
|
#include "pgenheaders.h"
|
|
|
|
#include <ctype.h>
|
|
#include <assert.h>
|
|
|
|
#include "tokenizer.h"
|
|
#include "errcode.h"
|
|
|
|
#ifndef PGEN
|
|
#include "unicodeobject.h"
|
|
#include "stringobject.h"
|
|
#include "fileobject.h"
|
|
#include "codecs.h"
|
|
#include "abstract.h"
|
|
#endif /* PGEN */
|
|
|
|
#define is_potential_identifier_start(c) (\
|
|
(c >= 'a' && c <= 'z')\
|
|
|| (c >= 'A' && c <= 'Z')\
|
|
|| c == '_')
|
|
|
|
#define is_potential_identifier_char(c) (\
|
|
(c >= 'a' && c <= 'z')\
|
|
|| (c >= 'A' && c <= 'Z')\
|
|
|| (c >= '0' && c <= '9')\
|
|
|| c == '_')
|
|
|
|
extern char *PyOS_Readline(FILE *, FILE *, char *);
|
|
/* Return malloc'ed string including trailing \n;
|
|
empty malloc'ed string for EOF;
|
|
NULL if interrupted */
|
|
|
|
/* Don't ever change this -- it would break the portability of Python code */
|
|
#define TABSIZE 8
|
|
|
|
/* Convert a possibly signed character to a nonnegative int */
|
|
/* XXX This assumes characters are 8 bits wide */
|
|
#ifdef __CHAR_UNSIGNED__
|
|
#define Py_CHARMASK(c) (c)
|
|
#else
|
|
#define Py_CHARMASK(c) ((c) & 0xff)
|
|
#endif
|
|
|
|
/* Forward */
|
|
static struct tok_state *tok_new(void);
|
|
static int tok_nextc(struct tok_state *tok);
|
|
static void tok_backup(struct tok_state *tok, int c);
|
|
|
|
/* Token names */
|
|
|
|
char *_PyParser_TokenNames[] = {
|
|
"ENDMARKER",
|
|
"NAME",
|
|
"NUMBER",
|
|
"STRING",
|
|
"NEWLINE",
|
|
"INDENT",
|
|
"DEDENT",
|
|
"LPAR",
|
|
"RPAR",
|
|
"LSQB",
|
|
"RSQB",
|
|
"COLON",
|
|
"COMMA",
|
|
"SEMI",
|
|
"PLUS",
|
|
"MINUS",
|
|
"STAR",
|
|
"SLASH",
|
|
"VBAR",
|
|
"AMPER",
|
|
"LESS",
|
|
"GREATER",
|
|
"EQUAL",
|
|
"DOT",
|
|
"PERCENT",
|
|
"LBRACE",
|
|
"RBRACE",
|
|
"EQEQUAL",
|
|
"NOTEQUAL",
|
|
"LESSEQUAL",
|
|
"GREATEREQUAL",
|
|
"TILDE",
|
|
"CIRCUMFLEX",
|
|
"LEFTSHIFT",
|
|
"RIGHTSHIFT",
|
|
"DOUBLESTAR",
|
|
"PLUSEQUAL",
|
|
"MINEQUAL",
|
|
"STAREQUAL",
|
|
"SLASHEQUAL",
|
|
"PERCENTEQUAL",
|
|
"AMPEREQUAL",
|
|
"VBAREQUAL",
|
|
"CIRCUMFLEXEQUAL",
|
|
"LEFTSHIFTEQUAL",
|
|
"RIGHTSHIFTEQUAL",
|
|
"DOUBLESTAREQUAL",
|
|
"DOUBLESLASH",
|
|
"DOUBLESLASHEQUAL",
|
|
"AT",
|
|
"RARROW",
|
|
"ELLIPSIS",
|
|
/* This table must match the #defines in token.h! */
|
|
"OP",
|
|
"<ERRORTOKEN>",
|
|
"<N_TOKENS>"
|
|
};
|
|
|
|
|
|
/* Create and initialize a new tok_state structure */
|
|
|
|
static struct tok_state *
|
|
tok_new(void)
|
|
{
|
|
struct tok_state *tok = (struct tok_state *)PyMem_MALLOC(
|
|
sizeof(struct tok_state));
|
|
if (tok == NULL)
|
|
return NULL;
|
|
tok->buf = tok->cur = tok->end = tok->inp = tok->start = NULL;
|
|
tok->done = E_OK;
|
|
tok->fp = NULL;
|
|
tok->tabsize = TABSIZE;
|
|
tok->indent = 0;
|
|
tok->indstack[0] = 0;
|
|
tok->atbol = 1;
|
|
tok->pendin = 0;
|
|
tok->prompt = tok->nextprompt = NULL;
|
|
tok->lineno = 0;
|
|
tok->level = 0;
|
|
tok->filename = NULL;
|
|
tok->altwarning = 1;
|
|
tok->alterror = 1;
|
|
tok->alttabsize = 1;
|
|
tok->altindstack[0] = 0;
|
|
tok->decoding_state = 0;
|
|
tok->decoding_erred = 0;
|
|
tok->read_coding_spec = 0;
|
|
tok->encoding = NULL;
|
|
tok->cont_line = 0;
|
|
#ifndef PGEN
|
|
tok->decoding_readline = NULL;
|
|
tok->decoding_buffer = NULL;
|
|
#endif
|
|
return tok;
|
|
}
|
|
|
|
#ifdef PGEN
|
|
|
|
static char *
|
|
decoding_fgets(char *s, int size, struct tok_state *tok)
|
|
{
|
|
return fgets(s, size, tok->fp);
|
|
}
|
|
|
|
static int
|
|
decoding_feof(struct tok_state *tok)
|
|
{
|
|
return feof(tok->fp);
|
|
}
|
|
|
|
static const char *
|
|
decode_str(const char *str, struct tok_state *tok)
|
|
{
|
|
return str;
|
|
}
|
|
|
|
#else /* PGEN */
|
|
|
|
static char *
|
|
error_ret(struct tok_state *tok) /* XXX */
|
|
{
|
|
tok->decoding_erred = 1;
|
|
if (tok->fp != NULL && tok->buf != NULL) /* see PyTokenizer_Free */
|
|
PyMem_FREE(tok->buf);
|
|
tok->buf = NULL;
|
|
return NULL; /* as if it were EOF */
|
|
}
|
|
|
|
static char *
|
|
new_string(const char *s, Py_ssize_t len)
|
|
{
|
|
char* result = (char *)PyMem_MALLOC(len + 1);
|
|
if (result != NULL) {
|
|
memcpy(result, s, len);
|
|
result[len] = '\0';
|
|
}
|
|
return result;
|
|
}
|
|
|
|
static char *
|
|
get_normal_name(char *s) /* for utf-8 and latin-1 */
|
|
{
|
|
char buf[13];
|
|
int i;
|
|
for (i = 0; i < 12; i++) {
|
|
int c = s[i];
|
|
if (c == '\0') break;
|
|
else if (c == '_') buf[i] = '-';
|
|
else buf[i] = tolower(c);
|
|
}
|
|
buf[i] = '\0';
|
|
if (strcmp(buf, "utf-8") == 0 ||
|
|
strncmp(buf, "utf-8-", 6) == 0) return "utf-8";
|
|
else if (strcmp(buf, "latin-1") == 0 ||
|
|
strcmp(buf, "iso-8859-1") == 0 ||
|
|
strcmp(buf, "iso-latin-1") == 0 ||
|
|
strncmp(buf, "latin-1-", 8) == 0 ||
|
|
strncmp(buf, "iso-8859-1-", 11) == 0 ||
|
|
strncmp(buf, "iso-latin-1-", 12) == 0) return "iso-8859-1";
|
|
else return s;
|
|
}
|
|
|
|
/* Return the coding spec in S, or NULL if none is found. */
|
|
|
|
static char *
|
|
get_coding_spec(const char *s, Py_ssize_t size)
|
|
{
|
|
Py_ssize_t i;
|
|
/* Coding spec must be in a comment, and that comment must be
|
|
* the only statement on the source code line. */
|
|
for (i = 0; i < size - 6; i++) {
|
|
if (s[i] == '#')
|
|
break;
|
|
if (s[i] != ' ' && s[i] != '\t' && s[i] != '\014')
|
|
return NULL;
|
|
}
|
|
for (; i < size - 6; i++) { /* XXX inefficient search */
|
|
const char* t = s + i;
|
|
if (strncmp(t, "coding", 6) == 0) {
|
|
const char* begin = NULL;
|
|
t += 6;
|
|
if (t[0] != ':' && t[0] != '=')
|
|
continue;
|
|
do {
|
|
t++;
|
|
} while (t[0] == '\x20' || t[0] == '\t');
|
|
|
|
begin = t;
|
|
while (isalnum(Py_CHARMASK(t[0])) ||
|
|
t[0] == '-' || t[0] == '_' || t[0] == '.')
|
|
t++;
|
|
|
|
if (begin < t) {
|
|
char* r = new_string(begin, t - begin);
|
|
char* q = get_normal_name(r);
|
|
if (r != q) {
|
|
PyMem_FREE(r);
|
|
r = new_string(q, strlen(q));
|
|
}
|
|
return r;
|
|
}
|
|
}
|
|
}
|
|
return NULL;
|
|
}
|
|
|
|
/* Check whether the line contains a coding spec. If it does,
|
|
invoke the set_readline function for the new encoding.
|
|
This function receives the tok_state and the new encoding.
|
|
Return 1 on success, 0 on failure. */
|
|
|
|
static int
|
|
check_coding_spec(const char* line, Py_ssize_t size, struct tok_state *tok,
|
|
int set_readline(struct tok_state *, const char *))
|
|
{
|
|
char * cs;
|
|
int r = 1;
|
|
|
|
if (tok->cont_line)
|
|
/* It's a continuation line, so it can't be a coding spec. */
|
|
return 1;
|
|
cs = get_coding_spec(line, size);
|
|
if (cs != NULL) {
|
|
tok->read_coding_spec = 1;
|
|
if (tok->encoding == NULL) {
|
|
assert(tok->decoding_state == 1); /* raw */
|
|
if (strcmp(cs, "utf-8") == 0 ||
|
|
strcmp(cs, "iso-8859-1") == 0) {
|
|
tok->encoding = cs;
|
|
} else {
|
|
r = set_readline(tok, cs);
|
|
if (r) {
|
|
tok->encoding = cs;
|
|
tok->decoding_state = -1;
|
|
}
|
|
else
|
|
PyMem_FREE(cs);
|
|
}
|
|
} else { /* then, compare cs with BOM */
|
|
r = (strcmp(tok->encoding, cs) == 0);
|
|
PyMem_FREE(cs);
|
|
}
|
|
}
|
|
if (!r) {
|
|
cs = tok->encoding;
|
|
if (!cs)
|
|
cs = "with BOM";
|
|
PyErr_Format(PyExc_SyntaxError, "encoding problem: %s", cs);
|
|
}
|
|
return r;
|
|
}
|
|
|
|
/* See whether the file starts with a BOM. If it does,
|
|
invoke the set_readline function with the new encoding.
|
|
Return 1 on success, 0 on failure. */
|
|
|
|
static int
|
|
check_bom(int get_char(struct tok_state *),
|
|
void unget_char(int, struct tok_state *),
|
|
int set_readline(struct tok_state *, const char *),
|
|
struct tok_state *tok)
|
|
{
|
|
int ch = get_char(tok);
|
|
tok->decoding_state = 1;
|
|
if (ch == EOF) {
|
|
return 1;
|
|
} else if (ch == 0xEF) {
|
|
ch = get_char(tok); if (ch != 0xBB) goto NON_BOM;
|
|
ch = get_char(tok); if (ch != 0xBF) goto NON_BOM;
|
|
#if 0
|
|
/* Disable support for UTF-16 BOMs until a decision
|
|
is made whether this needs to be supported. */
|
|
} else if (ch == 0xFE) {
|
|
ch = get_char(tok); if (ch != 0xFF) goto NON_BOM;
|
|
if (!set_readline(tok, "utf-16-be")) return 0;
|
|
tok->decoding_state = -1;
|
|
} else if (ch == 0xFF) {
|
|
ch = get_char(tok); if (ch != 0xFE) goto NON_BOM;
|
|
if (!set_readline(tok, "utf-16-le")) return 0;
|
|
tok->decoding_state = -1;
|
|
#endif
|
|
} else {
|
|
unget_char(ch, tok);
|
|
return 1;
|
|
}
|
|
if (tok->encoding != NULL)
|
|
PyMem_FREE(tok->encoding);
|
|
tok->encoding = new_string("utf-8", 5); /* resulting is in utf-8 */
|
|
return 1;
|
|
NON_BOM:
|
|
/* any token beginning with '\xEF', '\xFE', '\xFF' is a bad token */
|
|
unget_char(0xFF, tok); /* XXX this will cause a syntax error */
|
|
return 1;
|
|
}
|
|
|
|
/* Read a line of text from TOK into S, using the stream in TOK.
|
|
Return NULL on failure, else S.
|
|
|
|
On entry, tok->decoding_buffer will be one of:
|
|
1) NULL: need to call tok->decoding_readline to get a new line
|
|
2) PyUnicodeObject *: decoding_feof has called tok->decoding_readline and
|
|
stored the result in tok->decoding_buffer
|
|
3) PyStringObject *: previous call to fp_readl did not have enough room
|
|
(in the s buffer) to copy entire contents of the line read
|
|
by tok->decoding_readline. tok->decoding_buffer has the overflow.
|
|
In this case, fp_readl is called in a loop (with an expanded buffer)
|
|
until the buffer ends with a '\n' (or until the end of the file is
|
|
reached): see tok_nextc and its calls to decoding_fgets.
|
|
*/
|
|
|
|
static char *
|
|
fp_readl(char *s, int size, struct tok_state *tok)
|
|
{
|
|
PyObject* bufobj = tok->decoding_buffer;
|
|
const char *buf;
|
|
Py_ssize_t buflen;
|
|
|
|
/* Ask for one less byte so we can terminate it */
|
|
assert(size > 0);
|
|
size--;
|
|
|
|
if (bufobj == NULL) {
|
|
bufobj = PyObject_CallObject(tok->decoding_readline, NULL);
|
|
if (bufobj == NULL)
|
|
return error_ret(tok);
|
|
}
|
|
if (PyObject_AsCharBuffer(bufobj, &buf, &buflen) < 0)
|
|
return error_ret(tok);
|
|
if (buflen > size) {
|
|
tok->decoding_buffer = PyBytes_FromStringAndSize(buf+size,
|
|
buflen-size);
|
|
if (tok->decoding_buffer == NULL)
|
|
return error_ret(tok);
|
|
buflen = size;
|
|
}
|
|
memcpy(s, buf, buflen);
|
|
s[buflen] = '\0';
|
|
if (buflen == 0) return NULL; /* EOF */
|
|
return s;
|
|
}
|
|
|
|
/* Set the readline function for TOK to a StreamReader's
|
|
readline function. The StreamReader is named ENC.
|
|
|
|
This function is called from check_bom and check_coding_spec.
|
|
|
|
ENC is usually identical to the future value of tok->encoding,
|
|
except for the (currently unsupported) case of UTF-16.
|
|
|
|
Return 1 on success, 0 on failure. */
|
|
|
|
static int
|
|
fp_setreadl(struct tok_state *tok, const char* enc)
|
|
{
|
|
PyObject *readline = NULL, *stream = NULL, *io = NULL;
|
|
int ok = 0;
|
|
|
|
io = PyImport_ImportModule("io");
|
|
if (io == NULL)
|
|
goto cleanup;
|
|
|
|
stream = PyObject_CallMethod(io, "open", "ssis",
|
|
tok->filename, "r", -1, enc);
|
|
if (stream == NULL)
|
|
goto cleanup;
|
|
|
|
readline = PyObject_GetAttrString(stream, "readline");
|
|
if (readline == NULL)
|
|
goto cleanup;
|
|
|
|
tok->decoding_readline = readline;
|
|
ok = 1;
|
|
|
|
cleanup:
|
|
Py_XDECREF(stream);
|
|
Py_XDECREF(io);
|
|
return ok;
|
|
}
|
|
|
|
/* Fetch the next byte from TOK. */
|
|
|
|
static int fp_getc(struct tok_state *tok) {
|
|
return getc(tok->fp);
|
|
}
|
|
|
|
/* Unfetch the last byte back into TOK. */
|
|
|
|
static void fp_ungetc(int c, struct tok_state *tok) {
|
|
ungetc(c, tok->fp);
|
|
}
|
|
|
|
/* Read a line of input from TOK. Determine encoding
|
|
if necessary. */
|
|
|
|
static char *
|
|
decoding_fgets(char *s, int size, struct tok_state *tok)
|
|
{
|
|
char *line = NULL;
|
|
int badchar = 0;
|
|
for (;;) {
|
|
if (tok->decoding_state < 0) {
|
|
/* We already have a codec associated with
|
|
this input. */
|
|
line = fp_readl(s, size, tok);
|
|
break;
|
|
} else if (tok->decoding_state > 0) {
|
|
/* We want a 'raw' read. */
|
|
line = Py_UniversalNewlineFgets(s, size,
|
|
tok->fp, NULL);
|
|
break;
|
|
} else {
|
|
/* We have not yet determined the encoding.
|
|
If an encoding is found, use the file-pointer
|
|
reader functions from now on. */
|
|
if (!check_bom(fp_getc, fp_ungetc, fp_setreadl, tok))
|
|
return error_ret(tok);
|
|
assert(tok->decoding_state != 0);
|
|
}
|
|
}
|
|
if (line != NULL && tok->lineno < 2 && !tok->read_coding_spec) {
|
|
if (!check_coding_spec(line, strlen(line), tok, fp_setreadl)) {
|
|
return error_ret(tok);
|
|
}
|
|
}
|
|
#ifndef PGEN
|
|
/* The default encoding is ASCII, so make sure we don't have any
|
|
non-ASCII bytes in it. */
|
|
if (line && !tok->encoding) {
|
|
unsigned char *c;
|
|
for (c = (unsigned char *)line; *c; c++)
|
|
if (*c > 127) {
|
|
badchar = *c;
|
|
break;
|
|
}
|
|
}
|
|
if (badchar) {
|
|
char buf[500];
|
|
/* Need to add 1 to the line number, since this line
|
|
has not been counted, yet. */
|
|
sprintf(buf,
|
|
"Non-ASCII character '\\x%.2x' "
|
|
"in file %.200s on line %i, "
|
|
"but no encoding declared; "
|
|
"see http://www.python.org/peps/pep-0263.html for details",
|
|
badchar, tok->filename, tok->lineno + 1);
|
|
PyErr_SetString(PyExc_SyntaxError, buf);
|
|
return error_ret(tok);
|
|
}
|
|
#endif
|
|
return line;
|
|
}
|
|
|
|
static int
|
|
decoding_feof(struct tok_state *tok)
|
|
{
|
|
if (tok->decoding_state >= 0) {
|
|
return feof(tok->fp);
|
|
} else {
|
|
PyObject* buf = tok->decoding_buffer;
|
|
if (buf == NULL) {
|
|
buf = PyObject_CallObject(tok->decoding_readline, NULL);
|
|
if (buf == NULL) {
|
|
error_ret(tok);
|
|
return 1;
|
|
} else {
|
|
tok->decoding_buffer = buf;
|
|
}
|
|
}
|
|
return PyObject_Length(buf) == 0;
|
|
}
|
|
}
|
|
|
|
/* Fetch a byte from TOK, using the string buffer. */
|
|
|
|
static int
|
|
buf_getc(struct tok_state *tok) {
|
|
return Py_CHARMASK(*tok->str++);
|
|
}
|
|
|
|
/* Unfetch a byte from TOK, using the string buffer. */
|
|
|
|
static void
|
|
buf_ungetc(int c, struct tok_state *tok) {
|
|
tok->str--;
|
|
assert(Py_CHARMASK(*tok->str) == c); /* tok->cur may point to read-only segment */
|
|
}
|
|
|
|
/* Set the readline function for TOK to ENC. For the string-based
|
|
tokenizer, this means to just record the encoding. */
|
|
|
|
static int
|
|
buf_setreadl(struct tok_state *tok, const char* enc) {
|
|
tok->enc = enc;
|
|
return 1;
|
|
}
|
|
|
|
/* Return a UTF-8 encoding Python string object from the
|
|
C byte string STR, which is encoded with ENC. */
|
|
|
|
static PyObject *
|
|
translate_into_utf8(const char* str, const char* enc) {
|
|
PyObject *utf8;
|
|
PyObject* buf = PyUnicode_Decode(str, strlen(str), enc, NULL);
|
|
if (buf == NULL)
|
|
return NULL;
|
|
utf8 = PyUnicode_AsUTF8String(buf);
|
|
Py_DECREF(buf);
|
|
return utf8;
|
|
}
|
|
|
|
/* Decode a byte string STR for use as the buffer of TOK.
|
|
Look for encoding declarations inside STR, and record them
|
|
inside TOK. */
|
|
|
|
static const char *
|
|
decode_str(const char *str, struct tok_state *tok)
|
|
{
|
|
PyObject* utf8 = NULL;
|
|
const char *s;
|
|
int lineno = 0;
|
|
tok->enc = NULL;
|
|
tok->str = str;
|
|
if (!check_bom(buf_getc, buf_ungetc, buf_setreadl, tok))
|
|
return error_ret(tok);
|
|
str = tok->str; /* string after BOM if any */
|
|
assert(str);
|
|
if (tok->enc != NULL) {
|
|
utf8 = translate_into_utf8(str, tok->enc);
|
|
if (utf8 == NULL)
|
|
return error_ret(tok);
|
|
str = PyString_AsString(utf8);
|
|
}
|
|
for (s = str;; s++) {
|
|
if (*s == '\0') break;
|
|
else if (*s == '\n') {
|
|
lineno++;
|
|
if (lineno == 2) break;
|
|
}
|
|
}
|
|
tok->enc = NULL;
|
|
if (!check_coding_spec(str, s - str, tok, buf_setreadl))
|
|
return error_ret(tok);
|
|
if (tok->enc != NULL) {
|
|
assert(utf8 == NULL);
|
|
utf8 = translate_into_utf8(str, tok->enc);
|
|
if (utf8 == NULL) {
|
|
PyErr_Format(PyExc_SyntaxError,
|
|
"unknown encoding: %s", tok->enc);
|
|
return error_ret(tok);
|
|
}
|
|
str = PyString_AsString(utf8);
|
|
}
|
|
assert(tok->decoding_buffer == NULL);
|
|
tok->decoding_buffer = utf8; /* CAUTION */
|
|
return str;
|
|
}
|
|
|
|
#endif /* PGEN */
|
|
|
|
/* Set up tokenizer for string */
|
|
|
|
struct tok_state *
|
|
PyTokenizer_FromString(const char *str)
|
|
{
|
|
struct tok_state *tok = tok_new();
|
|
if (tok == NULL)
|
|
return NULL;
|
|
str = (char *)decode_str(str, tok);
|
|
if (str == NULL) {
|
|
PyTokenizer_Free(tok);
|
|
return NULL;
|
|
}
|
|
|
|
/* XXX: constify members. */
|
|
tok->buf = tok->cur = tok->end = tok->inp = (char*)str;
|
|
return tok;
|
|
}
|
|
|
|
|
|
/* Set up tokenizer for file */
|
|
|
|
struct tok_state *
|
|
PyTokenizer_FromFile(FILE *fp, char *ps1, char *ps2)
|
|
{
|
|
struct tok_state *tok = tok_new();
|
|
if (tok == NULL)
|
|
return NULL;
|
|
if ((tok->buf = (char *)PyMem_MALLOC(BUFSIZ)) == NULL) {
|
|
PyTokenizer_Free(tok);
|
|
return NULL;
|
|
}
|
|
tok->cur = tok->inp = tok->buf;
|
|
tok->end = tok->buf + BUFSIZ;
|
|
tok->fp = fp;
|
|
tok->prompt = ps1;
|
|
tok->nextprompt = ps2;
|
|
return tok;
|
|
}
|
|
|
|
|
|
/* Free a tok_state structure */
|
|
|
|
void
|
|
PyTokenizer_Free(struct tok_state *tok)
|
|
{
|
|
if (tok->encoding != NULL)
|
|
PyMem_FREE(tok->encoding);
|
|
#ifndef PGEN
|
|
Py_XDECREF(tok->decoding_readline);
|
|
Py_XDECREF(tok->decoding_buffer);
|
|
#endif
|
|
if (tok->fp != NULL && tok->buf != NULL)
|
|
PyMem_FREE(tok->buf);
|
|
PyMem_FREE(tok);
|
|
}
|
|
|
|
/* Get next char, updating state; error code goes into tok->done */
|
|
|
|
static int
|
|
tok_nextc(register struct tok_state *tok)
|
|
{
|
|
for (;;) {
|
|
if (tok->cur != tok->inp) {
|
|
return Py_CHARMASK(*tok->cur++); /* Fast path */
|
|
}
|
|
if (tok->done != E_OK)
|
|
return EOF;
|
|
if (tok->fp == NULL) {
|
|
char *end = strchr(tok->inp, '\n');
|
|
if (end != NULL)
|
|
end++;
|
|
else {
|
|
end = strchr(tok->inp, '\0');
|
|
if (end == tok->inp) {
|
|
tok->done = E_EOF;
|
|
return EOF;
|
|
}
|
|
}
|
|
if (tok->start == NULL)
|
|
tok->buf = tok->cur;
|
|
tok->line_start = tok->cur;
|
|
tok->lineno++;
|
|
tok->inp = end;
|
|
return Py_CHARMASK(*tok->cur++);
|
|
}
|
|
if (tok->prompt != NULL) {
|
|
char *newtok = PyOS_Readline(stdin, stdout, tok->prompt);
|
|
if (tok->nextprompt != NULL)
|
|
tok->prompt = tok->nextprompt;
|
|
if (newtok == NULL)
|
|
tok->done = E_INTR;
|
|
else if (*newtok == '\0') {
|
|
PyMem_FREE(newtok);
|
|
tok->done = E_EOF;
|
|
}
|
|
else if (tok->start != NULL) {
|
|
size_t start = tok->start - tok->buf;
|
|
size_t oldlen = tok->cur - tok->buf;
|
|
size_t newlen = oldlen + strlen(newtok);
|
|
char *buf = tok->buf;
|
|
buf = (char *)PyMem_REALLOC(buf, newlen+1);
|
|
tok->lineno++;
|
|
if (buf == NULL) {
|
|
PyMem_FREE(tok->buf);
|
|
tok->buf = NULL;
|
|
PyMem_FREE(newtok);
|
|
tok->done = E_NOMEM;
|
|
return EOF;
|
|
}
|
|
tok->buf = buf;
|
|
tok->cur = tok->buf + oldlen;
|
|
tok->line_start = tok->cur;
|
|
strcpy(tok->buf + oldlen, newtok);
|
|
PyMem_FREE(newtok);
|
|
tok->inp = tok->buf + newlen;
|
|
tok->end = tok->inp + 1;
|
|
tok->start = tok->buf + start;
|
|
}
|
|
else {
|
|
tok->lineno++;
|
|
if (tok->buf != NULL)
|
|
PyMem_FREE(tok->buf);
|
|
tok->buf = newtok;
|
|
tok->line_start = tok->buf;
|
|
tok->cur = tok->buf;
|
|
tok->line_start = tok->buf;
|
|
tok->inp = strchr(tok->buf, '\0');
|
|
tok->end = tok->inp + 1;
|
|
}
|
|
}
|
|
else {
|
|
int done = 0;
|
|
Py_ssize_t cur = 0;
|
|
char *pt;
|
|
if (tok->start == NULL) {
|
|
if (tok->buf == NULL) {
|
|
tok->buf = (char *)
|
|
PyMem_MALLOC(BUFSIZ);
|
|
if (tok->buf == NULL) {
|
|
tok->done = E_NOMEM;
|
|
return EOF;
|
|
}
|
|
tok->end = tok->buf + BUFSIZ;
|
|
}
|
|
if (decoding_fgets(tok->buf, (int)(tok->end - tok->buf),
|
|
tok) == NULL) {
|
|
tok->done = E_EOF;
|
|
done = 1;
|
|
}
|
|
else {
|
|
tok->done = E_OK;
|
|
tok->inp = strchr(tok->buf, '\0');
|
|
done = tok->inp[-1] == '\n';
|
|
}
|
|
}
|
|
else {
|
|
cur = tok->cur - tok->buf;
|
|
if (decoding_feof(tok)) {
|
|
tok->done = E_EOF;
|
|
done = 1;
|
|
}
|
|
else
|
|
tok->done = E_OK;
|
|
}
|
|
tok->lineno++;
|
|
/* Read until '\n' or EOF */
|
|
while (!done) {
|
|
Py_ssize_t curstart = tok->start == NULL ? -1 :
|
|
tok->start - tok->buf;
|
|
Py_ssize_t curvalid = tok->inp - tok->buf;
|
|
Py_ssize_t newsize = curvalid + BUFSIZ;
|
|
char *newbuf = tok->buf;
|
|
newbuf = (char *)PyMem_REALLOC(newbuf,
|
|
newsize);
|
|
if (newbuf == NULL) {
|
|
tok->done = E_NOMEM;
|
|
tok->cur = tok->inp;
|
|
return EOF;
|
|
}
|
|
tok->buf = newbuf;
|
|
tok->inp = tok->buf + curvalid;
|
|
tok->end = tok->buf + newsize;
|
|
tok->start = curstart < 0 ? NULL :
|
|
tok->buf + curstart;
|
|
if (decoding_fgets(tok->inp,
|
|
(int)(tok->end - tok->inp),
|
|
tok) == NULL) {
|
|
/* Break out early on decoding
|
|
errors, as tok->buf will be NULL
|
|
*/
|
|
if (tok->decoding_erred)
|
|
return EOF;
|
|
/* Last line does not end in \n,
|
|
fake one */
|
|
strcpy(tok->inp, "\n");
|
|
}
|
|
tok->inp = strchr(tok->inp, '\0');
|
|
done = tok->inp[-1] == '\n';
|
|
}
|
|
if (tok->buf != NULL) {
|
|
tok->cur = tok->buf + cur;
|
|
tok->line_start = tok->cur;
|
|
/* replace "\r\n" with "\n" */
|
|
/* For Mac leave the \r, giving a syntax error */
|
|
pt = tok->inp - 2;
|
|
if (pt >= tok->buf && *pt == '\r') {
|
|
*pt++ = '\n';
|
|
*pt = '\0';
|
|
tok->inp = pt;
|
|
}
|
|
}
|
|
}
|
|
if (tok->done != E_OK) {
|
|
if (tok->prompt != NULL)
|
|
PySys_WriteStderr("\n");
|
|
tok->cur = tok->inp;
|
|
return EOF;
|
|
}
|
|
}
|
|
/*NOTREACHED*/
|
|
}
|
|
|
|
|
|
/* Back-up one character */
|
|
|
|
static void
|
|
tok_backup(register struct tok_state *tok, register int c)
|
|
{
|
|
if (c != EOF) {
|
|
if (--tok->cur < tok->buf)
|
|
Py_FatalError("tok_backup: begin of buffer");
|
|
if (*tok->cur != c)
|
|
*tok->cur = c;
|
|
}
|
|
}
|
|
|
|
|
|
/* Return the token corresponding to a single character */
|
|
|
|
int
|
|
PyToken_OneChar(int c)
|
|
{
|
|
switch (c) {
|
|
case '(': return LPAR;
|
|
case ')': return RPAR;
|
|
case '[': return LSQB;
|
|
case ']': return RSQB;
|
|
case ':': return COLON;
|
|
case ',': return COMMA;
|
|
case ';': return SEMI;
|
|
case '+': return PLUS;
|
|
case '-': return MINUS;
|
|
case '*': return STAR;
|
|
case '/': return SLASH;
|
|
case '|': return VBAR;
|
|
case '&': return AMPER;
|
|
case '<': return LESS;
|
|
case '>': return GREATER;
|
|
case '=': return EQUAL;
|
|
case '.': return DOT;
|
|
case '%': return PERCENT;
|
|
case '{': return LBRACE;
|
|
case '}': return RBRACE;
|
|
case '^': return CIRCUMFLEX;
|
|
case '~': return TILDE;
|
|
case '@': return AT;
|
|
default: return OP;
|
|
}
|
|
}
|
|
|
|
|
|
int
|
|
PyToken_TwoChars(int c1, int c2)
|
|
{
|
|
switch (c1) {
|
|
case '=':
|
|
switch (c2) {
|
|
case '=': return EQEQUAL;
|
|
}
|
|
break;
|
|
case '!':
|
|
switch (c2) {
|
|
case '=': return NOTEQUAL;
|
|
}
|
|
break;
|
|
case '<':
|
|
switch (c2) {
|
|
case '=': return LESSEQUAL;
|
|
case '<': return LEFTSHIFT;
|
|
}
|
|
break;
|
|
case '>':
|
|
switch (c2) {
|
|
case '=': return GREATEREQUAL;
|
|
case '>': return RIGHTSHIFT;
|
|
}
|
|
break;
|
|
case '+':
|
|
switch (c2) {
|
|
case '=': return PLUSEQUAL;
|
|
}
|
|
break;
|
|
case '-':
|
|
switch (c2) {
|
|
case '=': return MINEQUAL;
|
|
case '>': return RARROW;
|
|
}
|
|
break;
|
|
case '*':
|
|
switch (c2) {
|
|
case '*': return DOUBLESTAR;
|
|
case '=': return STAREQUAL;
|
|
}
|
|
break;
|
|
case '/':
|
|
switch (c2) {
|
|
case '/': return DOUBLESLASH;
|
|
case '=': return SLASHEQUAL;
|
|
}
|
|
break;
|
|
case '|':
|
|
switch (c2) {
|
|
case '=': return VBAREQUAL;
|
|
}
|
|
break;
|
|
case '%':
|
|
switch (c2) {
|
|
case '=': return PERCENTEQUAL;
|
|
}
|
|
break;
|
|
case '&':
|
|
switch (c2) {
|
|
case '=': return AMPEREQUAL;
|
|
}
|
|
break;
|
|
case '^':
|
|
switch (c2) {
|
|
case '=': return CIRCUMFLEXEQUAL;
|
|
}
|
|
break;
|
|
}
|
|
return OP;
|
|
}
|
|
|
|
int
|
|
PyToken_ThreeChars(int c1, int c2, int c3)
|
|
{
|
|
switch (c1) {
|
|
case '<':
|
|
switch (c2) {
|
|
case '<':
|
|
switch (c3) {
|
|
case '=':
|
|
return LEFTSHIFTEQUAL;
|
|
}
|
|
break;
|
|
}
|
|
break;
|
|
case '>':
|
|
switch (c2) {
|
|
case '>':
|
|
switch (c3) {
|
|
case '=':
|
|
return RIGHTSHIFTEQUAL;
|
|
}
|
|
break;
|
|
}
|
|
break;
|
|
case '*':
|
|
switch (c2) {
|
|
case '*':
|
|
switch (c3) {
|
|
case '=':
|
|
return DOUBLESTAREQUAL;
|
|
}
|
|
break;
|
|
}
|
|
break;
|
|
case '/':
|
|
switch (c2) {
|
|
case '/':
|
|
switch (c3) {
|
|
case '=':
|
|
return DOUBLESLASHEQUAL;
|
|
}
|
|
break;
|
|
}
|
|
break;
|
|
case '.':
|
|
switch (c2) {
|
|
case '.':
|
|
switch (c3) {
|
|
case '.':
|
|
return ELLIPSIS;
|
|
}
|
|
break;
|
|
}
|
|
break;
|
|
}
|
|
return OP;
|
|
}
|
|
|
|
static int
|
|
indenterror(struct tok_state *tok)
|
|
{
|
|
if (tok->alterror) {
|
|
tok->done = E_TABSPACE;
|
|
tok->cur = tok->inp;
|
|
return 1;
|
|
}
|
|
if (tok->altwarning) {
|
|
PySys_WriteStderr("%s: inconsistent use of tabs and spaces "
|
|
"in indentation\n", tok->filename);
|
|
tok->altwarning = 0;
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
|
|
/* Get next token, after space stripping etc. */
|
|
|
|
static int
|
|
tok_get(register struct tok_state *tok, char **p_start, char **p_end)
|
|
{
|
|
register int c;
|
|
int blankline;
|
|
|
|
*p_start = *p_end = NULL;
|
|
nextline:
|
|
tok->start = NULL;
|
|
blankline = 0;
|
|
|
|
/* Get indentation level */
|
|
if (tok->atbol) {
|
|
register int col = 0;
|
|
register int altcol = 0;
|
|
tok->atbol = 0;
|
|
for (;;) {
|
|
c = tok_nextc(tok);
|
|
if (c == ' ')
|
|
col++, altcol++;
|
|
else if (c == '\t') {
|
|
col = (col/tok->tabsize + 1) * tok->tabsize;
|
|
altcol = (altcol/tok->alttabsize + 1)
|
|
* tok->alttabsize;
|
|
}
|
|
else if (c == '\014') /* Control-L (formfeed) */
|
|
col = altcol = 0; /* For Emacs users */
|
|
else
|
|
break;
|
|
}
|
|
tok_backup(tok, c);
|
|
if (c == '#' || c == '\n') {
|
|
/* Lines with only whitespace and/or comments
|
|
shouldn't affect the indentation and are
|
|
not passed to the parser as NEWLINE tokens,
|
|
except *totally* empty lines in interactive
|
|
mode, which signal the end of a command group. */
|
|
if (col == 0 && c == '\n' && tok->prompt != NULL)
|
|
blankline = 0; /* Let it through */
|
|
else
|
|
blankline = 1; /* Ignore completely */
|
|
/* We can't jump back right here since we still
|
|
may need to skip to the end of a comment */
|
|
}
|
|
if (!blankline && tok->level == 0) {
|
|
if (col == tok->indstack[tok->indent]) {
|
|
/* No change */
|
|
if (altcol != tok->altindstack[tok->indent]) {
|
|
if (indenterror(tok))
|
|
return ERRORTOKEN;
|
|
}
|
|
}
|
|
else if (col > tok->indstack[tok->indent]) {
|
|
/* Indent -- always one */
|
|
if (tok->indent+1 >= MAXINDENT) {
|
|
tok->done = E_TOODEEP;
|
|
tok->cur = tok->inp;
|
|
return ERRORTOKEN;
|
|
}
|
|
if (altcol <= tok->altindstack[tok->indent]) {
|
|
if (indenterror(tok))
|
|
return ERRORTOKEN;
|
|
}
|
|
tok->pendin++;
|
|
tok->indstack[++tok->indent] = col;
|
|
tok->altindstack[tok->indent] = altcol;
|
|
}
|
|
else /* col < tok->indstack[tok->indent] */ {
|
|
/* Dedent -- any number, must be consistent */
|
|
while (tok->indent > 0 &&
|
|
col < tok->indstack[tok->indent]) {
|
|
tok->pendin--;
|
|
tok->indent--;
|
|
}
|
|
if (col != tok->indstack[tok->indent]) {
|
|
tok->done = E_DEDENT;
|
|
tok->cur = tok->inp;
|
|
return ERRORTOKEN;
|
|
}
|
|
if (altcol != tok->altindstack[tok->indent]) {
|
|
if (indenterror(tok))
|
|
return ERRORTOKEN;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
tok->start = tok->cur;
|
|
|
|
/* Return pending indents/dedents */
|
|
if (tok->pendin != 0) {
|
|
if (tok->pendin < 0) {
|
|
tok->pendin++;
|
|
return DEDENT;
|
|
}
|
|
else {
|
|
tok->pendin--;
|
|
return INDENT;
|
|
}
|
|
}
|
|
|
|
again:
|
|
tok->start = NULL;
|
|
/* Skip spaces */
|
|
do {
|
|
c = tok_nextc(tok);
|
|
} while (c == ' ' || c == '\t' || c == '\014');
|
|
|
|
/* Set start of current token */
|
|
tok->start = tok->cur - 1;
|
|
|
|
/* Skip comment */
|
|
if (c == '#')
|
|
while (c != EOF && c != '\n')
|
|
c = tok_nextc(tok);
|
|
|
|
/* Check for EOF and errors now */
|
|
if (c == EOF) {
|
|
return tok->done == E_EOF ? ENDMARKER : ERRORTOKEN;
|
|
}
|
|
|
|
/* Identifier (most frequent token!) */
|
|
if (is_potential_identifier_start(c)) {
|
|
/* Process r"", u"" and ur"" */
|
|
switch (c) {
|
|
case 'r':
|
|
case 'R':
|
|
c = tok_nextc(tok);
|
|
if (c == '"' || c == '\'')
|
|
goto letter_quote;
|
|
break;
|
|
case 'b':
|
|
case 'B':
|
|
c = tok_nextc(tok);
|
|
if (c == 'r' || c == 'R')
|
|
c = tok_nextc(tok);
|
|
if (c == '"' || c == '\'')
|
|
goto letter_quote;
|
|
break;
|
|
}
|
|
while (is_potential_identifier_char(c)) {
|
|
c = tok_nextc(tok);
|
|
}
|
|
tok_backup(tok, c);
|
|
*p_start = tok->start;
|
|
*p_end = tok->cur;
|
|
return NAME;
|
|
}
|
|
|
|
/* Newline */
|
|
if (c == '\n') {
|
|
tok->atbol = 1;
|
|
if (blankline || tok->level > 0)
|
|
goto nextline;
|
|
*p_start = tok->start;
|
|
*p_end = tok->cur - 1; /* Leave '\n' out of the string */
|
|
tok->cont_line = 0;
|
|
return NEWLINE;
|
|
}
|
|
|
|
/* Period or number starting with period? */
|
|
if (c == '.') {
|
|
c = tok_nextc(tok);
|
|
if (isdigit(c)) {
|
|
goto fraction;
|
|
} else if (c == '.') {
|
|
c = tok_nextc(tok);
|
|
if (c == '.') {
|
|
*p_start = tok->start;
|
|
*p_end = tok->cur;
|
|
return ELLIPSIS;
|
|
} else {
|
|
tok_backup(tok, c);
|
|
}
|
|
tok_backup(tok, '.');
|
|
} else {
|
|
tok_backup(tok, c);
|
|
}
|
|
*p_start = tok->start;
|
|
*p_end = tok->cur;
|
|
return DOT;
|
|
}
|
|
|
|
/* Number */
|
|
if (isdigit(c)) {
|
|
if (c == '0') {
|
|
/* Hex, octal or binary -- maybe. */
|
|
c = tok_nextc(tok);
|
|
if (c == '.')
|
|
goto fraction;
|
|
#ifndef WITHOUT_COMPLEX
|
|
if (c == 'j' || c == 'J')
|
|
goto imaginary;
|
|
#endif
|
|
if (c == 'x' || c == 'X') {
|
|
/* Hex */
|
|
do {
|
|
c = tok_nextc(tok);
|
|
} while (isxdigit(c));
|
|
}
|
|
else if (c == 'o' || c == 'O') {
|
|
/* Octal */
|
|
do {
|
|
c = tok_nextc(tok);
|
|
} while ('0' <= c && c < '8');
|
|
}
|
|
else if (c == 'b' || c == 'B') {
|
|
/* Binary */
|
|
do {
|
|
c = tok_nextc(tok);
|
|
} while (c == '0' || c == '1');
|
|
}
|
|
else {
|
|
int nonzero = 0;
|
|
/* maybe old-style octal; c is first char of it */
|
|
/* in any case, allow '0' as a literal */
|
|
while (c == '0')
|
|
c = tok_nextc(tok);
|
|
while (isdigit(c)) {
|
|
nonzero = 1;
|
|
c = tok_nextc(tok);
|
|
}
|
|
if (c == '.')
|
|
goto fraction;
|
|
else if (c == 'e' || c == 'E')
|
|
goto exponent;
|
|
#ifndef WITHOUT_COMPLEX
|
|
else if (c == 'j' || c == 'J')
|
|
goto imaginary;
|
|
#endif
|
|
else if (nonzero) {
|
|
tok->done = E_TOKEN;
|
|
tok_backup(tok, c);
|
|
return ERRORTOKEN;
|
|
}
|
|
}
|
|
}
|
|
else {
|
|
/* Decimal */
|
|
do {
|
|
c = tok_nextc(tok);
|
|
} while (isdigit(c));
|
|
{
|
|
/* Accept floating point numbers. */
|
|
if (c == '.') {
|
|
fraction:
|
|
/* Fraction */
|
|
do {
|
|
c = tok_nextc(tok);
|
|
} while (isdigit(c));
|
|
}
|
|
if (c == 'e' || c == 'E') {
|
|
exponent:
|
|
/* Exponent part */
|
|
c = tok_nextc(tok);
|
|
if (c == '+' || c == '-')
|
|
c = tok_nextc(tok);
|
|
if (!isdigit(c)) {
|
|
tok->done = E_TOKEN;
|
|
tok_backup(tok, c);
|
|
return ERRORTOKEN;
|
|
}
|
|
do {
|
|
c = tok_nextc(tok);
|
|
} while (isdigit(c));
|
|
}
|
|
#ifndef WITHOUT_COMPLEX
|
|
if (c == 'j' || c == 'J')
|
|
/* Imaginary part */
|
|
imaginary:
|
|
c = tok_nextc(tok);
|
|
#endif
|
|
}
|
|
}
|
|
tok_backup(tok, c);
|
|
*p_start = tok->start;
|
|
*p_end = tok->cur;
|
|
return NUMBER;
|
|
}
|
|
|
|
letter_quote:
|
|
/* String */
|
|
if (c == '\'' || c == '"') {
|
|
Py_ssize_t quote2 = tok->cur - tok->start + 1;
|
|
int quote = c;
|
|
int triple = 0;
|
|
int tripcount = 0;
|
|
for (;;) {
|
|
c = tok_nextc(tok);
|
|
if (c == '\n') {
|
|
if (!triple) {
|
|
tok->done = E_EOLS;
|
|
tok_backup(tok, c);
|
|
return ERRORTOKEN;
|
|
}
|
|
tripcount = 0;
|
|
tok->cont_line = 1; /* multiline string. */
|
|
}
|
|
else if (c == EOF) {
|
|
if (triple)
|
|
tok->done = E_EOFS;
|
|
else
|
|
tok->done = E_EOLS;
|
|
tok->cur = tok->inp;
|
|
return ERRORTOKEN;
|
|
}
|
|
else if (c == quote) {
|
|
tripcount++;
|
|
if (tok->cur - tok->start == quote2) {
|
|
c = tok_nextc(tok);
|
|
if (c == quote) {
|
|
triple = 1;
|
|
tripcount = 0;
|
|
continue;
|
|
}
|
|
tok_backup(tok, c);
|
|
}
|
|
if (!triple || tripcount == 3)
|
|
break;
|
|
}
|
|
else if (c == '\\') {
|
|
tripcount = 0;
|
|
c = tok_nextc(tok);
|
|
if (c == EOF) {
|
|
tok->done = E_EOLS;
|
|
tok->cur = tok->inp;
|
|
return ERRORTOKEN;
|
|
}
|
|
}
|
|
else
|
|
tripcount = 0;
|
|
}
|
|
*p_start = tok->start;
|
|
*p_end = tok->cur;
|
|
return STRING;
|
|
}
|
|
|
|
/* Line continuation */
|
|
if (c == '\\') {
|
|
c = tok_nextc(tok);
|
|
if (c != '\n') {
|
|
tok->done = E_LINECONT;
|
|
tok->cur = tok->inp;
|
|
return ERRORTOKEN;
|
|
}
|
|
tok->cont_line = 1;
|
|
goto again; /* Read next line */
|
|
}
|
|
|
|
/* Check for two-character token */
|
|
{
|
|
int c2 = tok_nextc(tok);
|
|
int token = PyToken_TwoChars(c, c2);
|
|
if (token != OP) {
|
|
int c3 = tok_nextc(tok);
|
|
int token3 = PyToken_ThreeChars(c, c2, c3);
|
|
if (token3 != OP) {
|
|
token = token3;
|
|
} else {
|
|
tok_backup(tok, c3);
|
|
}
|
|
*p_start = tok->start;
|
|
*p_end = tok->cur;
|
|
return token;
|
|
}
|
|
tok_backup(tok, c2);
|
|
}
|
|
|
|
/* Keep track of parentheses nesting level */
|
|
switch (c) {
|
|
case '(':
|
|
case '[':
|
|
case '{':
|
|
tok->level++;
|
|
break;
|
|
case ')':
|
|
case ']':
|
|
case '}':
|
|
tok->level--;
|
|
break;
|
|
}
|
|
|
|
/* Punctuation character */
|
|
*p_start = tok->start;
|
|
*p_end = tok->cur;
|
|
return PyToken_OneChar(c);
|
|
}
|
|
|
|
int
|
|
PyTokenizer_Get(struct tok_state *tok, char **p_start, char **p_end)
|
|
{
|
|
int result = tok_get(tok, p_start, p_end);
|
|
if (tok->decoding_erred) {
|
|
result = ERRORTOKEN;
|
|
tok->done = E_DECODE;
|
|
}
|
|
return result;
|
|
}
|
|
|
|
#ifdef Py_DEBUG
|
|
|
|
void
|
|
tok_dump(int type, char *start, char *end)
|
|
{
|
|
printf("%s", _PyParser_TokenNames[type]);
|
|
if (type == NAME || type == NUMBER || type == STRING || type == OP)
|
|
printf("(%.*s)", (int)(end - start), start);
|
|
}
|
|
|
|
#endif
|