mirror of
https://github.com/python/cpython.git
synced 2024-12-16 05:14:41 +08:00
4b499dd3fb
with an indented code block but no newline would raise SyntaxError. This would have been a four-line change in parsetok.c... Except codeop.py depends on this behavior, so a compilation flag had to be invented that causes the tokenizer to revert to the old behavior; this required extra changes to 2 .h files, 2 .c files, and 2 .py files. (Fixes SF bug #501622.)
223 lines
5.0 KiB
C
223 lines
5.0 KiB
C
|
|
/* Parser-tokenizer link implementation */
|
|
|
|
#include "pgenheaders.h"
|
|
#include "tokenizer.h"
|
|
#include "node.h"
|
|
#include "grammar.h"
|
|
#include "parser.h"
|
|
#include "parsetok.h"
|
|
#include "errcode.h"
|
|
#include "graminit.h"
|
|
|
|
int Py_TabcheckFlag;
|
|
|
|
|
|
/* Forward */
|
|
static node *parsetok(struct tok_state *, grammar *, int, perrdetail *, int);
|
|
static void initerr(perrdetail *err_ret, const char* filename);
|
|
|
|
/* Parse input coming from a string. Return error code, print some errors. */
|
|
node *
|
|
PyParser_ParseString(const char *s, grammar *g, int start, perrdetail *err_ret)
|
|
{
|
|
return PyParser_ParseStringFlags(s, g, start, err_ret, 0);
|
|
}
|
|
|
|
node *
|
|
PyParser_ParseStringFlags(const char *s, grammar *g, int start,
|
|
perrdetail *err_ret, int flags)
|
|
{
|
|
return PyParser_ParseStringFlagsFilename(s, NULL,
|
|
g, start, err_ret, 0);
|
|
}
|
|
|
|
node *
|
|
PyParser_ParseStringFlagsFilename(const char *s, const char *filename,
|
|
grammar *g, int start,
|
|
perrdetail *err_ret, int flags)
|
|
{
|
|
struct tok_state *tok;
|
|
|
|
initerr(err_ret, filename);
|
|
|
|
if ((tok = PyTokenizer_FromString(s)) == NULL) {
|
|
err_ret->error = E_NOMEM;
|
|
return NULL;
|
|
}
|
|
|
|
tok->filename = filename ? filename : "<string>";
|
|
if (Py_TabcheckFlag || Py_VerboseFlag) {
|
|
tok->altwarning = (tok->filename != NULL);
|
|
if (Py_TabcheckFlag >= 2)
|
|
tok->alterror++;
|
|
}
|
|
|
|
return parsetok(tok, g, start, err_ret, flags);
|
|
}
|
|
|
|
|
|
/* Parse input coming from a file. Return error code, print some errors. */
|
|
|
|
node *
|
|
PyParser_ParseFile(FILE *fp, const char *filename, grammar *g, int start,
|
|
char *ps1, char *ps2, perrdetail *err_ret)
|
|
{
|
|
return PyParser_ParseFileFlags(fp, filename, g, start, ps1, ps2,
|
|
err_ret, 0);
|
|
}
|
|
|
|
node *
|
|
PyParser_ParseFileFlags(FILE *fp, const char *filename, grammar *g, int start,
|
|
char *ps1, char *ps2, perrdetail *err_ret, int flags)
|
|
{
|
|
struct tok_state *tok;
|
|
|
|
initerr(err_ret, filename);
|
|
|
|
if ((tok = PyTokenizer_FromFile(fp, ps1, ps2)) == NULL) {
|
|
err_ret->error = E_NOMEM;
|
|
return NULL;
|
|
}
|
|
tok->filename = filename;
|
|
if (Py_TabcheckFlag || Py_VerboseFlag) {
|
|
tok->altwarning = (filename != NULL);
|
|
if (Py_TabcheckFlag >= 2)
|
|
tok->alterror++;
|
|
}
|
|
|
|
|
|
return parsetok(tok, g, start, err_ret, flags);
|
|
}
|
|
|
|
/* Parse input coming from the given tokenizer structure.
|
|
Return error code. */
|
|
|
|
#if 0 /* future keyword */
|
|
static char yield_msg[] =
|
|
"%s:%d: Warning: 'yield' will become a reserved keyword in the future\n";
|
|
#endif
|
|
|
|
static node *
|
|
parsetok(struct tok_state *tok, grammar *g, int start, perrdetail *err_ret,
|
|
int flags)
|
|
{
|
|
parser_state *ps;
|
|
node *n;
|
|
int started = 0;
|
|
|
|
if ((ps = PyParser_New(g, start)) == NULL) {
|
|
fprintf(stderr, "no mem for new parser\n");
|
|
err_ret->error = E_NOMEM;
|
|
return NULL;
|
|
}
|
|
#if 0 /* future keyword */
|
|
if (flags & PyPARSE_YIELD_IS_KEYWORD)
|
|
ps->p_generators = 1;
|
|
#endif
|
|
|
|
for (;;) {
|
|
char *a, *b;
|
|
int type;
|
|
size_t len;
|
|
char *str;
|
|
|
|
type = PyTokenizer_Get(tok, &a, &b);
|
|
if (type == ERRORTOKEN) {
|
|
err_ret->error = tok->done;
|
|
break;
|
|
}
|
|
if (type == ENDMARKER && started) {
|
|
type = NEWLINE; /* Add an extra newline */
|
|
started = 0;
|
|
/* Add the right number of dedent tokens,
|
|
except if a certain flag is given --
|
|
codeop.py uses this. */
|
|
if (tok->indent &&
|
|
!(flags & PyPARSE_DONT_IMPLY_DEDENT))
|
|
{
|
|
tok->pendin = -tok->indent;
|
|
tok->indent = 0;
|
|
}
|
|
}
|
|
else
|
|
started = 1;
|
|
len = b - a; /* XXX this may compute NULL - NULL */
|
|
str = (char *) PyObject_MALLOC(len + 1);
|
|
if (str == NULL) {
|
|
fprintf(stderr, "no mem for next token\n");
|
|
err_ret->error = E_NOMEM;
|
|
break;
|
|
}
|
|
if (len > 0)
|
|
strncpy(str, a, len);
|
|
str[len] = '\0';
|
|
|
|
#if 0 /* future keyword */
|
|
/* Warn about yield as NAME */
|
|
if (type == NAME && !ps->p_generators &&
|
|
len == 5 && str[0] == 'y' && strcmp(str, "yield") == 0)
|
|
PySys_WriteStderr(yield_msg,
|
|
err_ret->filename==NULL ?
|
|
"<string>" : err_ret->filename,
|
|
tok->lineno);
|
|
#endif
|
|
|
|
if ((err_ret->error =
|
|
PyParser_AddToken(ps, (int)type, str, tok->lineno,
|
|
&(err_ret->expected))) != E_OK) {
|
|
if (err_ret->error != E_DONE)
|
|
PyObject_FREE(str);
|
|
break;
|
|
}
|
|
}
|
|
|
|
if (err_ret->error == E_DONE) {
|
|
n = ps->p_tree;
|
|
ps->p_tree = NULL;
|
|
}
|
|
else
|
|
n = NULL;
|
|
|
|
PyParser_Delete(ps);
|
|
|
|
if (n == NULL) {
|
|
if (tok->lineno <= 1 && tok->done == E_EOF)
|
|
err_ret->error = E_EOF;
|
|
err_ret->lineno = tok->lineno;
|
|
err_ret->offset = tok->cur - tok->buf;
|
|
if (tok->buf != NULL) {
|
|
size_t len = tok->inp - tok->buf;
|
|
err_ret->text = (char *) PyObject_MALLOC(len + 1);
|
|
if (err_ret->text != NULL) {
|
|
if (len > 0)
|
|
strncpy(err_ret->text, tok->buf, len);
|
|
err_ret->text[len] = '\0';
|
|
}
|
|
}
|
|
} else if (tok->encoding != NULL) {
|
|
node* r = PyNode_New(encoding_decl);
|
|
r->n_str = tok->encoding;
|
|
r->n_nchildren = 1;
|
|
r->n_child = n;
|
|
tok->encoding = NULL;
|
|
n = r;
|
|
}
|
|
|
|
PyTokenizer_Free(tok);
|
|
|
|
return n;
|
|
}
|
|
|
|
static void
|
|
initerr(perrdetail *err_ret, const char* filename)
|
|
{
|
|
err_ret->error = E_OK;
|
|
err_ret->filename = filename;
|
|
err_ret->lineno = 0;
|
|
err_ret->offset = 0;
|
|
err_ret->text = NULL;
|
|
err_ret->token = -1;
|
|
err_ret->expected = -1;
|
|
}
|