Stowage/cpython
2
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-31 13:41:24 +00:00
Code Issues Projects Releases Packages Wiki Activity

ceval, PyEval_MergeCompilerFlags: wasn't merging in the

Browse source 
CO_FUTURE_DIVISION flag.  Redid this to use Jeremy's PyCF_MASK #define
instead, so we dont have to remember to fiddle individual feature names
here again.

pythonrun.h:  Also #define a PyCF_MASK_OBSOLETE mask.  This isn't used
yet, but will be as part of the PEP 264 implementation (compile() mustn't
raise an error just because old code uses a flag name that's become
obsolete; a warning may be appropriate, but not an error; so compile() has
to know about obsolete flags too, but nobody is going to remember to
update compile() with individual obsolete flag names across releases either
-- i.e., this is the flip side of PyEval_MergeCompilerFlags's oversight).
This commit is contained in:
Tim Peters 2001-08-17 20:47:47 +00:00
parent 9676b22cd7
commit e2c18e90da
2 changed files with 5 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Include/pythonrun.h
View file

@ -8,6 +8,8 @@ extern "C" {
#endif #endif
#define PyCF_MASK (CO_GENERATOR_ALLOWED | CO_FUTURE_DIVISION) #define PyCF_MASK (CO_GENERATOR_ALLOWED | CO_FUTURE_DIVISION)
#define PyCF_MASK_OBSOLETE (CO_NESTED)
typedef struct { typedef struct {
int cf_flags; /* bitmask of CO_xxx flags relevant to future */ int cf_flags; /* bitmask of CO_xxx flags relevant to future */
} PyCompilerFlags; } PyCompilerFlags;

9
Python/ceval.c
View file

@ -2928,13 +2928,10 @@ PyEval_MergeCompilerFlags(PyCompilerFlags *cf)
if (current_frame != NULL) { if (current_frame != NULL) {
const int codeflags = current_frame->f_code->co_flags; const int codeflags = current_frame->f_code->co_flags;
if (codeflags & CO_NESTED) { const int compilerflags = codeflags & PyCF_MASK;
if (compilerflags) {
result = 1; result = 1;
cf->cf_flags |= CO_NESTED; cf->cf_flags |= compilerflags;
}
if (codeflags & CO_GENERATOR_ALLOWED) {
result = 1;
cf->cf_flags |= CO_GENERATOR_ALLOWED;
} }
} }
return result; return result;