Changeset 388 for python/vendor/current/Python/future.c
- Timestamp:
- Mar 19, 2014, 11:11:30 AM (11 years ago)
- File:
-
- 1 edited
-
python/vendor/current/Python/future.c (modified) (3 diffs)
Legend:
- Unmodified
- Added
- Removed
-
python/vendor/current/Python/future.c
r2 r388 9 9 10 10 #define UNDEFINED_FUTURE_FEATURE "future feature %.100s is not defined" 11 #define ERR_LATE_FUTURE \ 12 "from __future__ imports must occur at the beginning of the file" 11 13 12 14 static int 13 15 future_check_features(PyFutureFeatures *ff, stmt_ty s, const char *filename) 14 16 { 15 16 17 int i; 18 asdl_seq *names; 17 19 18 20 assert(s->kind == ImportFrom_kind); 19 21 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 22 names = s->v.ImportFrom.names; 23 for (i = 0; i < asdl_seq_LEN(names); i++) { 24 alias_ty name = (alias_ty)asdl_seq_GET(names, i); 25 const char *feature = PyString_AsString(name->name); 26 if (!feature) 27 return 0; 28 if (strcmp(feature, FUTURE_NESTED_SCOPES) == 0) { 29 continue; 30 } else if (strcmp(feature, FUTURE_GENERATORS) == 0) { 31 continue; 32 } else if (strcmp(feature, FUTURE_DIVISION) == 0) { 33 ff->ff_features |= CO_FUTURE_DIVISION; 34 } else if (strcmp(feature, FUTURE_ABSOLUTE_IMPORT) == 0) { 35 ff->ff_features |= CO_FUTURE_ABSOLUTE_IMPORT; 36 } else if (strcmp(feature, FUTURE_WITH_STATEMENT) == 0) { 37 ff->ff_features |= CO_FUTURE_WITH_STATEMENT; 38 } else if (strcmp(feature, FUTURE_PRINT_FUNCTION) == 0) { 39 ff->ff_features |= CO_FUTURE_PRINT_FUNCTION; 40 } else if (strcmp(feature, FUTURE_UNICODE_LITERALS) == 0) { 41 ff->ff_features |= CO_FUTURE_UNICODE_LITERALS; 42 } else if (strcmp(feature, "braces") == 0) { 43 PyErr_SetString(PyExc_SyntaxError, 44 "not a chance"); 45 PyErr_SyntaxLocation(filename, s->lineno); 46 return 0; 47 } else { 48 PyErr_Format(PyExc_SyntaxError, 49 UNDEFINED_FUTURE_FEATURE, feature); 50 PyErr_SyntaxLocation(filename, s->lineno); 51 return 0; 52 } 53 } 54 return 1; 53 55 } 54 56 … … 56 58 future_parse(PyFutureFeatures *ff, mod_ty mod, const char *filename) 57 59 { 58 60 int i, found_docstring = 0, done = 0, prev_line = 0; 59 61 60 static PyObject *future; 61 if (!future) { 62 future = PyString_InternFromString("__future__"); 63 if (!future) 64 return 0; 65 } 62 if (!(mod->kind == Module_kind || mod->kind == Interactive_kind)) 63 return 1; 66 64 67 if (!(mod->kind == Module_kind || mod->kind == Interactive_kind)) 68 return 1; 65 /* A subsequent pass will detect future imports that don't 66 appear at the beginning of the file. There's one case, 67 however, that is easier to handle here: A series of imports 68 joined by semi-colons, where the first import is a future 69 statement but some subsequent import has the future form 70 but is preceded by a regular import. 71 */ 69 72 70 /* A subsequent pass will detect future imports that don't71 appear at the beginning of the file. There's one case,72 however, that is easier to handle here: A series of imports73 joined by semi-colons, where the first import is a future74 statement but some subsequent import has the future form75 but is preceded by a regular import.76 */77 78 73 79 80 74 for (i = 0; i < asdl_seq_LEN(mod->v.Module.body); i++) { 75 stmt_ty s = (stmt_ty)asdl_seq_GET(mod->v.Module.body, i); 81 76 82 83 84 77 if (done && s->lineno > prev_line) 78 return 1; 79 prev_line = s->lineno; 85 80 86 87 88 89 90 81 /* The tests below will return from this function unless it is 82 still possible to find a future statement. The only things 83 that can precede a future statement are another future 84 statement and a doc string. 85 */ 91 86 92 if (s->kind == ImportFrom_kind) { 93 if (s->v.ImportFrom.module == future) { 94 if (done) { 95 PyErr_SetString(PyExc_SyntaxError, 96 ERR_LATE_FUTURE); 97 PyErr_SyntaxLocation(filename, 98 s->lineno); 99 return 0; 100 } 101 if (!future_check_features(ff, s, filename)) 102 return 0; 103 ff->ff_lineno = s->lineno; 104 } 105 else 106 done = 1; 107 } 108 else if (s->kind == Expr_kind && !found_docstring) { 109 expr_ty e = s->v.Expr.value; 110 if (e->kind != Str_kind) 111 done = 1; 112 else 113 found_docstring = 1; 114 } 115 else 116 done = 1; 117 } 118 return 1; 87 if (s->kind == ImportFrom_kind) { 88 identifier modname = s->v.ImportFrom.module; 89 if (modname && PyString_GET_SIZE(modname) == 10 && 90 !strcmp(PyString_AS_STRING(modname), "__future__")) { 91 if (done) { 92 PyErr_SetString(PyExc_SyntaxError, 93 ERR_LATE_FUTURE); 94 PyErr_SyntaxLocation(filename, 95 s->lineno); 96 return 0; 97 } 98 if (!future_check_features(ff, s, filename)) 99 return 0; 100 ff->ff_lineno = s->lineno; 101 } 102 else 103 done = 1; 104 } 105 else if (s->kind == Expr_kind && !found_docstring) { 106 expr_ty e = s->v.Expr.value; 107 if (e->kind != Str_kind) 108 done = 1; 109 else 110 found_docstring = 1; 111 } 112 else 113 done = 1; 114 } 115 return 1; 119 116 } 120 117 … … 123 120 PyFuture_FromAST(mod_ty mod, const char *filename) 124 121 { 125 122 PyFutureFeatures *ff; 126 123 127 128 129 130 131 132 133 124 ff = (PyFutureFeatures *)PyObject_Malloc(sizeof(PyFutureFeatures)); 125 if (ff == NULL) { 126 PyErr_NoMemory(); 127 return NULL; 128 } 129 ff->ff_features = 0; 130 ff->ff_lineno = -1; 134 131 135 136 137 138 139 132 if (!future_parse(ff, mod, filename)) { 133 PyObject_Free(ff); 134 return NULL; 135 } 136 return ff; 140 137 }
Note:
See TracChangeset
for help on using the changeset viewer.
