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.

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