You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

156 lines
4.7 KiB

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). ........
18 years ago
14 years ago
  1. #include "Python.h"
  2. #include "Python-ast.h"
  3. #include "token.h"
  4. #include "code.h"
  5. #include "symtable.h"
  6. #include "ast.h"
  7. #define UNDEFINED_FUTURE_FEATURE "future feature %.100s is not defined"
  8. #define ERR_LATE_FUTURE \
  9. "from __future__ imports must occur at the beginning of the file"
  10. static int
  11. future_check_features(PyFutureFeatures *ff, stmt_ty s, PyObject *filename)
  12. {
  13. int i;
  14. asdl_seq *names;
  15. assert(s->kind == ImportFrom_kind);
  16. names = s->v.ImportFrom.names;
  17. for (i = 0; i < asdl_seq_LEN(names); i++) {
  18. alias_ty name = (alias_ty)asdl_seq_GET(names, i);
  19. const char *feature = PyUnicode_AsUTF8(name->name);
  20. if (!feature)
  21. return 0;
  22. if (strcmp(feature, FUTURE_NESTED_SCOPES) == 0) {
  23. continue;
  24. } else if (strcmp(feature, FUTURE_GENERATORS) == 0) {
  25. continue;
  26. } else if (strcmp(feature, FUTURE_DIVISION) == 0) {
  27. continue;
  28. } else if (strcmp(feature, FUTURE_ABSOLUTE_IMPORT) == 0) {
  29. continue;
  30. } else if (strcmp(feature, FUTURE_WITH_STATEMENT) == 0) {
  31. continue;
  32. } else if (strcmp(feature, FUTURE_PRINT_FUNCTION) == 0) {
  33. continue;
  34. } else if (strcmp(feature, FUTURE_UNICODE_LITERALS) == 0) {
  35. continue;
  36. } else if (strcmp(feature, FUTURE_BARRY_AS_BDFL) == 0) {
  37. ff->ff_features |= CO_FUTURE_BARRY_AS_BDFL;
  38. } else if (strcmp(feature, FUTURE_GENERATOR_STOP) == 0) {
  39. continue;
  40. } else if (strcmp(feature, FUTURE_ANNOTATIONS) == 0) {
  41. ff->ff_features |= CO_FUTURE_ANNOTATIONS;
  42. } else if (strcmp(feature, "braces") == 0) {
  43. PyErr_SetString(PyExc_SyntaxError,
  44. "not a chance");
  45. PyErr_SyntaxLocationObject(filename, s->lineno, s->col_offset + 1);
  46. return 0;
  47. } else {
  48. PyErr_Format(PyExc_SyntaxError,
  49. UNDEFINED_FUTURE_FEATURE, feature);
  50. PyErr_SyntaxLocationObject(filename, s->lineno, s->col_offset + 1);
  51. return 0;
  52. }
  53. }
  54. return 1;
  55. }
  56. static int
  57. future_parse(PyFutureFeatures *ff, mod_ty mod, PyObject *filename)
  58. {
  59. int i, done = 0, prev_line = 0;
  60. if (!(mod->kind == Module_kind || mod->kind == Interactive_kind))
  61. return 1;
  62. if (asdl_seq_LEN(mod->v.Module.body) == 0)
  63. return 1;
  64. /* A subsequent pass will detect future imports that don't
  65. appear at the beginning of the file. There's one case,
  66. however, that is easier to handle here: A series of imports
  67. joined by semi-colons, where the first import is a future
  68. statement but some subsequent import has the future form
  69. but is preceded by a regular import.
  70. */
  71. i = 0;
  72. if (_PyAST_GetDocString(mod->v.Module.body) != NULL)
  73. i++;
  74. for (; i < asdl_seq_LEN(mod->v.Module.body); i++) {
  75. stmt_ty s = (stmt_ty)asdl_seq_GET(mod->v.Module.body, i);
  76. if (done && s->lineno > prev_line)
  77. return 1;
  78. prev_line = s->lineno;
  79. /* The tests below will return from this function unless it is
  80. still possible to find a future statement. The only things
  81. that can precede a future statement are another future
  82. statement and a doc string.
  83. */
  84. if (s->kind == ImportFrom_kind) {
  85. identifier modname = s->v.ImportFrom.module;
  86. if (modname &&
  87. _PyUnicode_EqualToASCIIString(modname, "__future__")) {
  88. if (done) {
  89. PyErr_SetString(PyExc_SyntaxError,
  90. ERR_LATE_FUTURE);
  91. PyErr_SyntaxLocationObject(filename, s->lineno, s->col_offset);
  92. return 0;
  93. }
  94. if (!future_check_features(ff, s, filename))
  95. return 0;
  96. ff->ff_lineno = s->lineno;
  97. }
  98. else {
  99. done = 1;
  100. }
  101. }
  102. else {
  103. done = 1;
  104. }
  105. }
  106. return 1;
  107. }
  108. PyFutureFeatures *
  109. PyFuture_FromASTObject(mod_ty mod, PyObject *filename)
  110. {
  111. PyFutureFeatures *ff;
  112. ff = (PyFutureFeatures *)PyObject_Malloc(sizeof(PyFutureFeatures));
  113. if (ff == NULL) {
  114. PyErr_NoMemory();
  115. return NULL;
  116. }
  117. ff->ff_features = 0;
  118. ff->ff_lineno = -1;
  119. if (!future_parse(ff, mod, filename)) {
  120. PyObject_Free(ff);
  121. return NULL;
  122. }
  123. return ff;
  124. }
  125. PyFutureFeatures *
  126. PyFuture_FromAST(mod_ty mod, const char *filename_str)
  127. {
  128. PyFutureFeatures *ff;
  129. PyObject *filename;
  130. filename = PyUnicode_DecodeFSDefault(filename_str);
  131. if (filename == NULL)
  132. return NULL;
  133. ff = PyFuture_FromASTObject(mod, filename);
  134. Py_DECREF(filename);
  135. return ff;
  136. }