1991-02-19 08:39:46 -04:00
|
|
|
|
1990-10-14 09:07:46 -03:00
|
|
|
/* Tokenizer implementation */
|
|
|
|
|
2002-04-14 17:12:41 -03:00
|
|
|
#include "Python.h"
|
1990-12-20 11:06:42 -04:00
|
|
|
#include "pgenheaders.h"
|
1990-10-14 09:07:46 -03:00
|
|
|
|
|
|
|
#include <ctype.h>
|
2002-08-04 14:29:52 -03:00
|
|
|
#include <assert.h>
|
1990-10-14 09:07:46 -03:00
|
|
|
|
|
|
|
#include "tokenizer.h"
|
|
|
|
#include "errcode.h"
|
|
|
|
|
2002-08-04 14:29:52 -03:00
|
|
|
#ifndef PGEN
|
|
|
|
#include "unicodeobject.h"
|
2008-06-09 01:58:54 -03:00
|
|
|
#include "stringobject.h"
|
2002-08-04 14:29:52 -03:00
|
|
|
#include "fileobject.h"
|
|
|
|
#include "codecs.h"
|
|
|
|
#include "abstract.h"
|
2007-11-23 05:10:36 -04:00
|
|
|
#include "pydebug.h"
|
2002-08-04 14:29:52 -03:00
|
|
|
#endif /* PGEN */
|
|
|
|
|
2002-10-26 11:39:10 -03:00
|
|
|
extern char *PyOS_Readline(FILE *, FILE *, char *);
|
1994-08-29 09:43:07 -03:00
|
|
|
/* Return malloc'ed string including trailing \n;
|
|
|
|
empty malloc'ed string for EOF;
|
|
|
|
NULL if interrupted */
|
|
|
|
|
1992-02-26 11:24:44 -04:00
|
|
|
/* Don't ever change this -- it would break the portability of Python code */
|
1990-10-14 09:07:46 -03:00
|
|
|
#define TABSIZE 8
|
|
|
|
|
1990-12-20 11:06:42 -04:00
|
|
|
/* Forward */
|
2000-07-09 00:09:57 -03:00
|
|
|
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);
|
1990-12-20 11:06:42 -04:00
|
|
|
|
1990-10-14 09:07:46 -03:00
|
|
|
/* Token names */
|
|
|
|
|
1997-04-29 18:03:06 -03:00
|
|
|
char *_PyParser_TokenNames[] = {
|
1990-10-14 09:07:46 -03:00
|
|
|
"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",
|
|
|
|
"BACKQUOTE",
|
|
|
|
"LBRACE",
|
|
|
|
"RBRACE",
|
1991-10-20 17:25:03 -03:00
|
|
|
"EQEQUAL",
|
|
|
|
"NOTEQUAL",
|
|
|
|
"LESSEQUAL",
|
|
|
|
"GREATEREQUAL",
|
1991-10-24 11:59:40 -03:00
|
|
|
"TILDE",
|
|
|
|
"CIRCUMFLEX",
|
|
|
|
"LEFTSHIFT",
|
|
|
|
"RIGHTSHIFT",
|
1996-01-11 21:31:58 -04:00
|
|
|
"DOUBLESTAR",
|
2000-08-24 17:11:32 -03:00
|
|
|
"PLUSEQUAL",
|
|
|
|
"MINEQUAL",
|
|
|
|
"STAREQUAL",
|
|
|
|
"SLASHEQUAL",
|
|
|
|
"PERCENTEQUAL",
|
|
|
|
"AMPEREQUAL",
|
|
|
|
"VBAREQUAL",
|
|
|
|
"CIRCUMFLEXEQUAL",
|
|
|
|
"LEFTSHIFTEQUAL",
|
|
|
|
"RIGHTSHIFTEQUAL",
|
|
|
|
"DOUBLESTAREQUAL",
|
2001-08-08 02:00:18 -03:00
|
|
|
"DOUBLESLASH",
|
|
|
|
"DOUBLESLASHEQUAL",
|
2004-08-02 03:10:11 -03:00
|
|
|
"AT",
|
1991-10-20 17:25:03 -03:00
|
|
|
/* This table must match the #defines in token.h! */
|
1990-10-14 09:07:46 -03:00
|
|
|
"OP",
|
|
|
|
"<ERRORTOKEN>",
|
|
|
|
"<N_TOKENS>"
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
/* Create and initialize a new tok_state structure */
|
|
|
|
|
|
|
|
static struct tok_state *
|
2000-07-22 16:20:54 -03:00
|
|
|
tok_new(void)
|
1990-10-14 09:07:46 -03:00
|
|
|
{
|
2006-04-11 02:39:14 -03:00
|
|
|
struct tok_state *tok = (struct tok_state *)PyMem_MALLOC(
|
|
|
|
sizeof(struct tok_state));
|
1990-10-14 09:07:46 -03:00
|
|
|
if (tok == NULL)
|
|
|
|
return NULL;
|
1994-08-29 09:43:07 -03:00
|
|
|
tok->buf = tok->cur = tok->end = tok->inp = tok->start = NULL;
|
1990-10-14 09:07:46 -03:00
|
|
|
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;
|
1993-05-12 08:35:44 -03:00
|
|
|
tok->level = 0;
|
1998-04-09 18:38:06 -03:00
|
|
|
tok->filename = NULL;
|
|
|
|
tok->altwarning = 0;
|
|
|
|
tok->alterror = 0;
|
|
|
|
tok->alttabsize = 1;
|
|
|
|
tok->altindstack[0] = 0;
|
2002-08-04 14:29:52 -03:00
|
|
|
tok->decoding_state = 0;
|
|
|
|
tok->decoding_erred = 0;
|
|
|
|
tok->read_coding_spec = 0;
|
|
|
|
tok->encoding = NULL;
|
2002-09-03 08:52:44 -03:00
|
|
|
tok->cont_line = 0;
|
2002-08-04 17:10:29 -03:00
|
|
|
#ifndef PGEN
|
2002-08-04 14:29:52 -03:00
|
|
|
tok->decoding_readline = NULL;
|
|
|
|
tok->decoding_buffer = NULL;
|
2002-08-04 17:10:29 -03:00
|
|
|
#endif
|
1990-10-14 09:07:46 -03:00
|
|
|
return tok;
|
|
|
|
}
|
|
|
|
|
2002-08-04 14:29:52 -03:00
|
|
|
#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 */
|
2006-04-11 05:19:15 -03:00
|
|
|
PyMem_FREE(tok->buf);
|
2002-08-04 14:29:52 -03:00
|
|
|
tok->buf = NULL;
|
|
|
|
return NULL; /* as if it were EOF */
|
|
|
|
}
|
|
|
|
|
|
|
|
static char *
|
2006-02-15 13:27:45 -04:00
|
|
|
new_string(const char *s, Py_ssize_t len)
|
2002-08-04 14:29:52 -03:00
|
|
|
{
|
2006-04-11 05:19:15 -03:00
|
|
|
char* result = (char *)PyMem_MALLOC(len + 1);
|
2002-08-04 14:29:52 -03:00
|
|
|
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 *
|
2006-02-15 13:27:45 -04:00
|
|
|
get_coding_spec(const char *s, Py_ssize_t size)
|
2002-08-04 14:29:52 -03:00
|
|
|
{
|
2006-02-15 13:27:45 -04:00
|
|
|
Py_ssize_t i;
|
2002-09-03 08:52:44 -03:00
|
|
|
/* 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 */
|
2002-08-04 14:29:52 -03:00
|
|
|
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;
|
2005-12-19 02:05:18 -04:00
|
|
|
while (isalnum(Py_CHARMASK(t[0])) ||
|
2002-11-02 16:43:25 -04:00
|
|
|
t[0] == '-' || t[0] == '_' || t[0] == '.')
|
2002-08-04 14:29:52 -03:00
|
|
|
t++;
|
|
|
|
|
|
|
|
if (begin < t) {
|
|
|
|
char* r = new_string(begin, t - begin);
|
|
|
|
char* q = get_normal_name(r);
|
|
|
|
if (r != q) {
|
2006-04-11 05:19:15 -03:00
|
|
|
PyMem_FREE(r);
|
2002-08-04 17:10:29 -03:00
|
|
|
r = new_string(q, strlen(q));
|
2002-08-04 14:29:52 -03:00
|
|
|
}
|
|
|
|
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
|
2006-02-15 13:27:45 -04:00
|
|
|
check_coding_spec(const char* line, Py_ssize_t size, struct tok_state *tok,
|
2002-08-04 14:29:52 -03:00
|
|
|
int set_readline(struct tok_state *, const char *))
|
|
|
|
{
|
2002-09-03 12:39:58 -03:00
|
|
|
char * cs;
|
2002-08-04 14:29:52 -03:00
|
|
|
int r = 1;
|
2002-09-03 12:39:58 -03:00
|
|
|
|
2002-09-03 08:52:44 -03:00
|
|
|
if (tok->cont_line)
|
|
|
|
/* It's a continuation line, so it can't be a coding spec. */
|
|
|
|
return 1;
|
2002-09-03 12:39:58 -03:00
|
|
|
cs = get_coding_spec(line, size);
|
2002-08-04 14:29:52 -03:00
|
|
|
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 {
|
2002-08-07 09:33:18 -03:00
|
|
|
#ifdef Py_USING_UNICODE
|
2002-08-04 14:29:52 -03:00
|
|
|
r = set_readline(tok, cs);
|
|
|
|
if (r) {
|
|
|
|
tok->encoding = cs;
|
|
|
|
tok->decoding_state = -1;
|
|
|
|
}
|
2005-10-21 03:05:33 -03:00
|
|
|
else
|
2006-04-11 05:19:15 -03:00
|
|
|
PyMem_FREE(cs);
|
2002-08-07 09:33:18 -03:00
|
|
|
#else
|
|
|
|
/* Without Unicode support, we cannot
|
|
|
|
process the coding spec. Since there
|
|
|
|
won't be any Unicode literals, that
|
|
|
|
won't matter. */
|
2006-04-11 05:19:15 -03:00
|
|
|
PyMem_FREE(cs);
|
2002-08-07 09:33:18 -03:00
|
|
|
#endif
|
2002-08-04 14:29:52 -03:00
|
|
|
}
|
|
|
|
} else { /* then, compare cs with BOM */
|
|
|
|
r = (strcmp(tok->encoding, cs) == 0);
|
2006-04-11 05:19:15 -03:00
|
|
|
PyMem_FREE(cs);
|
2002-08-04 14:29:52 -03:00
|
|
|
}
|
|
|
|
}
|
2005-12-18 01:29:30 -04:00
|
|
|
if (!r) {
|
|
|
|
cs = tok->encoding;
|
|
|
|
if (!cs)
|
|
|
|
cs = "with BOM";
|
|
|
|
PyErr_Format(PyExc_SyntaxError, "encoding problem: %s", cs);
|
|
|
|
}
|
2002-08-04 14:29:52 -03:00
|
|
|
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;
|
|
|
|
}
|
2005-11-16 01:12:59 -04:00
|
|
|
if (tok->encoding != NULL)
|
2006-04-11 05:19:15 -03:00
|
|
|
PyMem_FREE(tok->encoding);
|
2002-08-04 14:29:52 -03:00
|
|
|
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.
|
2005-07-12 18:53:43 -03:00
|
|
|
Return NULL on failure, else S.
|
Years in the making.
objimpl.h, pymem.h: Stop mapping PyMem_{Del, DEL} and PyMem_{Free, FREE}
to PyObject_{Free, FREE} in a release build. They're aliases for the
system free() now.
_subprocess.c/sp_handle_dealloc(): Since the memory was originally
obtained via PyObject_NEW, it must be released via PyObject_FREE (or
_DEL).
pythonrun.c, tokenizer.c, parsermodule.c: I lost count of the number of
PyObject vs PyMem mismatches in these -- it's like the specific
function called at each site was picked at random, sometimes even with
memory obtained via PyMem getting released via PyObject. Changed most
to use PyObject uniformly, since the blobs allocated are predictably
small in most cases, and obmalloc is generally faster than system
mallocs then.
If extension modules in real life prove as sloppy as Python's front
end, we'll have to revert the objimpl.h + pymem.h part of this patch.
Note that no problems will show up in a debug build (all calls still go
thru obmalloc then). Problems will show up only in a release build, most
likely segfaults.
2006-03-26 19:27:58 -04:00
|
|
|
|
2005-07-12 18:53:43 -03:00
|
|
|
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
|
2008-06-09 01:58:54 -03:00
|
|
|
3) PyStringObject *: previous call to fp_readl did not have enough room
|
2005-07-12 18:53:43 -03:00
|
|
|
(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)
|
Years in the making.
objimpl.h, pymem.h: Stop mapping PyMem_{Del, DEL} and PyMem_{Free, FREE}
to PyObject_{Free, FREE} in a release build. They're aliases for the
system free() now.
_subprocess.c/sp_handle_dealloc(): Since the memory was originally
obtained via PyObject_NEW, it must be released via PyObject_FREE (or
_DEL).
pythonrun.c, tokenizer.c, parsermodule.c: I lost count of the number of
PyObject vs PyMem mismatches in these -- it's like the specific
function called at each site was picked at random, sometimes even with
memory obtained via PyMem getting released via PyObject. Changed most
to use PyObject uniformly, since the blobs allocated are predictably
small in most cases, and obmalloc is generally faster than system
mallocs then.
If extension modules in real life prove as sloppy as Python's front
end, we'll have to revert the objimpl.h + pymem.h part of this patch.
Note that no problems will show up in a debug build (all calls still go
thru obmalloc then). Problems will show up only in a release build, most
likely segfaults.
2006-03-26 19:27:58 -04:00
|
|
|
until the buffer ends with a '\n' (or until the end of the file is
|
2005-07-12 18:53:43 -03:00
|
|
|
reached): see tok_nextc and its calls to decoding_fgets.
|
|
|
|
*/
|
2002-08-04 14:29:52 -03:00
|
|
|
|
|
|
|
static char *
|
|
|
|
fp_readl(char *s, int size, struct tok_state *tok)
|
|
|
|
{
|
2002-08-07 09:33:18 -03:00
|
|
|
#ifndef Py_USING_UNICODE
|
|
|
|
/* In a non-Unicode built, this should never be called. */
|
2002-08-07 12:18:57 -03:00
|
|
|
Py_FatalError("fp_readl should not be called in this build.");
|
2002-08-16 14:01:09 -03:00
|
|
|
return NULL; /* Keep compiler happy (not reachable) */
|
2002-08-07 09:33:18 -03:00
|
|
|
#else
|
2005-07-12 18:53:43 -03:00
|
|
|
PyObject* utf8 = NULL;
|
2002-08-04 14:29:52 -03:00
|
|
|
PyObject* buf = tok->decoding_buffer;
|
2005-07-12 18:53:43 -03:00
|
|
|
char *str;
|
2006-02-16 10:35:38 -04:00
|
|
|
Py_ssize_t utf8len;
|
2005-07-12 18:53:43 -03:00
|
|
|
|
|
|
|
/* Ask for one less byte so we can terminate it */
|
|
|
|
assert(size > 0);
|
|
|
|
size--;
|
|
|
|
|
2002-08-04 14:29:52 -03:00
|
|
|
if (buf == NULL) {
|
2005-07-12 18:53:43 -03:00
|
|
|
buf = PyObject_CallObject(tok->decoding_readline, NULL);
|
2002-08-04 15:28:44 -03:00
|
|
|
if (buf == NULL)
|
|
|
|
return error_ret(tok);
|
2002-08-04 14:29:52 -03:00
|
|
|
} else {
|
|
|
|
tok->decoding_buffer = NULL;
|
2008-06-09 01:58:54 -03:00
|
|
|
if (PyString_CheckExact(buf))
|
2005-07-12 18:53:43 -03:00
|
|
|
utf8 = buf;
|
|
|
|
}
|
|
|
|
if (utf8 == NULL) {
|
|
|
|
utf8 = PyUnicode_AsUTF8String(buf);
|
|
|
|
Py_DECREF(buf);
|
|
|
|
if (utf8 == NULL)
|
|
|
|
return error_ret(tok);
|
2002-08-04 14:29:52 -03:00
|
|
|
}
|
2008-06-09 01:58:54 -03:00
|
|
|
str = PyString_AsString(utf8);
|
|
|
|
utf8len = PyString_GET_SIZE(utf8);
|
2005-07-12 18:53:43 -03:00
|
|
|
if (utf8len > size) {
|
2008-06-09 01:58:54 -03:00
|
|
|
tok->decoding_buffer = PyString_FromStringAndSize(str+size, utf8len-size);
|
2005-07-12 18:53:43 -03:00
|
|
|
if (tok->decoding_buffer == NULL) {
|
|
|
|
Py_DECREF(utf8);
|
|
|
|
return error_ret(tok);
|
|
|
|
}
|
|
|
|
utf8len = size;
|
2002-08-04 14:29:52 -03:00
|
|
|
}
|
2005-07-12 18:53:43 -03:00
|
|
|
memcpy(s, str, utf8len);
|
|
|
|
s[utf8len] = '\0';
|
|
|
|
Py_DECREF(utf8);
|
|
|
|
if (utf8len == 0) return NULL; /* EOF */
|
|
|
|
return s;
|
2002-08-07 09:33:18 -03:00
|
|
|
#endif
|
2002-08-04 14:29:52 -03:00
|
|
|
}
|
|
|
|
|
|
|
|
/* 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 *reader, *stream, *readline;
|
|
|
|
|
2002-12-11 10:04:59 -04:00
|
|
|
/* XXX: constify filename argument. */
|
|
|
|
stream = PyFile_FromFile(tok->fp, (char*)tok->filename, "rb", NULL);
|
2002-08-04 15:28:44 -03:00
|
|
|
if (stream == NULL)
|
|
|
|
return 0;
|
2002-08-04 14:29:52 -03:00
|
|
|
|
|
|
|
reader = PyCodec_StreamReader(enc, stream, NULL);
|
|
|
|
Py_DECREF(stream);
|
2002-08-04 15:28:44 -03:00
|
|
|
if (reader == NULL)
|
|
|
|
return 0;
|
2002-08-04 14:29:52 -03:00
|
|
|
|
|
|
|
readline = PyObject_GetAttrString(reader, "readline");
|
|
|
|
Py_DECREF(reader);
|
2002-08-04 15:28:44 -03:00
|
|
|
if (readline == NULL)
|
|
|
|
return 0;
|
2002-08-04 14:29:52 -03:00
|
|
|
|
|
|
|
tok->decoding_readline = readline;
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* 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)
|
|
|
|
{
|
2002-08-07 12:18:57 -03:00
|
|
|
char *line = NULL;
|
2006-02-28 18:41:29 -04:00
|
|
|
int badchar = 0;
|
2002-08-04 15:28:44 -03:00
|
|
|
for (;;) {
|
2002-08-04 14:29:52 -03:00
|
|
|
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. */
|
Years in the making.
objimpl.h, pymem.h: Stop mapping PyMem_{Del, DEL} and PyMem_{Free, FREE}
to PyObject_{Free, FREE} in a release build. They're aliases for the
system free() now.
_subprocess.c/sp_handle_dealloc(): Since the memory was originally
obtained via PyObject_NEW, it must be released via PyObject_FREE (or
_DEL).
pythonrun.c, tokenizer.c, parsermodule.c: I lost count of the number of
PyObject vs PyMem mismatches in these -- it's like the specific
function called at each site was picked at random, sometimes even with
memory obtained via PyMem getting released via PyObject. Changed most
to use PyObject uniformly, since the blobs allocated are predictably
small in most cases, and obmalloc is generally faster than system
mallocs then.
If extension modules in real life prove as sloppy as Python's front
end, we'll have to revert the objimpl.h + pymem.h part of this patch.
Note that no problems will show up in a debug build (all calls still go
thru obmalloc then). Problems will show up only in a release build, most
likely segfaults.
2006-03-26 19:27:58 -04:00
|
|
|
line = Py_UniversalNewlineFgets(s, size,
|
2002-08-04 14:29:52 -03:00
|
|
|
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);
|
|
|
|
}
|
2002-08-04 15:28:44 -03:00
|
|
|
}
|
2002-08-04 14:29:52 -03:00
|
|
|
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
|
2006-02-28 18:41:29 -04:00
|
|
|
/* The default encoding is ASCII, so make sure we don't have any
|
|
|
|
non-ASCII bytes in it. */
|
|
|
|
if (line && !tok->encoding) {
|
2002-08-04 14:29:52 -03:00
|
|
|
unsigned char *c;
|
2002-08-05 11:14:05 -03:00
|
|
|
for (c = (unsigned char *)line; *c; c++)
|
2002-08-04 14:29:52 -03:00
|
|
|
if (*c > 127) {
|
|
|
|
badchar = *c;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (badchar) {
|
2003-02-17 14:31:57 -04:00
|
|
|
char buf[500];
|
2002-08-04 22:49:16 -03:00
|
|
|
/* Need to add 1 to the line number, since this line
|
|
|
|
has not been counted, yet. */
|
Years in the making.
objimpl.h, pymem.h: Stop mapping PyMem_{Del, DEL} and PyMem_{Free, FREE}
to PyObject_{Free, FREE} in a release build. They're aliases for the
system free() now.
_subprocess.c/sp_handle_dealloc(): Since the memory was originally
obtained via PyObject_NEW, it must be released via PyObject_FREE (or
_DEL).
pythonrun.c, tokenizer.c, parsermodule.c: I lost count of the number of
PyObject vs PyMem mismatches in these -- it's like the specific
function called at each site was picked at random, sometimes even with
memory obtained via PyMem getting released via PyObject. Changed most
to use PyObject uniformly, since the blobs allocated are predictably
small in most cases, and obmalloc is generally faster than system
mallocs then.
If extension modules in real life prove as sloppy as Python's front
end, we'll have to revert the objimpl.h + pymem.h part of this patch.
Note that no problems will show up in a debug build (all calls still go
thru obmalloc then). Problems will show up only in a release build, most
likely segfaults.
2006-03-26 19:27:58 -04:00
|
|
|
sprintf(buf,
|
2003-02-17 14:31:57 -04:00
|
|
|
"Non-ASCII character '\\x%.2x' "
|
|
|
|
"in file %.200s on line %i, "
|
|
|
|
"but no encoding declared; "
|
Years in the making.
objimpl.h, pymem.h: Stop mapping PyMem_{Del, DEL} and PyMem_{Free, FREE}
to PyObject_{Free, FREE} in a release build. They're aliases for the
system free() now.
_subprocess.c/sp_handle_dealloc(): Since the memory was originally
obtained via PyObject_NEW, it must be released via PyObject_FREE (or
_DEL).
pythonrun.c, tokenizer.c, parsermodule.c: I lost count of the number of
PyObject vs PyMem mismatches in these -- it's like the specific
function called at each site was picked at random, sometimes even with
memory obtained via PyMem getting released via PyObject. Changed most
to use PyObject uniformly, since the blobs allocated are predictably
small in most cases, and obmalloc is generally faster than system
mallocs then.
If extension modules in real life prove as sloppy as Python's front
end, we'll have to revert the objimpl.h + pymem.h part of this patch.
Note that no problems will show up in a debug build (all calls still go
thru obmalloc then). Problems will show up only in a release build, most
likely segfaults.
2006-03-26 19:27:58 -04:00
|
|
|
"see http://www.python.org/peps/pep-0263.html for details",
|
2003-02-17 14:31:57 -04:00
|
|
|
badchar, tok->filename, tok->lineno + 1);
|
2006-02-28 18:41:29 -04:00
|
|
|
PyErr_SetString(PyExc_SyntaxError, buf);
|
|
|
|
return error_ret(tok);
|
2002-08-04 14:29:52 -03:00
|
|
|
}
|
|
|
|
#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) {
|
2005-07-12 18:53:43 -03:00
|
|
|
buf = PyObject_CallObject(tok->decoding_readline, NULL);
|
2002-08-04 14:29:52 -03:00
|
|
|
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. */
|
|
|
|
|
Years in the making.
objimpl.h, pymem.h: Stop mapping PyMem_{Del, DEL} and PyMem_{Free, FREE}
to PyObject_{Free, FREE} in a release build. They're aliases for the
system free() now.
_subprocess.c/sp_handle_dealloc(): Since the memory was originally
obtained via PyObject_NEW, it must be released via PyObject_FREE (or
_DEL).
pythonrun.c, tokenizer.c, parsermodule.c: I lost count of the number of
PyObject vs PyMem mismatches in these -- it's like the specific
function called at each site was picked at random, sometimes even with
memory obtained via PyMem getting released via PyObject. Changed most
to use PyObject uniformly, since the blobs allocated are predictably
small in most cases, and obmalloc is generally faster than system
mallocs then.
If extension modules in real life prove as sloppy as Python's front
end, we'll have to revert the objimpl.h + pymem.h part of this patch.
Note that no problems will show up in a debug build (all calls still go
thru obmalloc then). Problems will show up only in a release build, most
likely segfaults.
2006-03-26 19:27:58 -04:00
|
|
|
static int
|
|
|
|
buf_getc(struct tok_state *tok) {
|
2003-02-09 16:38:48 -04:00
|
|
|
return Py_CHARMASK(*tok->str++);
|
2002-08-04 14:29:52 -03:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Unfetch a byte from TOK, using the string buffer. */
|
|
|
|
|
Years in the making.
objimpl.h, pymem.h: Stop mapping PyMem_{Del, DEL} and PyMem_{Free, FREE}
to PyObject_{Free, FREE} in a release build. They're aliases for the
system free() now.
_subprocess.c/sp_handle_dealloc(): Since the memory was originally
obtained via PyObject_NEW, it must be released via PyObject_FREE (or
_DEL).
pythonrun.c, tokenizer.c, parsermodule.c: I lost count of the number of
PyObject vs PyMem mismatches in these -- it's like the specific
function called at each site was picked at random, sometimes even with
memory obtained via PyMem getting released via PyObject. Changed most
to use PyObject uniformly, since the blobs allocated are predictably
small in most cases, and obmalloc is generally faster than system
mallocs then.
If extension modules in real life prove as sloppy as Python's front
end, we'll have to revert the objimpl.h + pymem.h part of this patch.
Note that no problems will show up in a debug build (all calls still go
thru obmalloc then). Problems will show up only in a release build, most
likely segfaults.
2006-03-26 19:27:58 -04:00
|
|
|
static void
|
|
|
|
buf_ungetc(int c, struct tok_state *tok) {
|
2002-08-04 14:29:52 -03:00
|
|
|
tok->str--;
|
2003-02-09 16:38:48 -04:00
|
|
|
assert(Py_CHARMASK(*tok->str) == c); /* tok->cur may point to read-only segment */
|
2002-08-04 14:29:52 -03:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Set the readline function for TOK to ENC. For the string-based
|
|
|
|
tokenizer, this means to just record the encoding. */
|
|
|
|
|
Years in the making.
objimpl.h, pymem.h: Stop mapping PyMem_{Del, DEL} and PyMem_{Free, FREE}
to PyObject_{Free, FREE} in a release build. They're aliases for the
system free() now.
_subprocess.c/sp_handle_dealloc(): Since the memory was originally
obtained via PyObject_NEW, it must be released via PyObject_FREE (or
_DEL).
pythonrun.c, tokenizer.c, parsermodule.c: I lost count of the number of
PyObject vs PyMem mismatches in these -- it's like the specific
function called at each site was picked at random, sometimes even with
memory obtained via PyMem getting released via PyObject. Changed most
to use PyObject uniformly, since the blobs allocated are predictably
small in most cases, and obmalloc is generally faster than system
mallocs then.
If extension modules in real life prove as sloppy as Python's front
end, we'll have to revert the objimpl.h + pymem.h part of this patch.
Note that no problems will show up in a debug build (all calls still go
thru obmalloc then). Problems will show up only in a release build, most
likely segfaults.
2006-03-26 19:27:58 -04:00
|
|
|
static int
|
|
|
|
buf_setreadl(struct tok_state *tok, const char* enc) {
|
2002-08-04 14:29:52 -03:00
|
|
|
tok->enc = enc;
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Return a UTF-8 encoding Python string object from the
|
|
|
|
C byte string STR, which is encoded with ENC. */
|
|
|
|
|
2002-08-07 09:33:18 -03:00
|
|
|
#ifdef Py_USING_UNICODE
|
2002-08-04 14:29:52 -03:00
|
|
|
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;
|
|
|
|
}
|
2002-08-07 09:33:18 -03:00
|
|
|
#endif
|
2002-08-04 14:29:52 -03:00
|
|
|
|
|
|
|
/* 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;
|
2008-01-21 17:14:21 -04:00
|
|
|
const char *newl[2] = {NULL, NULL};
|
2002-08-04 14:29:52 -03:00
|
|
|
int lineno = 0;
|
|
|
|
tok->enc = NULL;
|
|
|
|
tok->str = str;
|
|
|
|
if (!check_bom(buf_getc, buf_ungetc, buf_setreadl, tok))
|
2005-11-16 01:12:59 -04:00
|
|
|
return error_ret(tok);
|
2002-08-04 14:29:52 -03:00
|
|
|
str = tok->str; /* string after BOM if any */
|
2002-08-04 14:58:34 -03:00
|
|
|
assert(str);
|
2002-08-07 09:33:18 -03:00
|
|
|
#ifdef Py_USING_UNICODE
|
2002-08-04 14:29:52 -03:00
|
|
|
if (tok->enc != NULL) {
|
|
|
|
utf8 = translate_into_utf8(str, tok->enc);
|
|
|
|
if (utf8 == NULL)
|
2005-11-16 01:12:59 -04:00
|
|
|
return error_ret(tok);
|
2008-06-09 01:58:54 -03:00
|
|
|
str = PyString_AsString(utf8);
|
2002-08-04 14:29:52 -03:00
|
|
|
}
|
2002-08-07 09:33:18 -03:00
|
|
|
#endif
|
2002-08-04 14:29:52 -03:00
|
|
|
for (s = str;; s++) {
|
|
|
|
if (*s == '\0') break;
|
|
|
|
else if (*s == '\n') {
|
2008-01-27 13:10:29 -04:00
|
|
|
assert(lineno < 2);
|
2008-01-21 14:35:49 -04:00
|
|
|
newl[lineno] = s;
|
2002-08-04 14:29:52 -03:00
|
|
|
lineno++;
|
|
|
|
if (lineno == 2) break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
tok->enc = NULL;
|
2008-01-21 14:35:49 -04:00
|
|
|
/* need to check line 1 and 2 separately since check_coding_spec
|
|
|
|
assumes a single line as input */
|
|
|
|
if (newl[0]) {
|
|
|
|
if (!check_coding_spec(str, newl[0] - str, tok, buf_setreadl))
|
|
|
|
return error_ret(tok);
|
|
|
|
if (tok->enc == NULL && newl[1]) {
|
|
|
|
if (!check_coding_spec(newl[0]+1, newl[1] - newl[0],
|
|
|
|
tok, buf_setreadl))
|
|
|
|
return error_ret(tok);
|
|
|
|
}
|
|
|
|
}
|
2002-08-07 09:33:18 -03:00
|
|
|
#ifdef Py_USING_UNICODE
|
2002-08-04 14:29:52 -03:00
|
|
|
if (tok->enc != NULL) {
|
|
|
|
assert(utf8 == NULL);
|
|
|
|
utf8 = translate_into_utf8(str, tok->enc);
|
2005-10-01 22:48:49 -03:00
|
|
|
if (utf8 == NULL) {
|
|
|
|
PyErr_Format(PyExc_SyntaxError,
|
|
|
|
"unknown encoding: %s", tok->enc);
|
2005-11-16 01:12:59 -04:00
|
|
|
return error_ret(tok);
|
2005-10-01 22:48:49 -03:00
|
|
|
}
|
2008-06-09 01:58:54 -03:00
|
|
|
str = PyString_AsString(utf8);
|
2002-08-04 14:29:52 -03:00
|
|
|
}
|
2002-08-07 09:33:18 -03:00
|
|
|
#endif
|
2002-08-04 14:29:52 -03:00
|
|
|
assert(tok->decoding_buffer == NULL);
|
|
|
|
tok->decoding_buffer = utf8; /* CAUTION */
|
|
|
|
return str;
|
|
|
|
}
|
|
|
|
|
|
|
|
#endif /* PGEN */
|
1990-10-14 09:07:46 -03:00
|
|
|
|
|
|
|
/* Set up tokenizer for string */
|
|
|
|
|
|
|
|
struct tok_state *
|
2002-12-11 10:04:59 -04:00
|
|
|
PyTokenizer_FromString(const char *str)
|
1990-10-14 09:07:46 -03:00
|
|
|
{
|
|
|
|
struct tok_state *tok = tok_new();
|
|
|
|
if (tok == NULL)
|
|
|
|
return NULL;
|
2002-08-04 14:29:52 -03:00
|
|
|
str = (char *)decode_str(str, tok);
|
2005-11-16 01:12:59 -04:00
|
|
|
if (str == NULL) {
|
|
|
|
PyTokenizer_Free(tok);
|
2002-08-04 14:29:52 -03:00
|
|
|
return NULL;
|
2005-11-16 01:12:59 -04:00
|
|
|
}
|
|
|
|
|
2002-12-11 10:04:59 -04:00
|
|
|
/* XXX: constify members. */
|
|
|
|
tok->buf = tok->cur = tok->end = tok->inp = (char*)str;
|
1990-10-14 09:07:46 -03:00
|
|
|
return tok;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
1991-07-27 18:42:56 -03:00
|
|
|
/* Set up tokenizer for file */
|
1990-10-14 09:07:46 -03:00
|
|
|
|
|
|
|
struct tok_state *
|
2000-07-22 16:20:54 -03:00
|
|
|
PyTokenizer_FromFile(FILE *fp, char *ps1, char *ps2)
|
1990-10-14 09:07:46 -03:00
|
|
|
{
|
|
|
|
struct tok_state *tok = tok_new();
|
|
|
|
if (tok == NULL)
|
|
|
|
return NULL;
|
2006-04-11 05:19:15 -03:00
|
|
|
if ((tok->buf = (char *)PyMem_MALLOC(BUFSIZ)) == NULL) {
|
2005-11-16 01:12:59 -04:00
|
|
|
PyTokenizer_Free(tok);
|
1990-10-14 09:07:46 -03:00
|
|
|
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
|
2000-07-22 16:20:54 -03:00
|
|
|
PyTokenizer_Free(struct tok_state *tok)
|
1990-10-14 09:07:46 -03:00
|
|
|
{
|
2002-08-04 14:29:52 -03:00
|
|
|
if (tok->encoding != NULL)
|
2006-04-11 05:19:15 -03:00
|
|
|
PyMem_FREE(tok->encoding);
|
2002-08-04 17:10:29 -03:00
|
|
|
#ifndef PGEN
|
2002-08-04 14:29:52 -03:00
|
|
|
Py_XDECREF(tok->decoding_readline);
|
|
|
|
Py_XDECREF(tok->decoding_buffer);
|
2002-08-04 17:10:29 -03:00
|
|
|
#endif
|
1990-10-14 09:07:46 -03:00
|
|
|
if (tok->fp != NULL && tok->buf != NULL)
|
2006-04-11 05:19:15 -03:00
|
|
|
PyMem_FREE(tok->buf);
|
Years in the making.
objimpl.h, pymem.h: Stop mapping PyMem_{Del, DEL} and PyMem_{Free, FREE}
to PyObject_{Free, FREE} in a release build. They're aliases for the
system free() now.
_subprocess.c/sp_handle_dealloc(): Since the memory was originally
obtained via PyObject_NEW, it must be released via PyObject_FREE (or
_DEL).
pythonrun.c, tokenizer.c, parsermodule.c: I lost count of the number of
PyObject vs PyMem mismatches in these -- it's like the specific
function called at each site was picked at random, sometimes even with
memory obtained via PyMem getting released via PyObject. Changed most
to use PyObject uniformly, since the blobs allocated are predictably
small in most cases, and obmalloc is generally faster than system
mallocs then.
If extension modules in real life prove as sloppy as Python's front
end, we'll have to revert the objimpl.h + pymem.h part of this patch.
Note that no problems will show up in a debug build (all calls still go
thru obmalloc then). Problems will show up only in a release build, most
likely segfaults.
2006-03-26 19:27:58 -04:00
|
|
|
PyMem_FREE(tok);
|
1990-10-14 09:07:46 -03:00
|
|
|
}
|
|
|
|
|
2004-08-04 14:36:41 -03:00
|
|
|
#if !defined(PGEN) && defined(Py_USING_UNICODE)
|
|
|
|
static int
|
|
|
|
tok_stdin_decode(struct tok_state *tok, char **inp)
|
|
|
|
{
|
|
|
|
PyObject *enc, *sysstdin, *decoded, *utf8;
|
|
|
|
const char *encoding;
|
|
|
|
char *converted;
|
|
|
|
|
|
|
|
if (PySys_GetFile((char *)"stdin", NULL) != stdin)
|
|
|
|
return 0;
|
|
|
|
sysstdin = PySys_GetObject("stdin");
|
|
|
|
if (sysstdin == NULL || !PyFile_Check(sysstdin))
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
enc = ((PyFileObject *)sysstdin)->f_encoding;
|
2008-06-09 01:58:54 -03:00
|
|
|
if (enc == NULL || !PyString_Check(enc))
|
2004-08-04 14:36:41 -03:00
|
|
|
return 0;
|
|
|
|
Py_INCREF(enc);
|
|
|
|
|
2008-06-09 01:58:54 -03:00
|
|
|
encoding = PyString_AsString(enc);
|
2004-08-04 14:36:41 -03:00
|
|
|
decoded = PyUnicode_Decode(*inp, strlen(*inp), encoding, NULL);
|
|
|
|
if (decoded == NULL)
|
|
|
|
goto error_clear;
|
|
|
|
|
|
|
|
utf8 = PyUnicode_AsEncodedString(decoded, "utf-8", NULL);
|
|
|
|
Py_DECREF(decoded);
|
|
|
|
if (utf8 == NULL)
|
|
|
|
goto error_clear;
|
|
|
|
|
2008-06-09 01:58:54 -03:00
|
|
|
assert(PyString_Check(utf8));
|
|
|
|
converted = new_string(PyString_AS_STRING(utf8),
|
|
|
|
PyString_GET_SIZE(utf8));
|
2004-08-04 14:36:41 -03:00
|
|
|
Py_DECREF(utf8);
|
|
|
|
if (converted == NULL)
|
|
|
|
goto error_nomem;
|
|
|
|
|
2006-04-11 05:19:15 -03:00
|
|
|
PyMem_FREE(*inp);
|
2004-08-04 14:36:41 -03:00
|
|
|
*inp = converted;
|
|
|
|
if (tok->encoding != NULL)
|
2006-04-11 05:19:15 -03:00
|
|
|
PyMem_FREE(tok->encoding);
|
2004-08-04 14:36:41 -03:00
|
|
|
tok->encoding = new_string(encoding, strlen(encoding));
|
|
|
|
if (tok->encoding == NULL)
|
|
|
|
goto error_nomem;
|
|
|
|
|
|
|
|
Py_DECREF(enc);
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
error_nomem:
|
|
|
|
Py_DECREF(enc);
|
|
|
|
tok->done = E_NOMEM;
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
error_clear:
|
|
|
|
/* Fallback to iso-8859-1: for backward compatibility */
|
|
|
|
Py_DECREF(enc);
|
|
|
|
PyErr_Clear();
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
#endif
|
1990-10-14 09:07:46 -03:00
|
|
|
|
|
|
|
/* Get next char, updating state; error code goes into tok->done */
|
|
|
|
|
|
|
|
static int
|
2000-07-22 16:20:54 -03:00
|
|
|
tok_nextc(register struct tok_state *tok)
|
1990-10-14 09:07:46 -03:00
|
|
|
{
|
|
|
|
for (;;) {
|
1994-09-19 05:06:25 -03:00
|
|
|
if (tok->cur != tok->inp) {
|
1998-01-19 18:07:46 -04:00
|
|
|
return Py_CHARMASK(*tok->cur++); /* Fast path */
|
1994-09-19 05:06:25 -03:00
|
|
|
}
|
1993-05-12 05:24:20 -03:00
|
|
|
if (tok->done != E_OK)
|
|
|
|
return EOF;
|
1990-10-14 09:07:46 -03:00
|
|
|
if (tok->fp == NULL) {
|
1994-09-19 05:06:25 -03:00
|
|
|
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;
|
2006-03-01 18:49:05 -04:00
|
|
|
tok->line_start = tok->cur;
|
1994-09-19 05:06:25 -03:00
|
|
|
tok->lineno++;
|
|
|
|
tok->inp = end;
|
1998-01-19 18:07:46 -04:00
|
|
|
return Py_CHARMASK(*tok->cur++);
|
1990-10-14 09:07:46 -03:00
|
|
|
}
|
|
|
|
if (tok->prompt != NULL) {
|
2006-04-11 02:39:14 -03:00
|
|
|
char *newtok = PyOS_Readline(stdin, stdout, tok->prompt);
|
1990-10-14 09:07:46 -03:00
|
|
|
if (tok->nextprompt != NULL)
|
|
|
|
tok->prompt = tok->nextprompt;
|
2006-04-11 02:39:14 -03:00
|
|
|
if (newtok == NULL)
|
1994-08-29 09:43:07 -03:00
|
|
|
tok->done = E_INTR;
|
2006-04-11 02:39:14 -03:00
|
|
|
else if (*newtok == '\0') {
|
2006-04-11 05:19:15 -03:00
|
|
|
PyMem_FREE(newtok);
|
1990-10-14 09:07:46 -03:00
|
|
|
tok->done = E_EOF;
|
|
|
|
}
|
2004-08-04 14:36:41 -03:00
|
|
|
#if !defined(PGEN) && defined(Py_USING_UNICODE)
|
2006-04-11 02:39:14 -03:00
|
|
|
else if (tok_stdin_decode(tok, &newtok) != 0)
|
2006-04-11 05:19:15 -03:00
|
|
|
PyMem_FREE(newtok);
|
2004-08-04 14:36:41 -03:00
|
|
|
#endif
|
1994-08-29 09:43:07 -03:00
|
|
|
else if (tok->start != NULL) {
|
2000-06-28 19:00:02 -03:00
|
|
|
size_t start = tok->start - tok->buf;
|
|
|
|
size_t oldlen = tok->cur - tok->buf;
|
2006-04-11 02:39:14 -03:00
|
|
|
size_t newlen = oldlen + strlen(newtok);
|
2000-05-03 20:44:39 -03:00
|
|
|
char *buf = tok->buf;
|
2006-04-11 05:19:15 -03:00
|
|
|
buf = (char *)PyMem_REALLOC(buf, newlen+1);
|
1994-08-29 09:43:07 -03:00
|
|
|
tok->lineno++;
|
|
|
|
if (buf == NULL) {
|
2006-04-11 05:19:15 -03:00
|
|
|
PyMem_FREE(tok->buf);
|
1994-12-30 11:46:02 -04:00
|
|
|
tok->buf = NULL;
|
2006-04-11 05:19:15 -03:00
|
|
|
PyMem_FREE(newtok);
|
1994-08-29 09:43:07 -03:00
|
|
|
tok->done = E_NOMEM;
|
|
|
|
return EOF;
|
|
|
|
}
|
|
|
|
tok->buf = buf;
|
|
|
|
tok->cur = tok->buf + oldlen;
|
2006-03-01 18:49:05 -04:00
|
|
|
tok->line_start = tok->cur;
|
2006-04-11 02:39:14 -03:00
|
|
|
strcpy(tok->buf + oldlen, newtok);
|
2006-04-11 05:19:15 -03:00
|
|
|
PyMem_FREE(newtok);
|
1994-08-29 09:43:07 -03:00
|
|
|
tok->inp = tok->buf + newlen;
|
|
|
|
tok->end = tok->inp + 1;
|
|
|
|
tok->start = tok->buf + start;
|
|
|
|
}
|
1990-10-14 09:07:46 -03:00
|
|
|
else {
|
1994-08-29 09:43:07 -03:00
|
|
|
tok->lineno++;
|
|
|
|
if (tok->buf != NULL)
|
2006-04-11 05:19:15 -03:00
|
|
|
PyMem_FREE(tok->buf);
|
2006-04-11 02:39:14 -03:00
|
|
|
tok->buf = newtok;
|
2006-03-01 18:49:05 -04:00
|
|
|
tok->line_start = tok->buf;
|
1993-05-12 05:24:20 -03:00
|
|
|
tok->cur = tok->buf;
|
2006-03-01 18:49:05 -04:00
|
|
|
tok->line_start = tok->buf;
|
1994-08-29 09:43:07 -03:00
|
|
|
tok->inp = strchr(tok->buf, '\0');
|
|
|
|
tok->end = tok->inp + 1;
|
1990-10-14 09:07:46 -03:00
|
|
|
}
|
|
|
|
}
|
1994-08-29 09:43:07 -03:00
|
|
|
else {
|
|
|
|
int done = 0;
|
2006-02-15 13:27:45 -04:00
|
|
|
Py_ssize_t cur = 0;
|
1995-06-14 15:26:02 -03:00
|
|
|
char *pt;
|
1994-08-29 09:43:07 -03:00
|
|
|
if (tok->start == NULL) {
|
1993-05-12 05:24:20 -03:00
|
|
|
if (tok->buf == NULL) {
|
Years in the making.
objimpl.h, pymem.h: Stop mapping PyMem_{Del, DEL} and PyMem_{Free, FREE}
to PyObject_{Free, FREE} in a release build. They're aliases for the
system free() now.
_subprocess.c/sp_handle_dealloc(): Since the memory was originally
obtained via PyObject_NEW, it must be released via PyObject_FREE (or
_DEL).
pythonrun.c, tokenizer.c, parsermodule.c: I lost count of the number of
PyObject vs PyMem mismatches in these -- it's like the specific
function called at each site was picked at random, sometimes even with
memory obtained via PyMem getting released via PyObject. Changed most
to use PyObject uniformly, since the blobs allocated are predictably
small in most cases, and obmalloc is generally faster than system
mallocs then.
If extension modules in real life prove as sloppy as Python's front
end, we'll have to revert the objimpl.h + pymem.h part of this patch.
Note that no problems will show up in a debug build (all calls still go
thru obmalloc then). Problems will show up only in a release build, most
likely segfaults.
2006-03-26 19:27:58 -04:00
|
|
|
tok->buf = (char *)
|
2006-04-11 05:19:15 -03:00
|
|
|
PyMem_MALLOC(BUFSIZ);
|
1994-08-29 09:43:07 -03:00
|
|
|
if (tok->buf == NULL) {
|
|
|
|
tok->done = E_NOMEM;
|
|
|
|
return EOF;
|
|
|
|
}
|
|
|
|
tok->end = tok->buf + BUFSIZ;
|
|
|
|
}
|
2002-08-04 14:29:52 -03:00
|
|
|
if (decoding_fgets(tok->buf, (int)(tok->end - tok->buf),
|
|
|
|
tok) == NULL) {
|
1994-08-29 09:43:07 -03:00
|
|
|
tok->done = E_EOF;
|
|
|
|
done = 1;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
tok->done = E_OK;
|
|
|
|
tok->inp = strchr(tok->buf, '\0');
|
|
|
|
done = tok->inp[-1] == '\n';
|
1993-05-12 05:24:20 -03:00
|
|
|
}
|
|
|
|
}
|
1994-08-29 09:43:07 -03:00
|
|
|
else {
|
|
|
|
cur = tok->cur - tok->buf;
|
2002-08-04 14:29:52 -03:00
|
|
|
if (decoding_feof(tok)) {
|
1995-01-17 12:12:13 -04:00
|
|
|
tok->done = E_EOF;
|
|
|
|
done = 1;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
tok->done = E_OK;
|
1994-08-29 09:43:07 -03:00
|
|
|
}
|
|
|
|
tok->lineno++;
|
1993-05-12 05:24:20 -03:00
|
|
|
/* Read until '\n' or EOF */
|
1994-08-29 09:43:07 -03:00
|
|
|
while (!done) {
|
2006-02-15 13:27:45 -04:00
|
|
|
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;
|
1993-05-12 05:24:20 -03:00
|
|
|
char *newbuf = tok->buf;
|
2006-04-11 05:19:15 -03:00
|
|
|
newbuf = (char *)PyMem_REALLOC(newbuf,
|
|
|
|
newsize);
|
1993-05-12 05:24:20 -03:00
|
|
|
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;
|
1994-08-29 09:43:07 -03:00
|
|
|
tok->start = curstart < 0 ? NULL :
|
|
|
|
tok->buf + curstart;
|
2002-08-04 14:29:52 -03:00
|
|
|
if (decoding_fgets(tok->inp,
|
1993-05-12 05:24:20 -03:00
|
|
|
(int)(tok->end - tok->inp),
|
2002-08-04 14:29:52 -03:00
|
|
|
tok) == NULL) {
|
2006-03-02 16:41:27 -04:00
|
|
|
/* Break out early on decoding
|
|
|
|
errors, as tok->buf will be NULL
|
|
|
|
*/
|
|
|
|
if (tok->decoding_erred)
|
|
|
|
return EOF;
|
1994-08-29 09:43:07 -03:00
|
|
|
/* Last line does not end in \n,
|
|
|
|
fake one */
|
|
|
|
strcpy(tok->inp, "\n");
|
|
|
|
}
|
1993-05-12 05:24:20 -03:00
|
|
|
tok->inp = strchr(tok->inp, '\0');
|
1994-08-29 09:43:07 -03:00
|
|
|
done = tok->inp[-1] == '\n';
|
1993-05-12 05:24:20 -03:00
|
|
|
}
|
2006-06-02 03:23:00 -03:00
|
|
|
if (tok->buf != NULL) {
|
|
|
|
tok->cur = tok->buf + cur;
|
|
|
|
tok->line_start = tok->cur;
|
|
|
|
/* replace "\r\n" with "\n" */
|
2006-10-06 15:51:55 -03:00
|
|
|
/* For Mac leave the \r, giving a syntax error */
|
2006-06-02 03:23:00 -03:00
|
|
|
pt = tok->inp - 2;
|
|
|
|
if (pt >= tok->buf && *pt == '\r') {
|
|
|
|
*pt++ = '\n';
|
|
|
|
*pt = '\0';
|
|
|
|
tok->inp = pt;
|
|
|
|
}
|
1995-06-14 15:26:02 -03:00
|
|
|
}
|
1990-10-14 09:07:46 -03:00
|
|
|
}
|
|
|
|
if (tok->done != E_OK) {
|
|
|
|
if (tok->prompt != NULL)
|
1998-08-25 15:13:04 -03:00
|
|
|
PySys_WriteStderr("\n");
|
1993-05-12 05:24:20 -03:00
|
|
|
tok->cur = tok->inp;
|
1990-10-14 09:07:46 -03:00
|
|
|
return EOF;
|
|
|
|
}
|
|
|
|
}
|
1993-05-12 05:24:20 -03:00
|
|
|
/*NOTREACHED*/
|
1990-10-14 09:07:46 -03:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* Back-up one character */
|
|
|
|
|
|
|
|
static void
|
2000-07-22 16:20:54 -03:00
|
|
|
tok_backup(register struct tok_state *tok, register int c)
|
1990-10-14 09:07:46 -03:00
|
|
|
{
|
|
|
|
if (c != EOF) {
|
1994-12-30 11:46:02 -04:00
|
|
|
if (--tok->cur < tok->buf)
|
1997-04-29 18:03:06 -03:00
|
|
|
Py_FatalError("tok_backup: begin of buffer");
|
1990-10-14 09:07:46 -03:00
|
|
|
if (*tok->cur != c)
|
|
|
|
*tok->cur = c;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/* Return the token corresponding to a single character */
|
|
|
|
|
|
|
|
int
|
2000-07-22 16:20:54 -03:00
|
|
|
PyToken_OneChar(int c)
|
1990-10-14 09:07:46 -03:00
|
|
|
{
|
|
|
|
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 BACKQUOTE;
|
|
|
|
case '{': return LBRACE;
|
|
|
|
case '}': return RBRACE;
|
1991-10-24 11:59:40 -03:00
|
|
|
case '^': return CIRCUMFLEX;
|
|
|
|
case '~': return TILDE;
|
2004-08-02 03:10:11 -03:00
|
|
|
case '@': return AT;
|
1990-10-14 09:07:46 -03:00
|
|
|
default: return OP;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
1991-10-20 17:25:03 -03:00
|
|
|
int
|
2000-07-22 16:20:54 -03:00
|
|
|
PyToken_TwoChars(int c1, int c2)
|
1991-10-20 17:25:03 -03:00
|
|
|
{
|
|
|
|
switch (c1) {
|
|
|
|
case '=':
|
|
|
|
switch (c2) {
|
|
|
|
case '=': return EQEQUAL;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
case '!':
|
|
|
|
switch (c2) {
|
|
|
|
case '=': return NOTEQUAL;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
case '<':
|
|
|
|
switch (c2) {
|
2007-11-23 08:12:02 -04:00
|
|
|
case '>': return NOTEQUAL;
|
1991-10-20 17:25:03 -03:00
|
|
|
case '=': return LESSEQUAL;
|
1991-10-24 11:59:40 -03:00
|
|
|
case '<': return LEFTSHIFT;
|
1991-10-20 17:25:03 -03:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
case '>':
|
|
|
|
switch (c2) {
|
|
|
|
case '=': return GREATEREQUAL;
|
1991-10-24 11:59:40 -03:00
|
|
|
case '>': return RIGHTSHIFT;
|
1991-10-20 17:25:03 -03:00
|
|
|
}
|
|
|
|
break;
|
2000-08-24 17:11:32 -03:00
|
|
|
case '+':
|
|
|
|
switch (c2) {
|
|
|
|
case '=': return PLUSEQUAL;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
case '-':
|
|
|
|
switch (c2) {
|
|
|
|
case '=': return MINEQUAL;
|
|
|
|
}
|
|
|
|
break;
|
1996-01-11 21:31:58 -04:00
|
|
|
case '*':
|
|
|
|
switch (c2) {
|
|
|
|
case '*': return DOUBLESTAR;
|
2000-08-24 17:11:32 -03:00
|
|
|
case '=': return STAREQUAL;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
case '/':
|
|
|
|
switch (c2) {
|
2001-08-08 02:00:18 -03:00
|
|
|
case '/': return DOUBLESLASH;
|
2000-08-24 17:11:32 -03:00
|
|
|
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;
|
1996-01-11 21:31:58 -04:00
|
|
|
}
|
|
|
|
break;
|
1991-10-20 17:25:03 -03:00
|
|
|
}
|
|
|
|
return OP;
|
|
|
|
}
|
|
|
|
|
2000-08-24 17:11:32 -03:00
|
|
|
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;
|
2001-08-08 02:00:18 -03:00
|
|
|
case '/':
|
|
|
|
switch (c2) {
|
|
|
|
case '/':
|
|
|
|
switch (c3) {
|
|
|
|
case '=':
|
|
|
|
return DOUBLESLASHEQUAL;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
break;
|
2000-08-24 17:11:32 -03:00
|
|
|
}
|
|
|
|
return OP;
|
|
|
|
}
|
1991-10-20 17:25:03 -03:00
|
|
|
|
1998-04-09 18:38:06 -03:00
|
|
|
static int
|
2000-07-22 16:20:54 -03:00
|
|
|
indenterror(struct tok_state *tok)
|
1998-04-09 18:38:06 -03:00
|
|
|
{
|
|
|
|
if (tok->alterror) {
|
2000-07-11 14:53:00 -03:00
|
|
|
tok->done = E_TABSPACE;
|
1998-04-09 18:38:06 -03:00
|
|
|
tok->cur = tok->inp;
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
if (tok->altwarning) {
|
2000-07-11 14:53:00 -03:00
|
|
|
PySys_WriteStderr("%s: inconsistent use of tabs and spaces "
|
|
|
|
"in indentation\n", tok->filename);
|
1998-04-09 18:38:06 -03:00
|
|
|
tok->altwarning = 0;
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
1990-10-14 09:07:46 -03:00
|
|
|
/* Get next token, after space stripping etc. */
|
|
|
|
|
2002-08-04 14:29:52 -03:00
|
|
|
static int
|
|
|
|
tok_get(register struct tok_state *tok, char **p_start, char **p_end)
|
1990-10-14 09:07:46 -03:00
|
|
|
{
|
|
|
|
register int c;
|
1991-07-27 18:42:56 -03:00
|
|
|
int blankline;
|
|
|
|
|
2008-08-04 23:05:23 -03:00
|
|
|
*p_start = *p_end = NULL;
|
1991-07-27 18:42:56 -03:00
|
|
|
nextline:
|
1994-08-29 09:43:07 -03:00
|
|
|
tok->start = NULL;
|
1991-07-27 18:42:56 -03:00
|
|
|
blankline = 0;
|
|
|
|
|
1990-10-14 09:07:46 -03:00
|
|
|
/* Get indentation level */
|
|
|
|
if (tok->atbol) {
|
|
|
|
register int col = 0;
|
1998-04-09 18:38:06 -03:00
|
|
|
register int altcol = 0;
|
1990-10-14 09:07:46 -03:00
|
|
|
tok->atbol = 0;
|
|
|
|
for (;;) {
|
|
|
|
c = tok_nextc(tok);
|
|
|
|
if (c == ' ')
|
1998-04-09 18:38:06 -03:00
|
|
|
col++, altcol++;
|
|
|
|
else if (c == '\t') {
|
1990-10-14 09:07:46 -03:00
|
|
|
col = (col/tok->tabsize + 1) * tok->tabsize;
|
1998-04-09 18:38:06 -03:00
|
|
|
altcol = (altcol/tok->alttabsize + 1)
|
|
|
|
* tok->alttabsize;
|
|
|
|
}
|
1995-07-07 19:27:27 -03:00
|
|
|
else if (c == '\014') /* Control-L (formfeed) */
|
1998-04-09 18:38:06 -03:00
|
|
|
col = altcol = 0; /* For Emacs users */
|
1990-10-14 09:07:46 -03:00
|
|
|
else
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
tok_backup(tok, c);
|
1991-07-27 18:42:56 -03:00
|
|
|
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 */
|
1990-10-14 09:07:46 -03:00
|
|
|
}
|
1993-05-12 08:35:44 -03:00
|
|
|
if (!blankline && tok->level == 0) {
|
1991-07-27 18:42:56 -03:00
|
|
|
if (col == tok->indstack[tok->indent]) {
|
|
|
|
/* No change */
|
1998-04-09 18:38:06 -03:00
|
|
|
if (altcol != tok->altindstack[tok->indent]) {
|
|
|
|
if (indenterror(tok))
|
|
|
|
return ERRORTOKEN;
|
|
|
|
}
|
1990-10-14 09:07:46 -03:00
|
|
|
}
|
1991-07-27 18:42:56 -03:00
|
|
|
else if (col > tok->indstack[tok->indent]) {
|
|
|
|
/* Indent -- always one */
|
|
|
|
if (tok->indent+1 >= MAXINDENT) {
|
2000-07-11 14:53:00 -03:00
|
|
|
tok->done = E_TOODEEP;
|
1993-05-12 05:24:20 -03:00
|
|
|
tok->cur = tok->inp;
|
1991-07-27 18:42:56 -03:00
|
|
|
return ERRORTOKEN;
|
|
|
|
}
|
1998-04-09 18:38:06 -03:00
|
|
|
if (altcol <= tok->altindstack[tok->indent]) {
|
|
|
|
if (indenterror(tok))
|
|
|
|
return ERRORTOKEN;
|
|
|
|
}
|
1991-07-27 18:42:56 -03:00
|
|
|
tok->pendin++;
|
|
|
|
tok->indstack[++tok->indent] = col;
|
1998-04-09 18:38:06 -03:00
|
|
|
tok->altindstack[tok->indent] = altcol;
|
1990-10-14 09:07:46 -03:00
|
|
|
}
|
1991-07-27 18:42:56 -03:00
|
|
|
else /* col < tok->indstack[tok->indent] */ {
|
|
|
|
/* Dedent -- any number, must be consistent */
|
|
|
|
while (tok->indent > 0 &&
|
|
|
|
col < tok->indstack[tok->indent]) {
|
|
|
|
tok->pendin--;
|
1998-02-16 18:18:00 -04:00
|
|
|
tok->indent--;
|
1991-07-27 18:42:56 -03:00
|
|
|
}
|
|
|
|
if (col != tok->indstack[tok->indent]) {
|
2000-07-11 14:53:00 -03:00
|
|
|
tok->done = E_DEDENT;
|
1993-05-12 05:24:20 -03:00
|
|
|
tok->cur = tok->inp;
|
1991-07-27 18:42:56 -03:00
|
|
|
return ERRORTOKEN;
|
|
|
|
}
|
1998-04-09 18:38:06 -03:00
|
|
|
if (altcol != tok->altindstack[tok->indent]) {
|
|
|
|
if (indenterror(tok))
|
|
|
|
return ERRORTOKEN;
|
|
|
|
}
|
1990-10-14 09:07:46 -03:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
Years in the making.
objimpl.h, pymem.h: Stop mapping PyMem_{Del, DEL} and PyMem_{Free, FREE}
to PyObject_{Free, FREE} in a release build. They're aliases for the
system free() now.
_subprocess.c/sp_handle_dealloc(): Since the memory was originally
obtained via PyObject_NEW, it must be released via PyObject_FREE (or
_DEL).
pythonrun.c, tokenizer.c, parsermodule.c: I lost count of the number of
PyObject vs PyMem mismatches in these -- it's like the specific
function called at each site was picked at random, sometimes even with
memory obtained via PyMem getting released via PyObject. Changed most
to use PyObject uniformly, since the blobs allocated are predictably
small in most cases, and obmalloc is generally faster than system
mallocs then.
If extension modules in real life prove as sloppy as Python's front
end, we'll have to revert the objimpl.h + pymem.h part of this patch.
Note that no problems will show up in a debug build (all calls still go
thru obmalloc then). Problems will show up only in a release build, most
likely segfaults.
2006-03-26 19:27:58 -04:00
|
|
|
|
1994-08-29 09:43:07 -03:00
|
|
|
tok->start = tok->cur;
|
Years in the making.
objimpl.h, pymem.h: Stop mapping PyMem_{Del, DEL} and PyMem_{Free, FREE}
to PyObject_{Free, FREE} in a release build. They're aliases for the
system free() now.
_subprocess.c/sp_handle_dealloc(): Since the memory was originally
obtained via PyObject_NEW, it must be released via PyObject_FREE (or
_DEL).
pythonrun.c, tokenizer.c, parsermodule.c: I lost count of the number of
PyObject vs PyMem mismatches in these -- it's like the specific
function called at each site was picked at random, sometimes even with
memory obtained via PyMem getting released via PyObject. Changed most
to use PyObject uniformly, since the blobs allocated are predictably
small in most cases, and obmalloc is generally faster than system
mallocs then.
If extension modules in real life prove as sloppy as Python's front
end, we'll have to revert the objimpl.h + pymem.h part of this patch.
Note that no problems will show up in a debug build (all calls still go
thru obmalloc then). Problems will show up only in a release build, most
likely segfaults.
2006-03-26 19:27:58 -04:00
|
|
|
|
1990-10-14 09:07:46 -03:00
|
|
|
/* Return pending indents/dedents */
|
|
|
|
if (tok->pendin != 0) {
|
|
|
|
if (tok->pendin < 0) {
|
|
|
|
tok->pendin++;
|
|
|
|
return DEDENT;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
tok->pendin--;
|
|
|
|
return INDENT;
|
|
|
|
}
|
|
|
|
}
|
Years in the making.
objimpl.h, pymem.h: Stop mapping PyMem_{Del, DEL} and PyMem_{Free, FREE}
to PyObject_{Free, FREE} in a release build. They're aliases for the
system free() now.
_subprocess.c/sp_handle_dealloc(): Since the memory was originally
obtained via PyObject_NEW, it must be released via PyObject_FREE (or
_DEL).
pythonrun.c, tokenizer.c, parsermodule.c: I lost count of the number of
PyObject vs PyMem mismatches in these -- it's like the specific
function called at each site was picked at random, sometimes even with
memory obtained via PyMem getting released via PyObject. Changed most
to use PyObject uniformly, since the blobs allocated are predictably
small in most cases, and obmalloc is generally faster than system
mallocs then.
If extension modules in real life prove as sloppy as Python's front
end, we'll have to revert the objimpl.h + pymem.h part of this patch.
Note that no problems will show up in a debug build (all calls still go
thru obmalloc then). Problems will show up only in a release build, most
likely segfaults.
2006-03-26 19:27:58 -04:00
|
|
|
|
1990-10-14 09:07:46 -03:00
|
|
|
again:
|
1994-08-29 09:43:07 -03:00
|
|
|
tok->start = NULL;
|
1990-10-14 09:07:46 -03:00
|
|
|
/* Skip spaces */
|
|
|
|
do {
|
|
|
|
c = tok_nextc(tok);
|
1995-07-07 19:27:27 -03:00
|
|
|
} while (c == ' ' || c == '\t' || c == '\014');
|
Years in the making.
objimpl.h, pymem.h: Stop mapping PyMem_{Del, DEL} and PyMem_{Free, FREE}
to PyObject_{Free, FREE} in a release build. They're aliases for the
system free() now.
_subprocess.c/sp_handle_dealloc(): Since the memory was originally
obtained via PyObject_NEW, it must be released via PyObject_FREE (or
_DEL).
pythonrun.c, tokenizer.c, parsermodule.c: I lost count of the number of
PyObject vs PyMem mismatches in these -- it's like the specific
function called at each site was picked at random, sometimes even with
memory obtained via PyMem getting released via PyObject. Changed most
to use PyObject uniformly, since the blobs allocated are predictably
small in most cases, and obmalloc is generally faster than system
mallocs then.
If extension modules in real life prove as sloppy as Python's front
end, we'll have to revert the objimpl.h + pymem.h part of this patch.
Note that no problems will show up in a debug build (all calls still go
thru obmalloc then). Problems will show up only in a release build, most
likely segfaults.
2006-03-26 19:27:58 -04:00
|
|
|
|
1990-10-14 09:07:46 -03:00
|
|
|
/* Set start of current token */
|
1994-08-29 09:43:07 -03:00
|
|
|
tok->start = tok->cur - 1;
|
Years in the making.
objimpl.h, pymem.h: Stop mapping PyMem_{Del, DEL} and PyMem_{Free, FREE}
to PyObject_{Free, FREE} in a release build. They're aliases for the
system free() now.
_subprocess.c/sp_handle_dealloc(): Since the memory was originally
obtained via PyObject_NEW, it must be released via PyObject_FREE (or
_DEL).
pythonrun.c, tokenizer.c, parsermodule.c: I lost count of the number of
PyObject vs PyMem mismatches in these -- it's like the specific
function called at each site was picked at random, sometimes even with
memory obtained via PyMem getting released via PyObject. Changed most
to use PyObject uniformly, since the blobs allocated are predictably
small in most cases, and obmalloc is generally faster than system
mallocs then.
If extension modules in real life prove as sloppy as Python's front
end, we'll have to revert the objimpl.h + pymem.h part of this patch.
Note that no problems will show up in a debug build (all calls still go
thru obmalloc then). Problems will show up only in a release build, most
likely segfaults.
2006-03-26 19:27:58 -04:00
|
|
|
|
2000-03-30 20:52:27 -04:00
|
|
|
/* Skip comment, while looking for tab-setting magic */
|
1990-10-14 09:07:46 -03:00
|
|
|
if (c == '#') {
|
2000-03-30 20:52:27 -04:00
|
|
|
static char *tabforms[] = {
|
|
|
|
"tab-width:", /* Emacs */
|
|
|
|
":tabstop=", /* vim, full form */
|
|
|
|
":ts=", /* vim, abbreviated form */
|
|
|
|
"set tabsize=", /* will vi never die? */
|
|
|
|
/* more templates can be added here to support other editors */
|
|
|
|
};
|
|
|
|
char cbuf[80];
|
|
|
|
char *tp, **cp;
|
|
|
|
tp = cbuf;
|
1990-10-14 09:07:46 -03:00
|
|
|
do {
|
2000-03-30 20:52:27 -04:00
|
|
|
*tp++ = c = tok_nextc(tok);
|
|
|
|
} while (c != EOF && c != '\n' &&
|
2006-06-11 23:07:57 -03:00
|
|
|
(size_t)(tp - cbuf + 1) < sizeof(cbuf));
|
2000-03-30 20:52:27 -04:00
|
|
|
*tp = '\0';
|
Years in the making.
objimpl.h, pymem.h: Stop mapping PyMem_{Del, DEL} and PyMem_{Free, FREE}
to PyObject_{Free, FREE} in a release build. They're aliases for the
system free() now.
_subprocess.c/sp_handle_dealloc(): Since the memory was originally
obtained via PyObject_NEW, it must be released via PyObject_FREE (or
_DEL).
pythonrun.c, tokenizer.c, parsermodule.c: I lost count of the number of
PyObject vs PyMem mismatches in these -- it's like the specific
function called at each site was picked at random, sometimes even with
memory obtained via PyMem getting released via PyObject. Changed most
to use PyObject uniformly, since the blobs allocated are predictably
small in most cases, and obmalloc is generally faster than system
mallocs then.
If extension modules in real life prove as sloppy as Python's front
end, we'll have to revert the objimpl.h + pymem.h part of this patch.
Note that no problems will show up in a debug build (all calls still go
thru obmalloc then). Problems will show up only in a release build, most
likely segfaults.
2006-03-26 19:27:58 -04:00
|
|
|
for (cp = tabforms;
|
2000-03-30 20:52:27 -04:00
|
|
|
cp < tabforms + sizeof(tabforms)/sizeof(tabforms[0]);
|
|
|
|
cp++) {
|
|
|
|
if ((tp = strstr(cbuf, *cp))) {
|
|
|
|
int newsize = atoi(tp + strlen(*cp));
|
|
|
|
|
|
|
|
if (newsize >= 1 && newsize <= 40) {
|
|
|
|
tok->tabsize = newsize;
|
2000-04-03 20:02:17 -03:00
|
|
|
if (Py_VerboseFlag)
|
|
|
|
PySys_WriteStderr(
|
2000-03-30 20:52:27 -04:00
|
|
|
"Tab size set to %d\n",
|
|
|
|
newsize);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
while (c != EOF && c != '\n')
|
1990-10-14 09:07:46 -03:00
|
|
|
c = tok_nextc(tok);
|
|
|
|
}
|
Years in the making.
objimpl.h, pymem.h: Stop mapping PyMem_{Del, DEL} and PyMem_{Free, FREE}
to PyObject_{Free, FREE} in a release build. They're aliases for the
system free() now.
_subprocess.c/sp_handle_dealloc(): Since the memory was originally
obtained via PyObject_NEW, it must be released via PyObject_FREE (or
_DEL).
pythonrun.c, tokenizer.c, parsermodule.c: I lost count of the number of
PyObject vs PyMem mismatches in these -- it's like the specific
function called at each site was picked at random, sometimes even with
memory obtained via PyMem getting released via PyObject. Changed most
to use PyObject uniformly, since the blobs allocated are predictably
small in most cases, and obmalloc is generally faster than system
mallocs then.
If extension modules in real life prove as sloppy as Python's front
end, we'll have to revert the objimpl.h + pymem.h part of this patch.
Note that no problems will show up in a debug build (all calls still go
thru obmalloc then). Problems will show up only in a release build, most
likely segfaults.
2006-03-26 19:27:58 -04:00
|
|
|
|
1990-10-14 09:07:46 -03:00
|
|
|
/* Check for EOF and errors now */
|
1991-10-24 11:59:40 -03:00
|
|
|
if (c == EOF) {
|
1990-10-14 09:07:46 -03:00
|
|
|
return tok->done == E_EOF ? ENDMARKER : ERRORTOKEN;
|
1991-10-24 11:59:40 -03:00
|
|
|
}
|
Years in the making.
objimpl.h, pymem.h: Stop mapping PyMem_{Del, DEL} and PyMem_{Free, FREE}
to PyObject_{Free, FREE} in a release build. They're aliases for the
system free() now.
_subprocess.c/sp_handle_dealloc(): Since the memory was originally
obtained via PyObject_NEW, it must be released via PyObject_FREE (or
_DEL).
pythonrun.c, tokenizer.c, parsermodule.c: I lost count of the number of
PyObject vs PyMem mismatches in these -- it's like the specific
function called at each site was picked at random, sometimes even with
memory obtained via PyMem getting released via PyObject. Changed most
to use PyObject uniformly, since the blobs allocated are predictably
small in most cases, and obmalloc is generally faster than system
mallocs then.
If extension modules in real life prove as sloppy as Python's front
end, we'll have to revert the objimpl.h + pymem.h part of this patch.
Note that no problems will show up in a debug build (all calls still go
thru obmalloc then). Problems will show up only in a release build, most
likely segfaults.
2006-03-26 19:27:58 -04:00
|
|
|
|
1990-10-14 09:07:46 -03:00
|
|
|
/* Identifier (most frequent token!) */
|
|
|
|
if (isalpha(c) || c == '_') {
|
2000-03-10 18:56:54 -04:00
|
|
|
/* Process r"", u"" and ur"" */
|
1997-04-25 14:32:00 -03:00
|
|
|
switch (c) {
|
2008-01-18 14:24:07 -04:00
|
|
|
case 'b':
|
|
|
|
case 'B':
|
|
|
|
c = tok_nextc(tok);
|
|
|
|
if (c == 'r' || c == 'R')
|
|
|
|
c = tok_nextc(tok);
|
|
|
|
if (c == '"' || c == '\'')
|
|
|
|
goto letter_quote;
|
|
|
|
break;
|
1997-04-25 14:32:00 -03:00
|
|
|
case 'r':
|
|
|
|
case 'R':
|
|
|
|
c = tok_nextc(tok);
|
|
|
|
if (c == '"' || c == '\'')
|
|
|
|
goto letter_quote;
|
2000-03-10 18:56:54 -04:00
|
|
|
break;
|
|
|
|
case 'u':
|
|
|
|
case 'U':
|
|
|
|
c = tok_nextc(tok);
|
|
|
|
if (c == 'r' || c == 'R')
|
|
|
|
c = tok_nextc(tok);
|
|
|
|
if (c == '"' || c == '\'')
|
|
|
|
goto letter_quote;
|
|
|
|
break;
|
1997-04-25 14:32:00 -03:00
|
|
|
}
|
1997-04-05 23:46:20 -04:00
|
|
|
while (isalnum(c) || c == '_') {
|
1990-10-14 09:07:46 -03:00
|
|
|
c = tok_nextc(tok);
|
1997-04-05 23:46:20 -04:00
|
|
|
}
|
1990-10-14 09:07:46 -03:00
|
|
|
tok_backup(tok, c);
|
1994-08-29 09:43:07 -03:00
|
|
|
*p_start = tok->start;
|
1990-10-14 09:07:46 -03:00
|
|
|
*p_end = tok->cur;
|
|
|
|
return NAME;
|
|
|
|
}
|
Years in the making.
objimpl.h, pymem.h: Stop mapping PyMem_{Del, DEL} and PyMem_{Free, FREE}
to PyObject_{Free, FREE} in a release build. They're aliases for the
system free() now.
_subprocess.c/sp_handle_dealloc(): Since the memory was originally
obtained via PyObject_NEW, it must be released via PyObject_FREE (or
_DEL).
pythonrun.c, tokenizer.c, parsermodule.c: I lost count of the number of
PyObject vs PyMem mismatches in these -- it's like the specific
function called at each site was picked at random, sometimes even with
memory obtained via PyMem getting released via PyObject. Changed most
to use PyObject uniformly, since the blobs allocated are predictably
small in most cases, and obmalloc is generally faster than system
mallocs then.
If extension modules in real life prove as sloppy as Python's front
end, we'll have to revert the objimpl.h + pymem.h part of this patch.
Note that no problems will show up in a debug build (all calls still go
thru obmalloc then). Problems will show up only in a release build, most
likely segfaults.
2006-03-26 19:27:58 -04:00
|
|
|
|
1990-10-14 09:07:46 -03:00
|
|
|
/* Newline */
|
|
|
|
if (c == '\n') {
|
|
|
|
tok->atbol = 1;
|
1993-05-12 08:35:44 -03:00
|
|
|
if (blankline || tok->level > 0)
|
1991-07-27 18:42:56 -03:00
|
|
|
goto nextline;
|
1994-08-29 09:43:07 -03:00
|
|
|
*p_start = tok->start;
|
1990-10-14 09:07:46 -03:00
|
|
|
*p_end = tok->cur - 1; /* Leave '\n' out of the string */
|
2002-09-03 08:52:44 -03:00
|
|
|
tok->cont_line = 0;
|
1990-10-14 09:07:46 -03:00
|
|
|
return NEWLINE;
|
|
|
|
}
|
Years in the making.
objimpl.h, pymem.h: Stop mapping PyMem_{Del, DEL} and PyMem_{Free, FREE}
to PyObject_{Free, FREE} in a release build. They're aliases for the
system free() now.
_subprocess.c/sp_handle_dealloc(): Since the memory was originally
obtained via PyObject_NEW, it must be released via PyObject_FREE (or
_DEL).
pythonrun.c, tokenizer.c, parsermodule.c: I lost count of the number of
PyObject vs PyMem mismatches in these -- it's like the specific
function called at each site was picked at random, sometimes even with
memory obtained via PyMem getting released via PyObject. Changed most
to use PyObject uniformly, since the blobs allocated are predictably
small in most cases, and obmalloc is generally faster than system
mallocs then.
If extension modules in real life prove as sloppy as Python's front
end, we'll have to revert the objimpl.h + pymem.h part of this patch.
Note that no problems will show up in a debug build (all calls still go
thru obmalloc then). Problems will show up only in a release build, most
likely segfaults.
2006-03-26 19:27:58 -04:00
|
|
|
|
1991-10-24 11:59:40 -03:00
|
|
|
/* Period or number starting with period? */
|
|
|
|
if (c == '.') {
|
|
|
|
c = tok_nextc(tok);
|
|
|
|
if (isdigit(c)) {
|
|
|
|
goto fraction;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
tok_backup(tok, c);
|
1994-08-29 09:43:07 -03:00
|
|
|
*p_start = tok->start;
|
1991-10-24 11:59:40 -03:00
|
|
|
*p_end = tok->cur;
|
|
|
|
return DOT;
|
|
|
|
}
|
|
|
|
}
|
1996-01-11 21:31:58 -04:00
|
|
|
|
1990-10-14 09:07:46 -03:00
|
|
|
/* Number */
|
|
|
|
if (isdigit(c)) {
|
|
|
|
if (c == '0') {
|
2008-03-17 14:32:20 -03:00
|
|
|
/* Hex, octal or binary -- maybe. */
|
1990-10-14 09:07:46 -03:00
|
|
|
c = tok_nextc(tok);
|
|
|
|
if (c == '.')
|
|
|
|
goto fraction;
|
1996-01-11 21:31:58 -04:00
|
|
|
#ifndef WITHOUT_COMPLEX
|
1996-01-26 14:59:07 -04:00
|
|
|
if (c == 'j' || c == 'J')
|
1996-01-11 21:31:58 -04:00
|
|
|
goto imaginary;
|
|
|
|
#endif
|
1990-10-14 09:07:46 -03:00
|
|
|
if (c == 'x' || c == 'X') {
|
2008-01-19 15:27:05 -04:00
|
|
|
|
1990-10-14 09:07:46 -03:00
|
|
|
/* Hex */
|
2008-01-19 15:27:05 -04:00
|
|
|
c = tok_nextc(tok);
|
|
|
|
if (!isxdigit(c)) {
|
|
|
|
tok->done = E_TOKEN;
|
|
|
|
tok_backup(tok, c);
|
|
|
|
return ERRORTOKEN;
|
|
|
|
}
|
1990-10-14 09:07:46 -03:00
|
|
|
do {
|
|
|
|
c = tok_nextc(tok);
|
|
|
|
} while (isxdigit(c));
|
|
|
|
}
|
2008-03-17 14:32:20 -03:00
|
|
|
else if (c == 'o' || c == 'O') {
|
|
|
|
/* Octal */
|
|
|
|
c = tok_nextc(tok);
|
2008-04-24 15:07:05 -03:00
|
|
|
if (c < '0' || c >= '8') {
|
2008-03-17 14:32:20 -03:00
|
|
|
tok->done = E_TOKEN;
|
|
|
|
tok_backup(tok, c);
|
|
|
|
return ERRORTOKEN;
|
|
|
|
}
|
|
|
|
do {
|
|
|
|
c = tok_nextc(tok);
|
|
|
|
} while ('0' <= c && c < '8');
|
|
|
|
}
|
|
|
|
else if (c == 'b' || c == 'B') {
|
|
|
|
/* Binary */
|
|
|
|
c = tok_nextc(tok);
|
|
|
|
if (c != '0' && c != '1') {
|
|
|
|
tok->done = E_TOKEN;
|
|
|
|
tok_backup(tok, c);
|
|
|
|
return ERRORTOKEN;
|
|
|
|
}
|
|
|
|
do {
|
|
|
|
c = tok_nextc(tok);
|
|
|
|
} while (c == '0' || c == '1');
|
|
|
|
}
|
1990-10-14 09:07:46 -03:00
|
|
|
else {
|
2001-08-30 17:51:59 -03:00
|
|
|
int found_decimal = 0;
|
1990-10-14 09:07:46 -03:00
|
|
|
/* Octal; c is first char of it */
|
|
|
|
/* There's no 'isoctdigit' macro, sigh */
|
|
|
|
while ('0' <= c && c < '8') {
|
|
|
|
c = tok_nextc(tok);
|
|
|
|
}
|
2001-08-30 17:51:59 -03:00
|
|
|
if (isdigit(c)) {
|
|
|
|
found_decimal = 1;
|
|
|
|
do {
|
|
|
|
c = tok_nextc(tok);
|
|
|
|
} while (isdigit(c));
|
|
|
|
}
|
|
|
|
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 (found_decimal) {
|
|
|
|
tok->done = E_TOKEN;
|
|
|
|
tok_backup(tok, c);
|
|
|
|
return ERRORTOKEN;
|
|
|
|
}
|
1990-10-14 09:07:46 -03:00
|
|
|
}
|
1991-05-05 17:16:20 -03:00
|
|
|
if (c == 'l' || c == 'L')
|
|
|
|
c = tok_nextc(tok);
|
1990-10-14 09:07:46 -03:00
|
|
|
}
|
|
|
|
else {
|
|
|
|
/* Decimal */
|
|
|
|
do {
|
|
|
|
c = tok_nextc(tok);
|
|
|
|
} while (isdigit(c));
|
1991-05-05 17:16:20 -03:00
|
|
|
if (c == 'l' || c == 'L')
|
1990-10-14 09:07:46 -03:00
|
|
|
c = tok_nextc(tok);
|
1991-05-05 17:16:20 -03:00
|
|
|
else {
|
2001-08-27 16:19:28 -03:00
|
|
|
/* Accept floating point numbers. */
|
1991-05-05 17:16:20 -03:00
|
|
|
if (c == '.') {
|
|
|
|
fraction:
|
|
|
|
/* Fraction */
|
|
|
|
do {
|
|
|
|
c = tok_nextc(tok);
|
|
|
|
} while (isdigit(c));
|
|
|
|
}
|
|
|
|
if (c == 'e' || c == 'E') {
|
2001-08-30 17:51:59 -03:00
|
|
|
exponent:
|
1991-05-05 17:16:20 -03:00
|
|
|
/* Exponent part */
|
1990-10-14 09:07:46 -03:00
|
|
|
c = tok_nextc(tok);
|
1991-05-05 17:16:20 -03:00
|
|
|
if (c == '+' || c == '-')
|
|
|
|
c = tok_nextc(tok);
|
2001-08-27 16:19:28 -03:00
|
|
|
if (!isdigit(c)) {
|
|
|
|
tok->done = E_TOKEN;
|
|
|
|
tok_backup(tok, c);
|
|
|
|
return ERRORTOKEN;
|
1991-05-05 17:16:20 -03:00
|
|
|
}
|
2001-08-27 16:19:28 -03:00
|
|
|
do {
|
|
|
|
c = tok_nextc(tok);
|
|
|
|
} while (isdigit(c));
|
1990-10-14 09:07:46 -03:00
|
|
|
}
|
1996-01-11 21:31:58 -04:00
|
|
|
#ifndef WITHOUT_COMPLEX
|
1996-01-26 14:59:07 -04:00
|
|
|
if (c == 'j' || c == 'J')
|
1996-01-11 21:31:58 -04:00
|
|
|
/* Imaginary part */
|
|
|
|
imaginary:
|
|
|
|
c = tok_nextc(tok);
|
|
|
|
#endif
|
1990-10-14 09:07:46 -03:00
|
|
|
}
|
|
|
|
}
|
|
|
|
tok_backup(tok, c);
|
1994-08-29 09:43:07 -03:00
|
|
|
*p_start = tok->start;
|
1990-10-14 09:07:46 -03:00
|
|
|
*p_end = tok->cur;
|
|
|
|
return NUMBER;
|
|
|
|
}
|
1997-04-05 23:46:20 -04:00
|
|
|
|
|
|
|
letter_quote:
|
1994-08-29 09:43:07 -03:00
|
|
|
/* String */
|
|
|
|
if (c == '\'' || c == '"') {
|
2006-02-15 13:27:45 -04:00
|
|
|
Py_ssize_t quote2 = tok->cur - tok->start + 1;
|
1994-08-29 09:43:07 -03:00
|
|
|
int quote = c;
|
|
|
|
int triple = 0;
|
|
|
|
int tripcount = 0;
|
1990-10-14 09:07:46 -03:00
|
|
|
for (;;) {
|
|
|
|
c = tok_nextc(tok);
|
1994-08-29 09:43:07 -03:00
|
|
|
if (c == '\n') {
|
|
|
|
if (!triple) {
|
2002-08-14 22:20:16 -03:00
|
|
|
tok->done = E_EOLS;
|
1994-08-29 09:43:07 -03:00
|
|
|
tok_backup(tok, c);
|
1990-10-14 09:07:46 -03:00
|
|
|
return ERRORTOKEN;
|
|
|
|
}
|
1994-08-29 09:43:07 -03:00
|
|
|
tripcount = 0;
|
2002-09-03 08:52:44 -03:00
|
|
|
tok->cont_line = 1; /* multiline string. */
|
1990-10-14 09:07:46 -03:00
|
|
|
}
|
1994-08-29 09:43:07 -03:00
|
|
|
else if (c == EOF) {
|
2002-08-14 22:20:16 -03:00
|
|
|
if (triple)
|
|
|
|
tok->done = E_EOFS;
|
|
|
|
else
|
|
|
|
tok->done = E_EOLS;
|
1993-10-26 12:19:44 -03:00
|
|
|
tok->cur = tok->inp;
|
|
|
|
return ERRORTOKEN;
|
|
|
|
}
|
1994-08-29 09:43:07 -03:00
|
|
|
else if (c == quote) {
|
|
|
|
tripcount++;
|
1998-02-16 11:42:50 -04:00
|
|
|
if (tok->cur - tok->start == quote2) {
|
1994-08-29 09:43:07 -03:00
|
|
|
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;
|
1993-10-26 12:19:44 -03:00
|
|
|
c = tok_nextc(tok);
|
1994-08-29 09:43:07 -03:00
|
|
|
if (c == EOF) {
|
2002-08-14 22:20:16 -03:00
|
|
|
tok->done = E_EOLS;
|
1993-10-26 12:19:44 -03:00
|
|
|
tok->cur = tok->inp;
|
|
|
|
return ERRORTOKEN;
|
|
|
|
}
|
|
|
|
}
|
1994-08-29 09:43:07 -03:00
|
|
|
else
|
|
|
|
tripcount = 0;
|
1993-10-26 12:19:44 -03:00
|
|
|
}
|
1994-08-29 09:43:07 -03:00
|
|
|
*p_start = tok->start;
|
1993-10-26 12:19:44 -03:00
|
|
|
*p_end = tok->cur;
|
|
|
|
return STRING;
|
|
|
|
}
|
Years in the making.
objimpl.h, pymem.h: Stop mapping PyMem_{Del, DEL} and PyMem_{Free, FREE}
to PyObject_{Free, FREE} in a release build. They're aliases for the
system free() now.
_subprocess.c/sp_handle_dealloc(): Since the memory was originally
obtained via PyObject_NEW, it must be released via PyObject_FREE (or
_DEL).
pythonrun.c, tokenizer.c, parsermodule.c: I lost count of the number of
PyObject vs PyMem mismatches in these -- it's like the specific
function called at each site was picked at random, sometimes even with
memory obtained via PyMem getting released via PyObject. Changed most
to use PyObject uniformly, since the blobs allocated are predictably
small in most cases, and obmalloc is generally faster than system
mallocs then.
If extension modules in real life prove as sloppy as Python's front
end, we'll have to revert the objimpl.h + pymem.h part of this patch.
Note that no problems will show up in a debug build (all calls still go
thru obmalloc then). Problems will show up only in a release build, most
likely segfaults.
2006-03-26 19:27:58 -04:00
|
|
|
|
1990-10-14 09:07:46 -03:00
|
|
|
/* Line continuation */
|
|
|
|
if (c == '\\') {
|
|
|
|
c = tok_nextc(tok);
|
|
|
|
if (c != '\n') {
|
2005-03-03 07:45:45 -04:00
|
|
|
tok->done = E_LINECONT;
|
1993-05-12 05:24:20 -03:00
|
|
|
tok->cur = tok->inp;
|
1990-10-14 09:07:46 -03:00
|
|
|
return ERRORTOKEN;
|
|
|
|
}
|
2002-09-03 08:52:44 -03:00
|
|
|
tok->cont_line = 1;
|
1990-10-14 09:07:46 -03:00
|
|
|
goto again; /* Read next line */
|
|
|
|
}
|
Years in the making.
objimpl.h, pymem.h: Stop mapping PyMem_{Del, DEL} and PyMem_{Free, FREE}
to PyObject_{Free, FREE} in a release build. They're aliases for the
system free() now.
_subprocess.c/sp_handle_dealloc(): Since the memory was originally
obtained via PyObject_NEW, it must be released via PyObject_FREE (or
_DEL).
pythonrun.c, tokenizer.c, parsermodule.c: I lost count of the number of
PyObject vs PyMem mismatches in these -- it's like the specific
function called at each site was picked at random, sometimes even with
memory obtained via PyMem getting released via PyObject. Changed most
to use PyObject uniformly, since the blobs allocated are predictably
small in most cases, and obmalloc is generally faster than system
mallocs then.
If extension modules in real life prove as sloppy as Python's front
end, we'll have to revert the objimpl.h + pymem.h part of this patch.
Note that no problems will show up in a debug build (all calls still go
thru obmalloc then). Problems will show up only in a release build, most
likely segfaults.
2006-03-26 19:27:58 -04:00
|
|
|
|
1991-10-20 17:25:03 -03:00
|
|
|
/* Check for two-character token */
|
|
|
|
{
|
|
|
|
int c2 = tok_nextc(tok);
|
1997-04-29 18:03:06 -03:00
|
|
|
int token = PyToken_TwoChars(c, c2);
|
2007-11-23 08:12:02 -04:00
|
|
|
#ifndef PGEN
|
2007-11-24 09:20:22 -04:00
|
|
|
if (Py_Py3kWarningFlag && token == NOTEQUAL && c == '<') {
|
2007-11-23 08:12:02 -04:00
|
|
|
if (PyErr_WarnExplicit(PyExc_DeprecationWarning,
|
2008-03-25 05:29:14 -03:00
|
|
|
"<> not supported in 3.x; use !=",
|
2007-11-23 08:12:02 -04:00
|
|
|
tok->filename, tok->lineno,
|
|
|
|
NULL, NULL)) {
|
|
|
|
return ERRORTOKEN;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
#endif
|
1991-10-20 17:25:03 -03:00
|
|
|
if (token != OP) {
|
2000-08-24 17:11:32 -03:00
|
|
|
int c3 = tok_nextc(tok);
|
|
|
|
int token3 = PyToken_ThreeChars(c, c2, c3);
|
|
|
|
if (token3 != OP) {
|
|
|
|
token = token3;
|
|
|
|
} else {
|
|
|
|
tok_backup(tok, c3);
|
|
|
|
}
|
1994-08-29 09:43:07 -03:00
|
|
|
*p_start = tok->start;
|
1991-10-20 17:25:03 -03:00
|
|
|
*p_end = tok->cur;
|
|
|
|
return token;
|
|
|
|
}
|
|
|
|
tok_backup(tok, c2);
|
|
|
|
}
|
Years in the making.
objimpl.h, pymem.h: Stop mapping PyMem_{Del, DEL} and PyMem_{Free, FREE}
to PyObject_{Free, FREE} in a release build. They're aliases for the
system free() now.
_subprocess.c/sp_handle_dealloc(): Since the memory was originally
obtained via PyObject_NEW, it must be released via PyObject_FREE (or
_DEL).
pythonrun.c, tokenizer.c, parsermodule.c: I lost count of the number of
PyObject vs PyMem mismatches in these -- it's like the specific
function called at each site was picked at random, sometimes even with
memory obtained via PyMem getting released via PyObject. Changed most
to use PyObject uniformly, since the blobs allocated are predictably
small in most cases, and obmalloc is generally faster than system
mallocs then.
If extension modules in real life prove as sloppy as Python's front
end, we'll have to revert the objimpl.h + pymem.h part of this patch.
Note that no problems will show up in a debug build (all calls still go
thru obmalloc then). Problems will show up only in a release build, most
likely segfaults.
2006-03-26 19:27:58 -04:00
|
|
|
|
1994-08-29 09:43:07 -03:00
|
|
|
/* Keep track of parentheses nesting level */
|
1993-05-12 08:35:44 -03:00
|
|
|
switch (c) {
|
|
|
|
case '(':
|
|
|
|
case '[':
|
|
|
|
case '{':
|
|
|
|
tok->level++;
|
|
|
|
break;
|
|
|
|
case ')':
|
|
|
|
case ']':
|
|
|
|
case '}':
|
|
|
|
tok->level--;
|
|
|
|
break;
|
|
|
|
}
|
Years in the making.
objimpl.h, pymem.h: Stop mapping PyMem_{Del, DEL} and PyMem_{Free, FREE}
to PyObject_{Free, FREE} in a release build. They're aliases for the
system free() now.
_subprocess.c/sp_handle_dealloc(): Since the memory was originally
obtained via PyObject_NEW, it must be released via PyObject_FREE (or
_DEL).
pythonrun.c, tokenizer.c, parsermodule.c: I lost count of the number of
PyObject vs PyMem mismatches in these -- it's like the specific
function called at each site was picked at random, sometimes even with
memory obtained via PyMem getting released via PyObject. Changed most
to use PyObject uniformly, since the blobs allocated are predictably
small in most cases, and obmalloc is generally faster than system
mallocs then.
If extension modules in real life prove as sloppy as Python's front
end, we'll have to revert the objimpl.h + pymem.h part of this patch.
Note that no problems will show up in a debug build (all calls still go
thru obmalloc then). Problems will show up only in a release build, most
likely segfaults.
2006-03-26 19:27:58 -04:00
|
|
|
|
1990-10-14 09:07:46 -03:00
|
|
|
/* Punctuation character */
|
1994-08-29 09:43:07 -03:00
|
|
|
*p_start = tok->start;
|
1990-10-14 09:07:46 -03:00
|
|
|
*p_end = tok->cur;
|
1997-04-29 18:03:06 -03:00
|
|
|
return PyToken_OneChar(c);
|
1990-10-14 09:07:46 -03:00
|
|
|
}
|
|
|
|
|
2002-08-04 14:29:52 -03:00
|
|
|
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;
|
|
|
|
}
|
1990-10-14 09:07:46 -03:00
|
|
|
|
2007-09-04 11:19:28 -03:00
|
|
|
/* This function is only called from parsetok. However, it cannot live
|
|
|
|
there, as it must be empty for PGEN, and we can check for PGEN only
|
|
|
|
in this file. */
|
|
|
|
|
2008-01-23 10:20:50 -04:00
|
|
|
#if defined(PGEN) || !defined(Py_USING_UNICODE)
|
2007-09-04 11:19:28 -03:00
|
|
|
char*
|
|
|
|
PyTokenizer_RestoreEncoding(struct tok_state* tok, int len, int* offset)
|
|
|
|
{
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
#else
|
2008-01-07 14:41:34 -04:00
|
|
|
#ifdef Py_USING_UNICODE
|
2007-09-04 11:19:28 -03:00
|
|
|
static PyObject *
|
|
|
|
dec_utf8(const char *enc, const char *text, size_t len) {
|
|
|
|
PyObject *ret = NULL;
|
|
|
|
PyObject *unicode_text = PyUnicode_DecodeUTF8(text, len, "replace");
|
|
|
|
if (unicode_text) {
|
|
|
|
ret = PyUnicode_AsEncodedString(unicode_text, enc, "replace");
|
|
|
|
Py_DECREF(unicode_text);
|
|
|
|
}
|
|
|
|
if (!ret) {
|
2007-10-15 12:54:11 -03:00
|
|
|
PyErr_Clear();
|
2007-09-04 11:19:28 -03:00
|
|
|
}
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
char *
|
|
|
|
PyTokenizer_RestoreEncoding(struct tok_state* tok, int len, int *offset)
|
|
|
|
{
|
|
|
|
char *text = NULL;
|
|
|
|
if (tok->encoding) {
|
|
|
|
/* convert source to original encondig */
|
|
|
|
PyObject *lineobj = dec_utf8(tok->encoding, tok->buf, len);
|
|
|
|
if (lineobj != NULL) {
|
2008-06-09 01:58:54 -03:00
|
|
|
int linelen = PyString_Size(lineobj);
|
|
|
|
const char *line = PyString_AsString(lineobj);
|
2007-09-04 11:19:28 -03:00
|
|
|
text = PyObject_MALLOC(linelen + 1);
|
|
|
|
if (text != NULL && line != NULL) {
|
|
|
|
if (linelen)
|
|
|
|
strncpy(text, line, linelen);
|
|
|
|
text[linelen] = '\0';
|
|
|
|
}
|
|
|
|
Py_DECREF(lineobj);
|
|
|
|
|
|
|
|
/* adjust error offset */
|
|
|
|
if (*offset > 1) {
|
|
|
|
PyObject *offsetobj = dec_utf8(tok->encoding,
|
|
|
|
tok->buf, *offset-1);
|
|
|
|
if (offsetobj) {
|
2008-06-09 01:58:54 -03:00
|
|
|
*offset = PyString_Size(offsetobj) + 1;
|
2007-09-04 11:19:28 -03:00
|
|
|
Py_DECREF(offsetobj);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return text;
|
|
|
|
|
|
|
|
}
|
2008-01-07 14:41:34 -04:00
|
|
|
#endif /* defined(Py_USING_UNICODE) */
|
2007-09-04 11:19:28 -03:00
|
|
|
#endif
|
|
|
|
|
|
|
|
|
1996-12-30 12:17:54 -04:00
|
|
|
#ifdef Py_DEBUG
|
1990-10-14 09:07:46 -03:00
|
|
|
|
|
|
|
void
|
2000-07-22 16:20:54 -03:00
|
|
|
tok_dump(int type, char *start, char *end)
|
1990-10-14 09:07:46 -03:00
|
|
|
{
|
1997-04-29 18:03:06 -03:00
|
|
|
printf("%s", _PyParser_TokenNames[type]);
|
1990-10-14 09:07:46 -03:00
|
|
|
if (type == NAME || type == NUMBER || type == STRING || type == OP)
|
|
|
|
printf("(%.*s)", (int)(end - start), start);
|
|
|
|
}
|
|
|
|
|
|
|
|
#endif
|