2001-02-27 19:07:02 +00:00
|
|
|
#include "Python.h"
|
2005-10-20 19:59:25 +00:00
|
|
|
#include "Python-ast.h"
|
2001-02-27 19:07:02 +00:00
|
|
|
#include "node.h"
|
|
|
|
#include "token.h"
|
|
|
|
#include "graminit.h"
|
2005-10-20 19:59:25 +00:00
|
|
|
#include "code.h"
|
2001-02-27 19:07:02 +00:00
|
|
|
#include "symtable.h"
|
|
|
|
|
|
|
|
#define UNDEFINED_FUTURE_FEATURE "future feature %.100s is not defined"
|
Merged revisions 67028,67040,67044,67046,67052,67065,67070,67077,67082 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r67028 | benjamin.peterson | 2008-10-25 18:27:07 -0500 (Sat, 25 Oct 2008) | 1 line
don't use a catch-all
........
r67040 | armin.rigo | 2008-10-28 12:01:21 -0500 (Tue, 28 Oct 2008) | 5 lines
Fix one of the tests: it relied on being present in an "output test" in
order to actually test what it was supposed to test, i.e. that the code
in the __del__ method did not crash. Use instead the new helper
test_support.captured_output().
........
r67044 | amaury.forgeotdarc | 2008-10-29 18:15:57 -0500 (Wed, 29 Oct 2008) | 3 lines
Correct error message in io.open():
closefd=True is the only accepted value with a file name.
........
r67046 | thomas.heller | 2008-10-30 15:18:13 -0500 (Thu, 30 Oct 2008) | 2 lines
Fixed a modulefinder crash on certain relative imports.
........
r67052 | christian.heimes | 2008-10-30 16:26:15 -0500 (Thu, 30 Oct 2008) | 1 line
Issue #4237: io.FileIO() was raising invalid warnings caused by insufficient initialization of PyFileIOObject struct members.
........
r67065 | benjamin.peterson | 2008-10-30 18:59:18 -0500 (Thu, 30 Oct 2008) | 1 line
move unprefixed error into .c file
........
r67070 | benjamin.peterson | 2008-10-31 15:41:44 -0500 (Fri, 31 Oct 2008) | 1 line
rephrase has_key doc
........
r67077 | benjamin.peterson | 2008-11-03 09:14:51 -0600 (Mon, 03 Nov 2008) | 1 line
#4048 make the parser module accept relative imports as valid
........
r67082 | hirokazu.yamamoto | 2008-11-03 12:03:06 -0600 (Mon, 03 Nov 2008) | 2 lines
Issue #3774: Fixed an error when create a Tkinter menu item without command
and then remove it. Written by Guilherme Polo (gpolo).
........
2008-11-03 20:31:38 +00:00
|
|
|
#define ERR_LATE_FUTURE \
|
|
|
|
"from __future__ imports must occur at the beginning of the file"
|
2001-02-27 19:07:02 +00:00
|
|
|
|
|
|
|
static int
|
2005-10-20 19:59:25 +00:00
|
|
|
future_check_features(PyFutureFeatures *ff, stmt_ty s, const char *filename)
|
2001-02-27 19:07:02 +00:00
|
|
|
{
|
2010-05-09 15:52:27 +00:00
|
|
|
int i;
|
|
|
|
asdl_seq *names;
|
|
|
|
|
|
|
|
assert(s->kind == ImportFrom_kind);
|
|
|
|
|
|
|
|
names = s->v.ImportFrom.names;
|
|
|
|
for (i = 0; i < asdl_seq_LEN(names); i++) {
|
|
|
|
alias_ty name = (alias_ty)asdl_seq_GET(names, i);
|
|
|
|
const char *feature = _PyUnicode_AsString(name->name);
|
|
|
|
if (!feature)
|
|
|
|
return 0;
|
|
|
|
if (strcmp(feature, FUTURE_NESTED_SCOPES) == 0) {
|
|
|
|
continue;
|
|
|
|
} else if (strcmp(feature, FUTURE_GENERATORS) == 0) {
|
|
|
|
continue;
|
|
|
|
} else if (strcmp(feature, FUTURE_DIVISION) == 0) {
|
|
|
|
continue;
|
|
|
|
} else if (strcmp(feature, FUTURE_ABSOLUTE_IMPORT) == 0) {
|
|
|
|
continue;
|
|
|
|
} else if (strcmp(feature, FUTURE_WITH_STATEMENT) == 0) {
|
|
|
|
continue;
|
|
|
|
} else if (strcmp(feature, FUTURE_PRINT_FUNCTION) == 0) {
|
|
|
|
continue;
|
|
|
|
} else if (strcmp(feature, FUTURE_UNICODE_LITERALS) == 0) {
|
|
|
|
continue;
|
|
|
|
} else if (strcmp(feature, FUTURE_BARRY_AS_BDFL) == 0) {
|
|
|
|
ff->ff_features |= CO_FUTURE_BARRY_AS_BDFL;
|
|
|
|
} else if (strcmp(feature, "braces") == 0) {
|
|
|
|
PyErr_SetString(PyExc_SyntaxError,
|
|
|
|
"not a chance");
|
2010-09-20 23:02:10 +00:00
|
|
|
PyErr_SyntaxLocationEx(filename, s->lineno, s->col_offset);
|
2010-05-09 15:52:27 +00:00
|
|
|
return 0;
|
|
|
|
} else {
|
|
|
|
PyErr_Format(PyExc_SyntaxError,
|
|
|
|
UNDEFINED_FUTURE_FEATURE, feature);
|
2010-09-20 23:02:10 +00:00
|
|
|
PyErr_SyntaxLocationEx(filename, s->lineno, s->col_offset);
|
2010-05-09 15:52:27 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return 1;
|
2001-02-27 19:07:02 +00:00
|
|
|
}
|
|
|
|
|
2005-11-13 18:41:28 +00:00
|
|
|
static int
|
2005-10-20 19:59:25 +00:00
|
|
|
future_parse(PyFutureFeatures *ff, mod_ty mod, const char *filename)
|
2001-02-28 01:58:08 +00:00
|
|
|
{
|
2010-05-09 15:52:27 +00:00
|
|
|
int i, found_docstring = 0, done = 0, prev_line = 0;
|
|
|
|
|
|
|
|
static PyObject *future;
|
|
|
|
if (!future) {
|
|
|
|
future = PyUnicode_InternFromString("__future__");
|
|
|
|
if (!future)
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!(mod->kind == Module_kind || mod->kind == Interactive_kind))
|
|
|
|
return 1;
|
|
|
|
|
|
|
|
/* A subsequent pass will detect future imports that don't
|
|
|
|
appear at the beginning of the file. There's one case,
|
|
|
|
however, that is easier to handle here: A series of imports
|
|
|
|
joined by semi-colons, where the first import is a future
|
|
|
|
statement but some subsequent import has the future form
|
|
|
|
but is preceded by a regular import.
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
|
|
for (i = 0; i < asdl_seq_LEN(mod->v.Module.body); i++) {
|
|
|
|
stmt_ty s = (stmt_ty)asdl_seq_GET(mod->v.Module.body, i);
|
|
|
|
|
|
|
|
if (done && s->lineno > prev_line)
|
|
|
|
return 1;
|
|
|
|
prev_line = s->lineno;
|
|
|
|
|
|
|
|
/* The tests below will return from this function unless it is
|
|
|
|
still possible to find a future statement. The only things
|
|
|
|
that can precede a future statement are another future
|
|
|
|
statement and a doc string.
|
|
|
|
*/
|
|
|
|
|
|
|
|
if (s->kind == ImportFrom_kind) {
|
|
|
|
if (s->v.ImportFrom.module == future) {
|
|
|
|
if (done) {
|
|
|
|
PyErr_SetString(PyExc_SyntaxError,
|
|
|
|
ERR_LATE_FUTURE);
|
2010-09-20 23:02:10 +00:00
|
|
|
PyErr_SyntaxLocationEx(filename, s->lineno, s->col_offset);
|
2010-05-09 15:52:27 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
if (!future_check_features(ff, s, filename))
|
|
|
|
return 0;
|
|
|
|
ff->ff_lineno = s->lineno;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
done = 1;
|
|
|
|
}
|
|
|
|
else if (s->kind == Expr_kind && !found_docstring) {
|
|
|
|
expr_ty e = s->v.Expr.value;
|
|
|
|
if (e->kind != Str_kind)
|
|
|
|
done = 1;
|
|
|
|
else
|
|
|
|
found_docstring = 1;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
done = 1;
|
|
|
|
}
|
|
|
|
return 1;
|
2001-02-27 19:07:02 +00:00
|
|
|
}
|
|
|
|
|
2005-10-20 19:59:25 +00:00
|
|
|
|
2001-02-27 19:07:02 +00:00
|
|
|
PyFutureFeatures *
|
2005-10-20 19:59:25 +00:00
|
|
|
PyFuture_FromAST(mod_ty mod, const char *filename)
|
2001-02-27 19:07:02 +00:00
|
|
|
{
|
2010-05-09 15:52:27 +00:00
|
|
|
PyFutureFeatures *ff;
|
|
|
|
|
|
|
|
ff = (PyFutureFeatures *)PyObject_Malloc(sizeof(PyFutureFeatures));
|
|
|
|
if (ff == NULL) {
|
|
|
|
PyErr_NoMemory();
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
ff->ff_features = 0;
|
|
|
|
ff->ff_lineno = -1;
|
|
|
|
|
|
|
|
if (!future_parse(ff, mod, filename)) {
|
|
|
|
PyObject_Free(ff);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
return ff;
|
2001-02-27 19:07:02 +00:00
|
|
|
}
|