traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix SF bug [ #450245 ] Error in parsing future stmts 

Check return value from future_parse() in for loop for file_input to
accomodate multiple future statements on separate lines.

Add several comments explaining how the code works.

Remove out-dated XXX comment.
This commit is contained in:
Jeremy Hylton 2001-08-20 20:32:33 +00:00
parent 07d8d6415f
commit 1e35ce58e8
1 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
Python/future.c
View File

@ -8,6 +8,9 @@
#define UNDEFINED_FUTURE_FEATURE "future feature %.100s is not defined" #define UNDEFINED_FUTURE_FEATURE "future feature %.100s is not defined"
#define FUTURE_IMPORT_STAR "future statement does not support import *" #define FUTURE_IMPORT_STAR "future statement does not support import *"
/* FUTURE_POSSIBLE() is provided to accomodate doc strings, which is
the only statement that can occur before a future statement.
*/
#define FUTURE_POSSIBLE(FF) ((FF)->ff_last_lineno == -1) #define FUTURE_POSSIBLE(FF) ((FF)->ff_last_lineno == -1)
static int static int
@ -57,7 +60,6 @@ future_error(node *n, char *filename)
"from __future__ imports must occur at the " "from __future__ imports must occur at the "
"beginning of the file"); "beginning of the file");
PyErr_SyntaxLocation(filename, n->n_lineno); PyErr_SyntaxLocation(filename, n->n_lineno);
/* XXX set filename and lineno */
} }
/* Relevant portions of the grammar: /* Relevant portions of the grammar:
@ -75,7 +77,12 @@ dotted_as_name: dotted_name [NAME NAME]
dotted_name: NAME ('.' NAME)* dotted_name: NAME ('.' NAME)*
*/ */
/* future_parse() return values: /* future_parse() finds future statements at the beginnning of a
module. The function calls itself recursively, rather than
factoring out logic for different kinds of statements into
different routines.
Return values:
-1 indicates an error occurred, e.g. unknown feature name -1 indicates an error occurred, e.g. unknown feature name
0 indicates no feature was found 0 indicates no feature was found
1 indicates a feature was found 1 indicates a feature was found
@ -97,11 +104,19 @@ future_parse(PyFutureFeatures *ff, node *n, char *filename)
return 0; return 0;
case file_input: case file_input:
/* Check each statement in the file, starting with the
first, and continuing until the first statement
that isn't a future statement.
*/
for (i = 0; i < NCH(n); i++) { for (i = 0; i < NCH(n); i++) {
node *ch = CHILD(n, i); node *ch = CHILD(n, i);
if (TYPE(ch) == stmt) { if (TYPE(ch) == stmt) {
r = future_parse(ff, ch, filename); r = future_parse(ff, ch, filename);
if (!FUTURE_POSSIBLE(ff)) /* Need to check both conditions below
to accomodate doc strings, which
causes r < 0.
*/
if (r < 1 && !FUTURE_POSSIBLE(ff))
return r; return r;
} }
} }