From 3f3dfcaaab390a936ed698827d510b3fb8bcf3ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ullrich=20K=C3=B6the?= Date: Wed, 22 Nov 2000 11:21:21 +0000 Subject: [PATCH] changed two forgooten class names into lower case [SVN r8295] --- extclass.h | 83 ++++++++++++++++--------------------------------- gen_extclass.py | 44 +++++++++++++------------- 2 files changed, 49 insertions(+), 78 deletions(-) diff --git a/extclass.h b/extclass.h index b12a995f..925f441b 100644 --- a/extclass.h +++ b/extclass.h @@ -6,7 +6,7 @@ // The author gratefully acknowleges the support of Dragon Systems, Inc., in // producing this work. // -// This file automatically generated for 10-argument constructors by +// This file automatically generated for 5-argument constructors by // gen_extclass.python #ifndef EXTENSION_CLASS_DWA052000_H_ @@ -63,19 +63,19 @@ T* check_non_null(T* p) template class held_instance; -typedef void* (*ConversionFunction)(void*); +typedef void* (*conversion_function_ptr)(void*); -struct BaseClassInfo +struct base_class_info { - BaseClassInfo(extension_class_base* t, ConversionFunction f) + base_class_info(extension_class_base* t, conversion_function_ptr f) :class_object(t), convert(f) {} extension_class_base* class_object; - ConversionFunction convert; + conversion_function_ptr convert; }; -typedef BaseClassInfo derived_class_info; +typedef base_class_info derived_class_info; struct add_operator_base; @@ -96,7 +96,7 @@ class extension_class_base : public class_t private: virtual void* extract_object_from_holder(instance_holder_base* v) const = 0; - virtual std::vector const& base_classes() const = 0; + virtual std::vector const& base_classes() const = 0; virtual std::vector const& derived_classes() const = 0; protected: @@ -121,15 +121,15 @@ class class_registry static void unregister_class(extension_class_base*); // Establish C++ inheritance relationships - static void register_base_class(BaseClassInfo const&); + static void register_base_class(base_class_info const&); static void register_derived_class(derived_class_info const&); // Query the C++ inheritance relationships - static std::vector const& base_classes(); + static std::vector const& base_classes(); static std::vector const& derived_classes(); private: static extension_class_base* static_class_object; - static std::vector static_base_class_info; + static std::vector static_base_class_info; static std::vector static_derived_class_info; }; @@ -142,7 +142,7 @@ BOOST_PYTHON_BEGIN_CONVERSION_NAMESPACE // from T with some virtual function overriding boilerplate, or if there are no // virtual functions, U = held_instance. template > -class PyExtensionClassConverters +class python_extension_class_converters { public: // Get an object which can be used to convert T to/from python. This is used @@ -154,9 +154,9 @@ class PyExtensionClassConverters // pop up. Now, if T hasn't been wrapped as an extension class, the user // will see an error message about the lack of an eligible // py_extension_class_converters() function. - friend PyExtensionClassConverters py_extension_class_converters(python::type) + friend python_extension_class_converters py_extension_class_converters(python::type) { - return PyExtensionClassConverters(); + return python_extension_class_converters(); } // This is a member function because in a conforming implementation, friend @@ -292,7 +292,7 @@ class PyExtensionClassConverters // Convert T to_python, instantiated on demand and only if there isn't a // non-template overload for this function. This version is the one invoked when // T is a wrapped class. See the first 2 functions declared in -// PyExtensionClassConverters above for more info. +// python_extension_class_converters above for more info. template PyObject* to_python(const T& x) { @@ -303,7 +303,7 @@ BOOST_PYTHON_END_CONVERSION_NAMESPACE namespace python { -BOOST_PYTHON_IMPORT_CONVERSION(PyExtensionClassConverters); +BOOST_PYTHON_IMPORT_CONVERSION(python_extension_class_converters); namespace detail { @@ -345,7 +345,7 @@ class read_only_setattr_function : public function // U. template > class extension_class - : public PyExtensionClassConverters, // This generates the to_python/from_python functions + : public python_extension_class_converters, // This generates the to_python/from_python functions public extension_class_base { public: @@ -363,8 +363,8 @@ class extension_class ~extension_class(); // define constructors - template - inline void def(constructor) + template + inline void def(constructor) // The following incantation builds a signature1, signature2,... object. It // should _all_ get optimized away. { add_constructor( @@ -373,12 +373,7 @@ class extension_class prepend(type::id(), prepend(type::id(), prepend(type::id(), - prepend(type::id(), - prepend(type::id(), - prepend(type::id(), - prepend(type::id(), - prepend(type::id(), - signature0()))))))))))); + signature0())))))); } @@ -497,7 +492,7 @@ class extension_class { // see extclass.cpp for an explanation of why we need to register // conversion functions - BaseClassInfo baseInfo(base, + base_class_info baseInfo(base, &define_conversion::downcast_ptr); class_registry::register_base_class(baseInfo); add_base(ref(as_object(base), ref::increment_count)); @@ -514,7 +509,7 @@ class extension_class { // see extclass.cpp for an explanation of why we need to register // conversion functions - BaseClassInfo baseInfo(base, 0); + base_class_info baseInfo(base, 0); class_registry::register_base_class(baseInfo); add_base(ref(as_object(base), ref::increment_count)); @@ -527,7 +522,7 @@ class extension_class typedef instance_value_holder holder; private: // extension_class_base virtual function implementations - std::vector const& base_classes() const; + std::vector const& base_classes() const; std::vector const& derived_classes() const; void* extract_object_from_holder(instance_holder_base* v) const; @@ -630,16 +625,6 @@ public: held_instance(PyObject*, A1 a1, A2 a2, A3 a3, A4 a4) : T(a1, a2, a3, a4) {} template held_instance(PyObject*, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5) : T(a1, a2, a3, a4, a5) {} - template - held_instance(PyObject*, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6) : T(a1, a2, a3, a4, a5, a6) {} - template - held_instance(PyObject*, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6, A7 a7) : T(a1, a2, a3, a4, a5, a6, a7) {} - template - held_instance(PyObject*, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6, A7 a7, A8 a8) : T(a1, a2, a3, a4, a5, a6, a7, a8) {} - template - held_instance(PyObject*, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6, A7 a7, A8 a8, A9 a9) : T(a1, a2, a3, a4, a5, a6, a7, a8, a9) {} - template - held_instance(PyObject*, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6, A7 a7, A8 a8, A9 a9, A10 a10) : T(a1, a2, a3, a4, a5, a6, a7, a8, a9, a10) {} }; // Abstract base class for all obj holders. Base for template class @@ -691,21 +676,6 @@ public: template instance_value_holder(extension_instance* p, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5) : m_held(p, a1, a2, a3, a4, a5) {} - template - instance_value_holder(extension_instance* p, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6) : - m_held(p, a1, a2, a3, a4, a5, a6) {} - template - instance_value_holder(extension_instance* p, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6, A7 a7) : - m_held(p, a1, a2, a3, a4, a5, a6, a7) {} - template - instance_value_holder(extension_instance* p, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6, A7 a7, A8 a8) : - m_held(p, a1, a2, a3, a4, a5, a6, a7, a8) {} - template - instance_value_holder(extension_instance* p, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6, A7 a7, A8 a8, A9 a9) : - m_held(p, a1, a2, a3, a4, a5, a6, a7, a8, a9) {} - template - instance_value_holder(extension_instance* p, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6, A7 a7, A8 a8, A9 a9, A10 a10) : - m_held(p, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10) {} public: // implementation of instance_holder_base required interface bool held_by_value() { return true; } @@ -778,7 +748,7 @@ void extension_class::def_standard_coerce() template inline -std::vector const& +std::vector const& extension_class::base_classes() const { return class_registry::base_classes(); @@ -825,7 +795,7 @@ inline void class_registry::unregister_class(extension_class_base* p) } template -void class_registry::register_base_class(BaseClassInfo const& i) +void class_registry::register_base_class(base_class_info const& i) { static_base_class_info.push_back(i); } @@ -837,7 +807,7 @@ void class_registry::register_derived_class(derived_class_info const& i) } template -std::vector const& class_registry::base_classes() +std::vector const& class_registry::base_classes() { return static_base_class_info; } @@ -854,10 +824,11 @@ std::vector const& class_registry::derived_classes() template extension_class_base* class_registry::static_class_object; template -std::vector class_registry::static_base_class_info; +std::vector class_registry::static_base_class_info; template std::vector class_registry::static_derived_class_info; }} // namespace python::detail #endif // EXTENSION_CLASS_DWA052000_H_ + diff --git a/gen_extclass.py b/gen_extclass.py index 69dfd577..81ea4942 100644 --- a/gen_extclass.py +++ b/gen_extclass.py @@ -68,19 +68,19 @@ T* check_non_null(T* p) template class held_instance; -typedef void* (*ConversionFunction)(void*); +typedef void* (*conversion_function_ptr)(void*); -struct BaseClassInfo +struct base_class_info { - BaseClassInfo(extension_class_base* t, ConversionFunction f) + base_class_info(extension_class_base* t, conversion_function_ptr f) :class_object(t), convert(f) {} extension_class_base* class_object; - ConversionFunction convert; + conversion_function_ptr convert; }; -typedef BaseClassInfo derived_class_info; +typedef base_class_info derived_class_info; struct add_operator_base; @@ -101,7 +101,7 @@ class extension_class_base : public class_t private: virtual void* extract_object_from_holder(instance_holder_base* v) const = 0; - virtual std::vector const& base_classes() const = 0; + virtual std::vector const& base_classes() const = 0; virtual std::vector const& derived_classes() const = 0; protected: @@ -126,15 +126,15 @@ class class_registry static void unregister_class(extension_class_base*); // Establish C++ inheritance relationships - static void register_base_class(BaseClassInfo const&); + static void register_base_class(base_class_info const&); static void register_derived_class(derived_class_info const&); // Query the C++ inheritance relationships - static std::vector const& base_classes(); + static std::vector const& base_classes(); static std::vector const& derived_classes(); private: static extension_class_base* static_class_object; - static std::vector static_base_class_info; + static std::vector static_base_class_info; static std::vector static_derived_class_info; }; @@ -147,7 +147,7 @@ BOOST_PYTHON_BEGIN_CONVERSION_NAMESPACE // from T with some virtual function overriding boilerplate, or if there are no // virtual functions, U = held_instance. template > -class PyExtensionClassConverters +class python_extension_class_converters { public: // Get an object which can be used to convert T to/from python. This is used @@ -159,9 +159,9 @@ class PyExtensionClassConverters // pop up. Now, if T hasn't been wrapped as an extension class, the user // will see an error message about the lack of an eligible // py_extension_class_converters() function. - friend PyExtensionClassConverters py_extension_class_converters(python::type) + friend python_extension_class_converters py_extension_class_converters(python::type) { - return PyExtensionClassConverters(); + return python_extension_class_converters(); } // This is a member function because in a conforming implementation, friend @@ -297,7 +297,7 @@ class PyExtensionClassConverters // Convert T to_python, instantiated on demand and only if there isn't a // non-template overload for this function. This version is the one invoked when // T is a wrapped class. See the first 2 functions declared in -// PyExtensionClassConverters above for more info. +// python_extension_class_converters above for more info. template PyObject* to_python(const T& x) { @@ -308,7 +308,7 @@ BOOST_PYTHON_END_CONVERSION_NAMESPACE namespace python { -BOOST_PYTHON_IMPORT_CONVERSION(PyExtensionClassConverters); +BOOST_PYTHON_IMPORT_CONVERSION(python_extension_class_converters); namespace detail { @@ -350,7 +350,7 @@ class read_only_setattr_function : public function // U. template > class extension_class - : public PyExtensionClassConverters, // This generates the to_python/from_python functions + : public python_extension_class_converters, // This generates the to_python/from_python functions public extension_class_base { public: @@ -497,7 +497,7 @@ class extension_class { // see extclass.cpp for an explanation of why we need to register // conversion functions - BaseClassInfo baseInfo(base, + base_class_info baseInfo(base, &define_conversion::downcast_ptr); class_registry::register_base_class(baseInfo); add_base(ref(as_object(base), ref::increment_count)); @@ -514,7 +514,7 @@ class extension_class { // see extclass.cpp for an explanation of why we need to register // conversion functions - BaseClassInfo baseInfo(base, 0); + base_class_info baseInfo(base, 0); class_registry::register_base_class(baseInfo); add_base(ref(as_object(base), ref::increment_count)); @@ -527,7 +527,7 @@ class extension_class typedef instance_value_holder holder; private: // extension_class_base virtual function implementations - std::vector const& base_classes() const; + std::vector const& base_classes() const; std::vector const& derived_classes() const; void* extract_object_from_holder(instance_holder_base* v) const; @@ -734,7 +734,7 @@ void extension_class::def_standard_coerce() template inline -std::vector const& +std::vector const& extension_class::base_classes() const { return class_registry::base_classes(); @@ -781,7 +781,7 @@ inline void class_registry::unregister_class(extension_class_base* p) } template -void class_registry::register_base_class(BaseClassInfo const& i) +void class_registry::register_base_class(base_class_info const& i) { static_base_class_info.push_back(i); } @@ -793,7 +793,7 @@ void class_registry::register_derived_class(derived_class_info const& i) } template -std::vector const& class_registry::base_classes() +std::vector const& class_registry::base_classes() { return static_base_class_info; } @@ -810,7 +810,7 @@ std::vector const& class_registry::derived_classes() template extension_class_base* class_registry::static_class_object; template -std::vector class_registry::static_base_class_info; +std::vector class_registry::static_base_class_info; template std::vector class_registry::static_derived_class_info;