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.

109 lines
4.2 KiB

Merged revisions 73376,73393,73398,73400,73404-73405,73409,73419-73421,73432,73457,73460,73485-73486,73488-73489,73501-73502,73513-73514 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r73376 | benjamin.peterson | 2009-06-11 17:29:23 -0500 (Thu, 11 Jun 2009) | 1 line remove check for case handled in sub-function ........ r73393 | alexandre.vassalotti | 2009-06-12 13:56:57 -0500 (Fri, 12 Jun 2009) | 2 lines Clear reference to the static PyExc_RecursionErrorInst in _PyExc_Fini. ........ r73398 | alexandre.vassalotti | 2009-06-12 15:57:12 -0500 (Fri, 12 Jun 2009) | 3 lines Add const qualifier to PyErr_SetFromErrnoWithFilename and to PyErr_SetFromErrnoWithUnicodeFilename. ........ r73400 | alexandre.vassalotti | 2009-06-12 16:43:47 -0500 (Fri, 12 Jun 2009) | 2 lines Delete outdated make file for building the parser with MSVC 6. ........ r73404 | benjamin.peterson | 2009-06-12 20:40:00 -0500 (Fri, 12 Jun 2009) | 1 line keep the slice.step field as NULL if no step expression is given ........ r73405 | benjamin.peterson | 2009-06-12 22:46:30 -0500 (Fri, 12 Jun 2009) | 1 line prevent import statements from assigning to None ........ r73409 | benjamin.peterson | 2009-06-13 08:06:21 -0500 (Sat, 13 Jun 2009) | 1 line allow importing from a module named None if it has an 'as' clause ........ r73419 | benjamin.peterson | 2009-06-13 11:19:19 -0500 (Sat, 13 Jun 2009) | 1 line set Print.values to NULL if there are no values ........ r73420 | benjamin.peterson | 2009-06-13 12:08:53 -0500 (Sat, 13 Jun 2009) | 1 line give a better error message when deleting () ........ r73421 | benjamin.peterson | 2009-06-13 15:23:33 -0500 (Sat, 13 Jun 2009) | 1 line when no module is given in a 'from' relative import, make ImportFrom.module NULL ........ r73432 | amaury.forgeotdarc | 2009-06-14 16:20:40 -0500 (Sun, 14 Jun 2009) | 3 lines #6227: Because of a wrong indentation, the test was not testing what it should. Ensure that the snippet in doctest_aliases actually contains aliases. ........ r73457 | benjamin.peterson | 2009-06-16 18:13:09 -0500 (Tue, 16 Jun 2009) | 1 line add underscores ........ r73460 | benjamin.peterson | 2009-06-16 22:23:04 -0500 (Tue, 16 Jun 2009) | 1 line remove unused 'encoding' member from the compiler struct ........ r73485 | benjamin.peterson | 2009-06-19 17:07:47 -0500 (Fri, 19 Jun 2009) | 1 line remove duplicate test ........ r73486 | benjamin.peterson | 2009-06-19 17:09:17 -0500 (Fri, 19 Jun 2009) | 1 line add missing assertion #6313 ........ r73488 | benjamin.peterson | 2009-06-19 17:16:28 -0500 (Fri, 19 Jun 2009) | 1 line show that this one isn't used ........ r73489 | benjamin.peterson | 2009-06-19 17:21:12 -0500 (Fri, 19 Jun 2009) | 1 line use closures ........ r73501 | benjamin.peterson | 2009-06-21 18:01:07 -0500 (Sun, 21 Jun 2009) | 1 line don't need to add the name 'lambda' as assigned ........ r73502 | benjamin.peterson | 2009-06-21 18:03:36 -0500 (Sun, 21 Jun 2009) | 1 line remove tmpname support since it's no longer used ........ r73513 | benjamin.peterson | 2009-06-22 20:18:57 -0500 (Mon, 22 Jun 2009) | 1 line fix grammar ........ r73514 | benjamin.peterson | 2009-06-22 22:01:56 -0500 (Mon, 22 Jun 2009) | 1 line remove some unused symtable constants ........
17 years ago
25 years ago
  1. #ifndef Py_LIMITED_API
  2. #ifndef Py_SYMTABLE_H
  3. #define Py_SYMTABLE_H
  4. #ifdef __cplusplus
  5. extern "C" {
  6. #endif
  7. /* XXX(ncoghlan): This is a weird mix of public names and interpreter internal
  8. * names.
  9. */
  10. typedef enum _block_type { FunctionBlock, ClassBlock, ModuleBlock }
  11. _Py_block_ty;
  12. struct _symtable_entry;
  13. struct symtable {
  14. const char *st_filename; /* name of file being compiled,
  15. decoded from the filesystem encoding */
  16. struct _symtable_entry *st_cur; /* current symbol table entry */
  17. struct _symtable_entry *st_top; /* symbol table entry for module */
  18. PyObject *st_blocks; /* dict: map AST node addresses
  19. * to symbol table entries */
  20. PyObject *st_stack; /* list: stack of namespace info */
  21. PyObject *st_global; /* borrowed ref to st_top->st_symbols */
  22. int st_nblocks; /* number of blocks used */
  23. PyObject *st_private; /* name of current class or NULL */
  24. PyFutureFeatures *st_future; /* module's future features */
  25. };
  26. typedef struct _symtable_entry {
  27. PyObject_HEAD
  28. PyObject *ste_id; /* int: key in ste_table->st_blocks */
  29. PyObject *ste_symbols; /* dict: variable names to flags */
  30. PyObject *ste_name; /* string: name of current block */
  31. PyObject *ste_varnames; /* list of variable names */
  32. PyObject *ste_children; /* list of child blocks */
  33. _Py_block_ty ste_type; /* module, class, or function */
  34. int ste_unoptimized; /* false if namespace is optimized */
  35. int ste_nested; /* true if block is nested */
  36. unsigned ste_free : 1; /* true if block has free variables */
  37. unsigned ste_child_free : 1; /* true if a child block has free vars,
  38. including free refs to globals */
  39. unsigned ste_generator : 1; /* true if namespace is a generator */
  40. unsigned ste_varargs : 1; /* true if block has varargs */
  41. unsigned ste_varkeywords : 1; /* true if block has varkeywords */
  42. unsigned ste_returns_value : 1; /* true if namespace uses return with
  43. an argument */
  44. int ste_lineno; /* first line of block */
  45. int ste_col_offset; /* offset of first line of block */
  46. int ste_opt_lineno; /* lineno of last exec or import * */
  47. int ste_opt_col_offset; /* offset of last exec or import * */
  48. int ste_tmpname; /* counter for listcomp temp vars */
  49. struct symtable *ste_table;
  50. } PySTEntryObject;
  51. PyAPI_DATA(PyTypeObject) PySTEntry_Type;
  52. #define PySTEntry_Check(op) (Py_TYPE(op) == &PySTEntry_Type)
  53. PyAPI_FUNC(int) PyST_GetScope(PySTEntryObject *, PyObject *);
  54. PyAPI_FUNC(struct symtable *) PySymtable_Build(
  55. mod_ty mod,
  56. const char *filename, /* decoded from the filesystem encoding */
  57. PyFutureFeatures *future);
  58. PyAPI_FUNC(PySTEntryObject *) PySymtable_Lookup(struct symtable *, void *);
  59. PyAPI_FUNC(void) PySymtable_Free(struct symtable *);
  60. /* Flags for def-use information */
  61. #define DEF_GLOBAL 1 /* global stmt */
  62. #define DEF_LOCAL 2 /* assignment in code block */
  63. #define DEF_PARAM 2<<1 /* formal parameter */
  64. #define DEF_NONLOCAL 2<<2 /* nonlocal stmt */
  65. #define USE 2<<3 /* name is used */
  66. #define DEF_FREE 2<<4 /* name used but not defined in nested block */
  67. #define DEF_FREE_CLASS 2<<5 /* free variable from class's method */
  68. #define DEF_IMPORT 2<<6 /* assignment occurred via import */
  69. #define DEF_BOUND (DEF_LOCAL | DEF_PARAM | DEF_IMPORT)
  70. /* GLOBAL_EXPLICIT and GLOBAL_IMPLICIT are used internally by the symbol
  71. table. GLOBAL is returned from PyST_GetScope() for either of them.
  72. It is stored in ste_symbols at bits 12-15.
  73. */
  74. #define SCOPE_OFFSET 11
  75. #define SCOPE_MASK (DEF_GLOBAL | DEF_LOCAL | DEF_PARAM | DEF_NONLOCAL)
  76. #define LOCAL 1
  77. #define GLOBAL_EXPLICIT 2
  78. #define GLOBAL_IMPLICIT 3
  79. #define FREE 4
  80. #define CELL 5
  81. /* The following two names are used for the ste_unoptimized bit field */
  82. #define OPT_IMPORT_STAR 1
  83. #define OPT_TOPLEVEL 2 /* top-level names, including eval and exec */
  84. #define GENERATOR 1
  85. #define GENERATOR_EXPRESSION 2
  86. #ifdef __cplusplus
  87. }
  88. #endif
  89. #endif /* !Py_SYMTABLE_H */
  90. #endif /* Py_LIMITED_API */