@@ -12,62 +12,62 @@ static PyObject *dummy; static dictentry * lookdict_string(dictobject *mp, PyObject *key, long hash); -#define INIT_NONZERO_DICT_SLOTS(mp) do { \ - (mp)->ma_table = (mp)->ma_smalltable; \ - (mp)->ma_mask = PyDict_MINSIZE -1; \ - } while(0) +#define INIT_NONZERO_DICT_SLOTS(mp) do { \ + (mp)->ma_table = (mp)->ma_smalltable; \ + (mp)->ma_mask = PyDict_MINSIZE -1; \ + } while(0) -#define EMPTY_TO_MINSIZE(mp) do { \ - memset((mp)->ma_smalltable, 0, sizeof((mp)->ma_smalltable)); \ - (mp)->ma_used = (mp)->ma_fill = 0; \ - INIT_NONZERO_DICT_SLOTS(mp); \ - } while(0) +#define EMPTY_TO_MINSIZE(mp) do { \ + memset((mp)->ma_smalltable, 0, sizeof((mp)->ma_smalltable)); \ + (mp)->ma_used = (mp)->ma_fill = 0; \ + INIT_NONZERO_DICT_SLOTS(mp); \ + } while(0) PyObject * PyDict_New(void) { - LOG("> PyDict_New\n"); { - - register dictobject *mp; - if (dummy == NULL) { - dummy = PyString_FromString("<dummy key>"); - if (dummy == NULL) - return NULL; - } - mp = PyObject_GC_New(dictobject, &PyDict_Type); - if (mp == NULL) - return NULL; - EMPTY_TO_MINSIZE(mp); - mp->ma_lookup = lookdict_string; - _PyObject_GC_TRACK(mp); - - LOG("< PyDict_New\n"); - return (PyObject *)mp; + LOG("> PyDict_New\n"); { + + register dictobject *mp; + if (dummy == NULL) { + dummy = PyString_FromString("<dummy key>"); + if (dummy == NULL) + return NULL; + } + mp = PyObject_GC_New(dictobject, &PyDict_Type); + if (mp == NULL) + return NULL; + EMPTY_TO_MINSIZE(mp); + mp->ma_lookup = lookdict_string; + _PyObject_GC_TRACK(mp); + + LOG("< PyDict_New\n"); + return (PyObject *)mp; }} static dictentry * lookdict_string(dictobject *mp, PyObject *key, register long hash) { - register int i; - register unsigned int perturb; - register dictentry *freeslot; - register unsigned int mask = mp->ma_mask; - dictentry *ep0 = mp->ma_table; - register dictentry *ep; - - i = hash & mask; - ep = &ep0[i]; - if (ep->me_key == NULL || ep->me_key == key) - return ep; - if (ep->me_key == dummy) - freeslot = ep; - else { - if (ep->me_hash == hash - && _PyString_Eq(ep->me_key, key)) { - return ep; - } - freeslot = NULL; - } + register int i; + register unsigned int perturb; + register dictentry *freeslot; + register unsigned int mask = mp->ma_mask; + dictentry *ep0 = mp->ma_table; + register dictentry *ep; + + i = hash & mask; + ep = &ep0[i]; + if (ep->me_key == NULL || ep->me_key == key) + return ep; + if (ep->me_key == dummy) + freeslot = ep; + else { + if (ep->me_hash == hash + && _PyString_Eq(ep->me_key, key)) { + return ep; + } + freeslot = NULL; + } for (perturb = hash; ; perturb >>= PERTURB_SHIFT) { i = (i << 2) + i + perturb + 1; @@ -87,284 +87,284 @@ lookdict_string(dictobject *mp, PyObject *key, register long hash) static void insertdict(register dictobject *mp, PyObject *key, long hash, PyObject *value) { - PyObject *old_value; - register dictentry *ep; - typedef PyDictEntry *(*lookupfunc)(PyDictObject *, PyObject *, long); - - ep = mp->ma_lookup(mp, key, hash); - if (ep->me_value != NULL) { - old_value = ep->me_value; - ep->me_value = value; - Py_DECREF(old_value); - Py_DECREF(key); - } - else { - if (ep->me_key == NULL) - mp->ma_fill++; - else - Py_DECREF(ep->me_key); - ep->me_key = key; - ep->me_hash = hash; - ep->me_value = value; - mp->ma_used++; - } + PyObject *old_value; + register dictentry *ep; + typedef PyDictEntry *(*lookupfunc)(PyDictObject *, PyObject *, long); + + ep = mp->ma_lookup(mp, key, hash); + if (ep->me_value != NULL) { + old_value = ep->me_value; + ep->me_value = value; + Py_DECREF(old_value); + Py_DECREF(key); + } + else { + if (ep->me_key == NULL) + mp->ma_fill++; + else + Py_DECREF(ep->me_key); + ep->me_key = key; + ep->me_hash = hash; + ep->me_value = value; + mp->ma_used++; + } } static int dictresize(dictobject *mp, int minused) { - int newsize; - dictentry *oldtable, *newtable, *ep; - int i; - int is_oldtable_malloced; - dictentry small_copy[PyDict_MINSIZE]; + int newsize; + dictentry *oldtable, *newtable, *ep; + int i; + int is_oldtable_malloced; + dictentry small_copy[PyDict_MINSIZE]; - for (newsize = PyDict_MINSIZE; + for (newsize = PyDict_MINSIZE; newsize <= minused && newsize > 0; newsize <<= 1) - ; - if (newsize <= 0) { - /* NO MEMORY */ - return -1; - } - - oldtable = mp->ma_table; - is_oldtable_malloced = oldtable != mp->ma_smalltable; - - if (newsize == PyDict_MINSIZE) { - newtable = mp->ma_smalltable; - if (newtable == oldtable) { - if (mp->ma_fill == mp->ma_used) { - return 0; - } - memcpy(small_copy, oldtable, sizeof(small_copy)); - oldtable = small_copy; - } - } - else { - newtable = PyMem_NEW(dictentry, newsize); - if (newtable == NULL) { - /* NO MEMORY */ - return -1; - } - } - - mp->ma_table = newtable; - mp->ma_mask = newsize -1; - memset(newtable, 0, sizeof(dictentry) * newsize); - mp->ma_used = 0; - i = mp->ma_fill; - mp->ma_fill = 0; - - for (ep = oldtable; i > 0; ep++) { - if (ep->me_value != NULL) { - --i; - insertdict(mp, ep->me_key, ep->me_hash, ep->me_value); - } - else if (ep->me_key != NULL) { - --i; - Py_DECREF(ep->me_key); - } - } - - return 0; + ; + if (newsize <= 0) { + /* NO MEMORY */ + return -1; + } + + oldtable = mp->ma_table; + is_oldtable_malloced = oldtable != mp->ma_smalltable; + + if (newsize == PyDict_MINSIZE) { + newtable = mp->ma_smalltable; + if (newtable == oldtable) { + if (mp->ma_fill == mp->ma_used) { + return 0; + } + memcpy(small_copy, oldtable, sizeof(small_copy)); + oldtable = small_copy; + } + } + else { + newtable = PyMem_NEW(dictentry, newsize); + if (newtable == NULL) { + /* NO MEMORY */ + return -1; + } + } + + mp->ma_table = newtable; + mp->ma_mask = newsize -1; + memset(newtable, 0, sizeof(dictentry) * newsize); + mp->ma_used = 0; + i = mp->ma_fill; + mp->ma_fill = 0; + + for (ep = oldtable; i > 0; ep++) { + if (ep->me_value != NULL) { + --i; + insertdict(mp, ep->me_key, ep->me_hash, ep->me_value); + } + else if (ep->me_key != NULL) { + --i; + Py_DECREF(ep->me_key); + } + } + + return 0; } PyObject * PyDict_GetItem(PyObject *op, PyObject *key) { - long hash; - dictobject *mp = (dictobject *)op; - if (!PyDict_Check(op)) { - return NULL; - } - if (!PyString_CheckExact(key) || - (hash = ((PyStringObject *) key)->ob_shash) == -1) - { - hash = PyObject_Hash(key); - if (hash == -1) { - return NULL; - } - } - { PyObject *ret = (mp->ma_lookup)(mp, key, hash)->me_value; - return ret; } + long hash; + dictobject *mp = (dictobject *)op; + if (!PyDict_Check(op)) { + return NULL; + } + if (!PyString_CheckExact(key) || + (hash = ((PyStringObject *) key)->ob_shash) == -1) + { + hash = PyObject_Hash(key); + if (hash == -1) { + return NULL; + } + } + { PyObject *ret = (mp->ma_lookup)(mp, key, hash)->me_value; + return ret; } } int PyDict_SetItem(register PyObject *op, PyObject *key, PyObject *value) { - register dictobject *mp; - register long hash; - register int n_used; - - if (!PyDict_Check(op)) { - /* ERROR */ - return -1; - } - mp = (dictobject *)op; - if (PyString_CheckExact(key)) { - hash = ((PyStringObject *)key)->ob_shash; - if (hash == -1) - hash = PyObject_Hash(key); - } - else { - hash = PyObject_Hash(key); - if (hash == -1) - return -1; - } - n_used = mp->ma_used; - Py_INCREF(value); - Py_INCREF(key); - insertdict(mp, key, hash, value); - if (!(mp->ma_used > n_used && mp->ma_fill*3 >= (mp->ma_mask+1)*2)) - return 0; - return dictresize(mp, mp->ma_used*(mp->ma_used>50000 ? 2 : 4)); + register dictobject *mp; + register long hash; + register int n_used; + + if (!PyDict_Check(op)) { + /* ERROR */ + return -1; + } + mp = (dictobject *)op; + if (PyString_CheckExact(key)) { + hash = ((PyStringObject *)key)->ob_shash; + if (hash == -1) + hash = PyObject_Hash(key); + } + else { + hash = PyObject_Hash(key); + if (hash == -1) + return -1; + } + n_used = mp->ma_used; + Py_INCREF(value); + Py_INCREF(key); + insertdict(mp, key, hash, value); + if (!(mp->ma_used > n_used && mp->ma_fill*3 >= (mp->ma_mask+1)*2)) + return 0; + return dictresize(mp, mp->ma_used*(mp->ma_used>50000 ? 2 : 4)); } int PyDict_DelItem(PyObject *op, PyObject *key) { - register dictobject *mp; - register long hash; - register dictentry *ep; - PyObject *old_value, *old_key; - - if (!PyDict_Check(op)) { - /* ERROR */ - return -1; - } - if (!PyString_CheckExact(key) || - (hash = ((PyStringObject *) key)->ob_shash) == -1) { - hash = PyObject_Hash(key); - if (hash == -1) - return -1; - } - mp = (dictobject *)op; - ep = (mp->ma_lookup)(mp, key, hash); - if (ep->me_value == NULL) { - /* ERROR */ - return -1; - } - old_key = ep->me_key; - Py_INCREF(dummy); - ep->me_key = dummy; - old_value = ep->me_value; - ep->me_value = NULL; - mp->ma_used--; - Py_DECREF(old_value); - Py_DECREF(old_key); - return 0; + register dictobject *mp; + register long hash; + register dictentry *ep; + PyObject *old_value, *old_key; + + if (!PyDict_Check(op)) { + /* ERROR */ + return -1; + } + if (!PyString_CheckExact(key) || + (hash = ((PyStringObject *) key)->ob_shash) == -1) { + hash = PyObject_Hash(key); + if (hash == -1) + return -1; + } + mp = (dictobject *)op; + ep = (mp->ma_lookup)(mp, key, hash); + if (ep->me_value == NULL) { + /* ERROR */ + return -1; + } + old_key = ep->me_key; + Py_INCREF(dummy); + ep->me_key = dummy; + old_value = ep->me_value; + ep->me_value = NULL; + mp->ma_used--; + Py_DECREF(old_value); + Py_DECREF(old_key); + return 0; } PyTypeObject PyDict_Type = { - PyObject_HEAD_INIT(&PyType_Type) - 0, - "dict", - sizeof(dictobject), - 0, - 0, //(destructor)dict_dealloc, /* tp_dealloc */ - 0, //(printfunc)dict_print, /* tp_print */ - 0, /* tp_getattr */ - 0, /* tp_setattr */ - 0, //(cmpfunc)dict_compare, /* tp_compare */ - 0, //(reprfunc)dict_repr, /* tp_repr */ - 0, /* tp_as_number */ - 0, //&dict_as_sequence, /* tp_as_sequence */ - 0, //&dict_as_mapping, /* tp_as_mapping */ - 0, //dict_nohash, /* tp_hash */ - 0, /* tp_call */ - 0, /* tp_str */ - PyObject_GenericGetAttr, /* tp_getattro */ - 0, /* tp_setattro */ - 0, /* tp_as_buffer */ - Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_GC | Py_TPFLAGS_BASETYPE, /* tp_flags */ - 0, //dictionary_doc, /* tp_doc */ - 0, //(traverseproc)dict_traverse, /* tp_traverse */ - 0, //(inquiry)dict_tp_clear, /* tp_clear */ - 0, //dict_richcompare, /* tp_richcompare */ - 0, /* tp_weaklistoffset */ - 0, //(getiterfunc)dict_iter, /* tp_iter */ - 0, /* tp_iternext */ - 0, //mapp_methods, /* tp_methods */ - 0, /* tp_members */ - 0, /* tp_getset */ - 0, /* tp_base */ - 0, /* tp_dict */ - 0, /* tp_descr_get */ - 0, /* tp_descr_set */ - 0, /* tp_dictoffset */ - 0, //(initproc)dict_init, /* tp_init */ - 0, //PyType_GenericAlloc, /* tp_alloc */ - 0, //dict_new, /* tp_new */ - 0, //PyObject_GC_Del, /* tp_free */ + PyObject_HEAD_INIT(&PyType_Type) + 0, + "dict", + sizeof(dictobject), + 0, + 0, //(destructor)dict_dealloc, /* tp_dealloc */ + 0, //(printfunc)dict_print, /* tp_print */ + 0, /* tp_getattr */ + 0, /* tp_setattr */ + 0, //(cmpfunc)dict_compare, /* tp_compare */ + 0, //(reprfunc)dict_repr, /* tp_repr */ + 0, /* tp_as_number */ + 0, //&dict_as_sequence, /* tp_as_sequence */ + 0, //&dict_as_mapping, /* tp_as_mapping */ + 0, //dict_nohash, /* tp_hash */ + 0, /* tp_call */ + 0, /* tp_str */ + PyObject_GenericGetAttr, /* tp_getattro */ + 0, /* tp_setattro */ + 0, /* tp_as_buffer */ + Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_GC | Py_TPFLAGS_BASETYPE, /* tp_flags */ + 0, //dictionary_doc, /* tp_doc */ + 0, //(traverseproc)dict_traverse, /* tp_traverse */ + 0, //(inquiry)dict_tp_clear, /* tp_clear */ + 0, //dict_richcompare, /* tp_richcompare */ + 0, /* tp_weaklistoffset */ + 0, //(getiterfunc)dict_iter, /* tp_iter */ + 0, /* tp_iternext */ + 0, //mapp_methods, /* tp_methods */ + 0, /* tp_members */ + 0, /* tp_getset */ + 0, /* tp_base */ + 0, /* tp_dict */ + 0, /* tp_descr_get */ + 0, /* tp_descr_set */ + 0, /* tp_dictoffset */ + 0, //(initproc)dict_init, /* tp_init */ + 0, //PyType_GenericAlloc, /* tp_alloc */ + 0, //dict_new, /* tp_new */ + 0, //PyObject_GC_Del, /* tp_free */ }; PyObject * PyDict_GetItemString(PyObject *v, const char *key) { - LOG("> PyDict_GetItemString\n"); { - PyObject *kv, *rv; - kv = PyString_FromString(key); - if (kv == NULL) - return NULL; - rv = PyDict_GetItem(v, kv); - Py_DECREF(kv); - LOG("< PyDict_GetItemString\n"); - return rv; + LOG("> PyDict_GetItemString\n"); { + PyObject *kv, *rv; + kv = PyString_FromString(key); + if (kv == NULL) + return NULL; + rv = PyDict_GetItem(v, kv); + Py_DECREF(kv); + LOG("< PyDict_GetItemString\n"); + return rv; }} int PyDict_SetItemString(PyObject *v, const char *key, PyObject *item) { - PyObject *kv; - int err; - kv = PyString_FromString(key); - if (kv == NULL) - return -1; - PyString_InternInPlace(&kv); - err = PyDict_SetItem(v, kv, item); - Py_DECREF(kv); - return err; + PyObject *kv; + int err; + kv = PyString_FromString(key); + if (kv == NULL) + return -1; + PyString_InternInPlace(&kv); + err = PyDict_SetItem(v, kv, item); + Py_DECREF(kv); + return err; } PyObject * PyDict_Copy(PyObject *o) { - register dictobject *mp; - register int i; - dictobject *copy; - dictentry *entry; - - if (o == NULL || !PyDict_Check(o)) { - /* ERROR */ - return NULL; - } - mp = (dictobject *)o; - copy = (dictobject *)PyDict_New(); - if (copy == NULL) - return NULL; - if (mp->ma_used > 0) { - if (dictresize(copy, mp->ma_used*2) != 0) - return NULL; - for (i = 0; i <= mp->ma_mask; i++) { - entry = &mp->ma_table[i]; - if (entry->me_value != NULL) { - Py_INCREF(entry->me_key); - Py_INCREF(entry->me_value); - insertdict(copy, entry->me_key, entry->me_hash, - entry->me_value); - } - } - } - return (PyObject *)copy; + register dictobject *mp; + register int i; + dictobject *copy; + dictentry *entry; + + if (o == NULL || !PyDict_Check(o)) { + /* ERROR */ + return NULL; + } + mp = (dictobject *)o; + copy = (dictobject *)PyDict_New(); + if (copy == NULL) + return NULL; + if (mp->ma_used > 0) { + if (dictresize(copy, mp->ma_used*2) != 0) + return NULL; + for (i = 0; i <= mp->ma_mask; i++) { + entry = &mp->ma_table[i]; + if (entry->me_value != NULL) { + Py_INCREF(entry->me_key); + Py_INCREF(entry->me_value); + insertdict(copy, entry->me_key, entry->me_hash, + entry->me_value); + } + } + } + return (PyObject *)copy; } int PyDict_Size(PyObject *mp) { - if (mp == NULL || !PyDict_Check(mp)) { - /* ERROR */ - return 0; - } - return ((dictobject *)mp)->ma_used; + if (mp == NULL || !PyDict_Check(mp)) { + /* ERROR */ + return 0; + } + return ((dictobject *)mp)->ma_used; } echo/python/Objects/dictobject.c @@ -7,160 +7,160 @@ static PyFrameObject *free_list = NULL; PyTypeObject PyFrame_Type = { - PyObject_HEAD_INIT(&PyType_Type) - 0, - "frame", - sizeof(PyFrameObject), - sizeof(PyObject *), - 0, //(destructor)frame_dealloc, /* tp_dealloc */ - 0, /* tp_print */ - 0, /* tp_getattr */ - 0, /* tp_setattr */ - 0, /* tp_compare */ - 0, /* tp_repr */ - 0, /* tp_as_number */ - 0, /* tp_as_sequence */ - 0, /* tp_as_mapping */ - 0, /* tp_hash */ - 0, /* tp_call */ - 0, /* tp_str */ - PyObject_GenericGetAttr, /* tp_getattro */ - 0, //PyObject_GenericSetAttr, /* tp_setattro */ - 0, /* tp_as_buffer */ - Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_GC,/* tp_flags */ - 0, /* tp_doc */ - 0, //(traverseproc)frame_traverse, /* tp_traverse */ - 0, //(inquiry)frame_clear, /* tp_clear */ - 0, /* tp_richcompare */ - 0, /* tp_weaklistoffset */ - 0, /* tp_iter */ - 0, /* tp_iternext */ - 0, /* tp_methods */ - 0, //frame_memberlist, /* tp_members */ - 0, //frame_getsetlist, /* tp_getset */ - 0, /* tp_base */ - 0, /* tp_dict */ + PyObject_HEAD_INIT(&PyType_Type) + 0, + "frame", + sizeof(PyFrameObject), + sizeof(PyObject *), + 0, //(destructor)frame_dealloc, /* tp_dealloc */ + 0, /* tp_print */ + 0, /* tp_getattr */ + 0, /* tp_setattr */ + 0, /* tp_compare */ + 0, /* tp_repr */ + 0, /* tp_as_number */ + 0, /* tp_as_sequence */ + 0, /* tp_as_mapping */ + 0, /* tp_hash */ + 0, /* tp_call */ + 0, /* tp_str */ + PyObject_GenericGetAttr, /* tp_getattro */ + 0, //PyObject_GenericSetAttr, /* tp_setattro */ + 0, /* tp_as_buffer */ + Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_GC,/* tp_flags */ + 0, /* tp_doc */ + 0, //(traverseproc)frame_traverse, /* tp_traverse */ + 0, //(inquiry)frame_clear, /* tp_clear */ + 0, /* tp_richcompare */ + 0, /* tp_weaklistoffset */ + 0, /* tp_iter */ + 0, /* tp_iternext */ + 0, /* tp_methods */ + 0, //frame_memberlist, /* tp_members */ + 0, //frame_getsetlist, /* tp_getset */ + 0, /* tp_base */ + 0, /* tp_dict */ }; static PyObject *builtin_object; int _PyFrame_Init() { - void *builtin_object = PyString_InternFromString("__builtins__"); - return (builtin_object != NULL); + void *builtin_object = PyString_InternFromString("__builtins__"); + return (builtin_object != NULL); } PyFrameObject * PyFrame_New(PyThreadState *tstate, PyCodeObject *code, PyObject *globals, - PyObject *locals) + PyObject *locals) { - LOG("> PyFrame_New\n"); { - PyFrameObject *back = tstate->frame; - PyFrameObject *f; - PyObject *builtins; - int extras, ncells, nfrees; - ncells = PyTuple_GET_SIZE(code->co_cellvars); - nfrees = PyTuple_GET_SIZE(code->co_freevars); - extras = code->co_stacksize + code->co_nlocals + ncells + nfrees; - - if (back == NULL || back->f_globals != globals) { - - /* JKT: how did builtin_object get to be NULL again!?!? */ - if (builtin_object == NULL) - builtin_object = PyString_InternFromString("__builtins__"); - - builtins = PyDict_GetItem(globals, builtin_object); - if (builtins) { - if (PyModule_Check(builtins)) { - builtins = PyModule_GetDict(builtins); - } - else if (!PyDict_Check(builtins)) - builtins = NULL; - } - if (builtins == NULL) { - /* No builtins! Make up a minimal one - Give them 'None', at least. */ - builtins = PyDict_New(); - if (builtins == NULL || - PyDict_SetItemString( - builtins, "None", Py_None) < 0) - return NULL; - } - else - Py_INCREF(builtins); - - } - else { - /* If we share the globals, we share the builtins. - Save a lookup and a call. */ - builtins = back->f_builtins; - Py_INCREF(builtins); - } - - if (free_list == NULL) { - f = PyObject_GC_NewVar(PyFrameObject, &PyFrame_Type, extras); - if (f == NULL) - return NULL; - } - else { - /* NOT IMPLEMENTED */ - } - - f->f_builtins = builtins; - Py_XINCREF(back); - f->f_back = back; - Py_INCREF(code); - f->f_code = code; - Py_INCREF(globals); - f->f_globals = globals; - - /* Most functions have CO_NEWLOCALS and CO_OPTIMIZED set. */ - if ((code->co_flags & (CO_NEWLOCALS | CO_OPTIMIZED)) == - (CO_NEWLOCALS | CO_OPTIMIZED)) - locals = NULL; /* PyFrame_Fast2Locals() will set. */ - else if (code->co_flags & CO_NEWLOCALS) { - locals = PyDict_New(); - if (locals == NULL) { - Py_DECREF(f); - return NULL; - } - } - else { - if (locals == NULL) - locals = globals; - Py_INCREF(locals); - } - - f->f_locals = locals; - f->f_trace = NULL; - f->f_exc_type = f->f_exc_value = f->f_exc_traceback = NULL; - f->f_tstate = tstate; - - f->f_lasti = -1; - f->f_lineno = code->co_firstlineno; - f->f_restricted = (builtins != tstate->interp->builtins); - f->f_iblock = 0; - f->f_nlocals = code->co_nlocals; - f->f_stacksize = code->co_stacksize; - f->f_ncells = ncells; - f->f_nfreevars = nfrees; - - extras = f->f_nlocals + ncells + nfrees; - memset(f->f_localsplus, 0, extras * sizeof(f->f_localsplus[0])); - - f->f_valuestack = f->f_localsplus + extras; - f->f_stacktop = f->f_valuestack; - - _PyObject_GC_TRACK(f); - - LOG("< PyFrame_New\n"); - return f; + LOG("> PyFrame_New\n"); { + PyFrameObject *back = tstate->frame; + PyFrameObject *f; + PyObject *builtins; + int extras, ncells, nfrees; + ncells = PyTuple_GET_SIZE(code->co_cellvars); + nfrees = PyTuple_GET_SIZE(code->co_freevars); + extras = code->co_stacksize + code->co_nlocals + ncells + nfrees; + + if (back == NULL || back->f_globals != globals) { + + /* JKT: how did builtin_object get to be NULL again!?!? */ + if (builtin_object == NULL) + builtin_object = PyString_InternFromString("__builtins__"); + + builtins = PyDict_GetItem(globals, builtin_object); + if (builtins) { + if (PyModule_Check(builtins)) { + builtins = PyModule_GetDict(builtins); + } + else if (!PyDict_Check(builtins)) + builtins = NULL; + } + if (builtins == NULL) { + /* No builtins! Make up a minimal one + Give them 'None', at least. */ + builtins = PyDict_New(); + if (builtins == NULL || + PyDict_SetItemString( + builtins, "None", Py_None) < 0) + return NULL; + } + else + Py_INCREF(builtins); + + } + else { + /* If we share the globals, we share the builtins. + Save a lookup and a call. */ + builtins = back->f_builtins; + Py_INCREF(builtins); + } + + if (free_list == NULL) { + f = PyObject_GC_NewVar(PyFrameObject, &PyFrame_Type, extras); + if (f == NULL) + return NULL; + } + else { + /* NOT IMPLEMENTED */ + } + + f->f_builtins = builtins; + Py_XINCREF(back); + f->f_back = back; + Py_INCREF(code); + f->f_code = code; + Py_INCREF(globals); + f->f_globals = globals; + + /* Most functions have CO_NEWLOCALS and CO_OPTIMIZED set. */ + if ((code->co_flags & (CO_NEWLOCALS | CO_OPTIMIZED)) == + (CO_NEWLOCALS | CO_OPTIMIZED)) + locals = NULL; /* PyFrame_Fast2Locals() will set. */ + else if (code->co_flags & CO_NEWLOCALS) { + locals = PyDict_New(); + if (locals == NULL) { + Py_DECREF(f); + return NULL; + } + } + else { + if (locals == NULL) + locals = globals; + Py_INCREF(locals); + } + + f->f_locals = locals; + f->f_trace = NULL; + f->f_exc_type = f->f_exc_value = f->f_exc_traceback = NULL; + f->f_tstate = tstate; + + f->f_lasti = -1; + f->f_lineno = code->co_firstlineno; + f->f_restricted = (builtins != tstate->interp->builtins); + f->f_iblock = 0; + f->f_nlocals = code->co_nlocals; + f->f_stacksize = code->co_stacksize; + f->f_ncells = ncells; + f->f_nfreevars = nfrees; + + extras = f->f_nlocals + ncells + nfrees; + memset(f->f_localsplus, 0, extras * sizeof(f->f_localsplus[0])); + + f->f_valuestack = f->f_localsplus + extras; + f->f_stacktop = f->f_valuestack; + + _PyObject_GC_TRACK(f); + + LOG("< PyFrame_New\n"); + return f; }} void PyFrame_Fini(void) { - /* TO DO */ + /* TO DO */ } /* Block management */ @@ -168,21 +168,21 @@ PyFrame_Fini(void) void PyFrame_BlockSetup(PyFrameObject *f, int type, int handler, int level) { - PyTryBlock *b; - if (f->f_iblock >= CO_MAXBLOCKS) - Py_FatalError("XXX block stack overflow"); - b = &f->f_blockstack[f->f_iblock++]; - b->b_type = type; - b->b_level = level; - b->b_handler = handler; + PyTryBlock *b; + if (f->f_iblock >= CO_MAXBLOCKS) + Py_FatalError("XXX block stack overflow"); + b = &f->f_blockstack[f->f_iblock++]; + b->b_type = type; + b->b_level = level; + b->b_handler = handler; } PyTryBlock * PyFrame_BlockPop(PyFrameObject *f) { - PyTryBlock *b; - if (f->f_iblock <= 0) - Py_FatalError("XXX block stack underflow"); - b = &f->f_blockstack[--f->f_iblock]; - return b; + PyTryBlock *b; + if (f->f_iblock <= 0) + Py_FatalError("XXX block stack underflow"); + b = &f->f_blockstack[--f->f_iblock]; + return b; } echo/python/Objects/frameobject.c @@ -5,77 +5,78 @@ static int initialized = 0; void Py_Initialize(void) { - printf("Initializing\n"); - - LOG("> Py_Initialize\n"); { - - PyInterpreterState *interp; - PyThreadState *tstate; - PyObject *bimod; - extern void _Py_ReadyTypes(void); - - if (initialized) - return; - initialized = 1; - - interp = PyInterpreterState_New(); - - if (interp == NULL) - Py_FatalError("Py_Initialize: can't make first interpreter"); - - tstate = PyThreadState_New(interp); - - if (tstate == NULL) - Py_FatalError("Py_Initialize: can't make first thread"); - - (void) PyThreadState_Swap(tstate); - - _Py_ReadyTypes(); - - if (!_PyFrame_Init()) - Py_FatalError("Py_Initialize: can't init frames"); - - if (!_PyInt_Init()) - Py_FatalError("Py_Initialize: can't init ints"); - - interp->modules = PyDict_New(); - if (interp->modules == NULL) - Py_FatalError("Py_Initialize: can't make modules dictionary"); - - bimod = _PyBuiltin_Init(); - if (bimod == NULL) - Py_FatalError("Py_Initialize: can't initialize __builtin__"); - interp->builtins = PyModule_GetDict(bimod); - Py_INCREF(interp->builtins); - - LOG("< Py_Initialize\n"); + printf("Initializing\n"); + + LOG("> Py_Initialize\n"); { + + PyInterpreterState *interp; + PyThreadState *tstate; + PyObject *bimod; + extern void _Py_ReadyTypes(void); + + if (initialized) + return; + initialized = 1; + + interp = PyInterpreterState_New(); + + if (interp == NULL) + Py_FatalError("Py_Initialize: can't make first interpreter"); + + tstate = PyThreadState_New(interp); + + if (tstate == NULL) + Py_FatalError("Py_Initialize: can't make first thread"); + + (void) PyThreadState_Swap(tstate); + + _Py_ReadyTypes(); + + if (!_PyFrame_Init()) + Py_FatalError("Py_Initialize: can't init frames"); + + if (!_PyInt_Init()) + Py_FatalError("Py_Initialize: can't init ints"); + + interp->modules = PyDict_New(); + if (interp->modules == NULL) + Py_FatalError("Py_Initialize: can't make modules dictionary"); + + bimod = _PyBuiltin_Init(); + if (bimod == NULL) + Py_FatalError("Py_Initialize: can't initialize __builtin__"); + + interp->builtins = PyModule_GetDict(bimod); + Py_INCREF(interp->builtins); + + LOG("< Py_Initialize\n"); }} void Py_Finalize(void) { - LOG("> Py_Finalize\n"); { - PyInterpreterState *interp; - PyThreadState *tstate; - - initialized = 0; - - tstate = PyThreadState_Get(); - interp = tstate->interp; - - PyInterpreterState_Clear(interp); - - PyThreadState_Swap(NULL); - PyInterpreterState_Delete(interp); - - PyFrame_Fini(); - PyInt_Fini(); - LOG("< Py_Finalize\n"); + LOG("> Py_Finalize\n"); { + PyInterpreterState *interp; + PyThreadState *tstate; + + initialized = 0; + + tstate = PyThreadState_Get(); + interp = tstate->interp; + + PyInterpreterState_Clear(interp); + + PyThreadState_Swap(NULL); + PyInterpreterState_Delete(interp); + + PyFrame_Fini(); + PyInt_Fini(); + LOG("< Py_Finalize\n"); }} void Py_FatalError(const char *msg) { - printf("FATAL ERROR: %s\n", msg); - while (1) {} + printf("FATAL ERROR: %s\n", msg); + while (1) {} } echo/python/Python/pythonrun.c 2750df62d20e4698d6fdee2143e91df2b1058683 James Tauber jtauber@jtauber.com http://github.com/jtauber/cleese/commit/005adc3959224ff39d826f3a7a7800ba9ed30a85 005adc3959224ff39d826f3a7a7800ba9ed30a85 2009-10-11T13:15:05-07:00 2009-10-11T13:15:05-07:00 tabs to spaces c9b4c430caa6f901910f119302d1f16fc5265514 James Tauber jtauber@jtauber.com