GeezerVison

The World Wide Web, restored to 800 pixels of glory.

GeezerVison is showing github.com — Moved add_overload functionality to function::add_to_namespace · ssam18/python@f7a5e6d

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

src
- module.cpp
- object
  - function.cpp

Expand file treeCollapse file tree

Open diff view settings

Collapse file

`‎src/module.cpp‎`

Copy file name to clipboardExpand all lines: src/module.cpp

+3-20Lines changed: 3 additions & 20 deletions

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,6 @@`
`7`	`7`	`// producing this work.`
`8`	`8`
`9`	`9`	`#include <boost/python/module.hpp>`
`10`		`-#include <boost/python/errors.hpp>`
`11`	`10`
`12`	`11`	`namespace boost { namespace python {`
`13`	`12`
`@@ -47,32 +46,16 @@ void module_base::add(PyObject* x, const char* name)`
`47`	`46`
`48`	`47`	`void module_base::add(ref x, const char* name)`
`49`	`48`	`{`
`50`		`- ref f(x); // First take possession of the object.`
`51`		`- if (PyObject_SetAttrString(m_module, const_cast<char*>(name), x.get()) < 0)`
`52`		`- throw error_already_set();`
	`49`	`+ // Use function::add_to_namespace to achieve overloading if`
	`50`	`+ // appropriate.`
	`51`	`+ objects::function::add_to_namespace(m_module, name, x.get());`
`53`	`52`	`}`
`54`	`53`
`55`	`54`	`void module_base::add(PyTypeObject* x, const char* name /= 0/)`
`56`	`55`	`{`
`57`	`56`	`this->add((PyObject*)x, name ? name : x->tp_name);`
`58`	`57`	`}`
`59`	`58`
`60`		`-void module_base::add_overload(objects::function* x, const char* name)`
`61`		`-{`
`62`		`- PyObject* existing = PyObject_HasAttrString(m_module, const_cast<char*>(name))`
`63`		`- ? PyObject_GetAttrString(m_module, const_cast<char*>(name))`
`64`		`- : 0;`
`65`		`-`
`66`		`- if (existing != 0 && existing->ob_type == &objects::function_type)`
`67`		`- {`
`68`		`- static_cast<objects::function*>(existing)->add_overload(x);`
`69`		`- }`
`70`		`- else`
`71`		`- {`
`72`		`- add(x, name);`
`73`		`- }`
`74`		`-}`
`75`		`-`
`76`	`59`	`PyMethodDef module_base::initial_methods[] = { { 0, 0, 0, 0 } };`
`77`	`60`
`78`	`61`	`}} // namespace boost::python`

Collapse file

`‎src/object/function.cpp‎`

Copy file name to clipboardExpand all lines: src/object/function.cpp

+41-1Lines changed: 41 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,8 @@`
`6`	`6`
`7`	`7`	`#include <boost/python/object/function.hpp>`
`8`	`8`	`#include <numeric>`
	`9`	`+#include <boost/python/errors.hpp>`
	`10`	`+#include <boost/python/objects.hpp>`
`9`	`11`
`10`	`12`	`namespace boost { namespace python { namespace objects {`
`11`	`13`
`@@ -28,7 +30,7 @@ function::~function()`
`28`	`30`
`29`	`31`	`PyObject* function::call(PyObject* args, PyObject* keywords) const`
`30`	`32`	`{`
`31`		`- int nargs = PyTuple_GET_SIZE(args);`
	`33`	`+ std::size_t nargs = PyTuple_GET_SIZE(args);`
`32`	`34`	`function const* f = this;`
`33`	`35`	`do`
`34`	`36`	`{`
`@@ -63,6 +65,8 @@ void function::argument_error(PyObject* args, PyObject* keywords) const`
`63`	`65`
`64`	`66`	`void function::add_overload(function* overload)`
`65`	`67`	`{`
	`68`	`+ Py_XINCREF(overload);`
	`69`	`+`
`66`	`70`	`function* parent = this;`
`67`	`71`
`68`	`72`	`while (parent->m_overloads != 0)`
`@@ -72,6 +76,42 @@ void function::add_overload(function* overload)`
`72`	`76`	`parent->m_overloads = overload;`
`73`	`77`	`}`
`74`	`78`
	`79`	`+void function::add_to_namespace(`
	`80`	`+ PyObject* name_space, char const* name_, PyObject* attribute_)`
	`81`	`+{`
	`82`	`+ ref attribute(attribute_, ref::increment_count);`
	`83`	`+ string name(name_);`
	`84`	`+`
	`85`	`+ if (attribute_->ob_type == &function_type)`
	`86`	`+ {`
	`87`	`+ PyObject* dict = 0;`
	`88`	`+`
	`89`	`+ if (PyClass_Check(name_space))`
	`90`	`+ dict = ((PyClassObject*)name_space)->cl_dict;`
	`91`	`+ else if (PyType_Check(name_space))`
	`92`	`+ dict = ((PyTypeObject*)name_space)->tp_dict;`
	`93`	`+ else`
	`94`	`+ dict = PyObject_GetAttrString(name_space, "__dict__");`
	`95`	`+`
	`96`	`+ if (dict == 0)`
	`97`	`+ throw error_already_set();`
	`98`	`+`
	`99`	`+ ref existing(PyObject_GetItem(dict, name.get()), ref::null_ok);`
	`100`	`+`
	`101`	`+ if (existing.get() && existing->ob_type == &function_type)`
	`102`	`+ {`
	`103`	`+ static_cast<function*>(existing.get())->add_overload(`
	`104`	`+ static_cast<function*>(attribute_));`
	`105`	`+ return;`
	`106`	`+ }`
	`107`	`+ }`
	`108`	`+`
	`109`	`+ // The PyObject_GetAttrString() call above left an active error`
	`110`	`+ PyErr_Clear();`
	`111`	`+ if (PyObject_SetAttr(name_space, name.get(), attribute_) < 0)`
	`112`	`+ throw error_already_set();`
	`113`	`+}`
	`114`	`+`
`75`	`115`	`extern "C"`
`76`	`116`	`{`
`77`	`117`	`// Stolen from Python's funcobject.c`

0 commit comments

Comments

0 (0)

You are visitor 01402520 — GeezerVison does not store the pages you look up.
Best viewed with Netscape Navigator 4.7 or Internet Explorer 6 at 800×600. No cookies required.