diff options
| author | Jeremy Hylton <jeremy@alum.mit.edu> | 2001-08-10 21:38:04 +0000 |
|---|---|---|
| committer | Jeremy Hylton <jeremy@alum.mit.edu> | 2001-08-10 21:38:04 +0000 |
| commit | fdd12f66bb9740c7796441cd19db2a9d1502ee4f (patch) | |
| tree | a6675b161968ac32289e25c326da4a3b17b18d34 /Include/compile.h | |
| parent | 11ee90289c9bf5cf1752654688a436c8d2b403ab (diff) | |
| download | cpython-git-fdd12f66bb9740c7796441cd19db2a9d1502ee4f.tar.gz | |
Refactor future feature handling
Replace individual slots in PyFutureFeatures with a single bitmask
with one field per feature. The flags for this bitmask are the same
as the flags used in the co_flags slot of a code object.
XXX This means we waste several bits, because they are used
for co_flags but have no meaning for future statements. Don't
think this is an issue.
Remove the NESTED_SCOPES_DEFAULT define and others. Not sure what
they were for anyway.
Remove all the PyCF_xxx flags, but define PyCF_MASK in terms of the
CO_xxx flags that are relevant for this release.
Change definition of PyCompilerFlags so that cf_flags matches
co_flags.
Diffstat (limited to 'Include/compile.h')
| -rw-r--r-- | Include/compile.h | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/Include/compile.h b/Include/compile.h index e5840af8cc..296df90f32 100644 --- a/Include/compile.h +++ b/Include/compile.h @@ -41,7 +41,6 @@ typedef struct { effect, this passes on the "from __future__ import generators" state in effect when the code block was compiled. */ #define CO_GENERATOR_ALLOWED 0x1000 -/* XXX Ditto for future division */ #define CO_FUTURE_DIVISION 0x2000 extern DL_IMPORT(PyTypeObject) PyCode_Type; @@ -64,22 +63,15 @@ DL_IMPORT(int) PyCode_Addr2Line(PyCodeObject *, int); typedef struct { int ff_found_docstring; int ff_last_lineno; - int ff_nested_scopes; - int ff_generators; - int ff_division; + int ff_features; } PyFutureFeatures; DL_IMPORT(PyFutureFeatures *) PyNode_Future(struct _node *, char *); DL_IMPORT(PyCodeObject *) PyNode_CompileFlags(struct _node *, char *, PyCompilerFlags *); -#define NESTED_SCOPES_DEFAULT 1 #define FUTURE_NESTED_SCOPES "nested_scopes" - -#define GENERATORS_DEFAULT 0 #define FUTURE_GENERATORS "generators" - -#define DIVISION_DEFAULT 0 #define FUTURE_DIVISION "division" /* for internal use only */ |