+ Added Ralf's test code

djowel · djowel · commit cfb1aebf669d · 2002-08-22T05:23:45.000Z
+ Fixed defaults_gen MACRO generation
+ Fixed signature for const member functions


[SVN r15047]
diff --git a/include/boost/python/detail/defaults_gen.hpp b/include/boost/python/detail/defaults_gen.hpp
@@ -88,7 +88,7 @@ struct func_stubs_base {};
                                                                                 \
             BOOST_PP_FIX_REPEAT_2ND                                             \
             (                                                                   \
-                BOOST_PP_INC(N_DFLTS),                                          \
+                N_ARGS,                                                         \
                 BPL_IMPL_TYPEDEF_GEN,                                           \
                 1                                                               \
             )                                                                   \
@@ -140,7 +140,7 @@ struct func_stubs_base {};
                                                                                 \
             BOOST_PP_FIX_REPEAT_2ND                                             \
             (                                                                   \
-                BOOST_PP_INC(N_DFLTS),                                          \
+                N_ARGS,                                                         \
                 BPL_IMPL_TYPEDEF_GEN,                                           \
                 2                                                               \
             )                                                                   \
diff --git a/include/boost/python/signature.hpp b/include/boost/python/signature.hpp
@@ -242,7 +242,7 @@ template
 >
 inline boost::mpl::type_list
 <
-    RT, ClassT BOOST_PP_COMMA_IF(BOOST_PP_ITERATION())
+    RT, ClassT const BOOST_PP_COMMA_IF(BOOST_PP_ITERATION())
     BOOST_PP_ENUM_PARAMS(BOOST_PP_ITERATION(), T)
 >
 get_signature
diff --git a/test/defaults.cpp b/test/defaults.cpp
@@ -89,17 +89,47 @@ struct X {
         abcd.append(d);
         return "int(%s); char(%s); string(%s); double(%s); " % tuple(abcd);
     }
+
+    object
+    foo(int a, bool b=false) const
+    {
+        list ab;
+        ab.append(a);
+        ab.append(b);
+        return "int(%s); bool(%s); " % tuple(ab);
+    }
+
+    object
+    foo(std::string a, bool b=false) const
+    {
+        list ab;
+        ab.append(a);
+        ab.append(b);
+        return "string(%s); bool(%s); " % tuple(ab);
+    }
+
+    object
+    foo(list a, list b, bool c=false) const
+    {
+        list abc;
+        abc.append(a);
+        abc.append(b);
+        abc.append(c);
+        return "list(%s); list(%s); bool(%s); " % tuple(abc);
+    }
 };
 
 BOOST_PYTHON_MEM_FUN_GENERATOR(X_bar_stubs, bar, 1, 4)
+BOOST_PYTHON_MEM_FUN_GENERATOR(X_foo_2_stubs, foo, 1, 2)
+BOOST_PYTHON_MEM_FUN_GENERATOR(X_foo_3_stubs, foo, 2, 3)
 
 ///////////////////////////////////////////////////////////////////////////////
 
 BOOST_PYTHON_MODULE_INIT(defaults_ext)
 {
     module("defaults_ext")
         .def("foo", foo, foo_stubs())
-        
+
 #if !(defined(BOOST_MSVC) && (BOOST_MSVC <= 1200))
         .def("bar", signature<object(*)(int, char, std::string, double)>(), bar_stubs())
 #else // signature does not work on VC6 only (VC7 is ok)
@@ -109,7 +139,17 @@ BOOST_PYTHON_MODULE_INIT(defaults_ext)
 
     class_<X>("X")
         .def("bar", &X::bar, X_bar_stubs())
+        .def("foo", (object(X::*)(std::string, bool) const)0, X_foo_2_stubs())
+
+#if !(defined(BOOST_MSVC) && (BOOST_MSVC <= 1200))
+        .def("foo", signature<object(X::*)(int, bool) const>(), X_foo_2_stubs())
+#else // signature does not work on VC6 only (VC7 is ok)
+        .def("foo", (object(X::*)(int, bool) const)0, X_foo_2_stubs())
+#endif
+
+        .def("foo", (object(X::*)(list, list, bool) const)0, X_foo_3_stubs())
         ;
 }
 
 #include "module_tail.cpp"
+

Original file line number	Diff line number	Diff line change
`@@ -242,7 +242,7 @@ template`
`242`	`242`	`>`
`243`	`243`	`inline boost::mpl::type_list`
`244`	`244`	`<`
`245`		`- RT, ClassT BOOST_PP_COMMA_IF(BOOST_PP_ITERATION())`
	`245`	`+ RT, ClassT const BOOST_PP_COMMA_IF(BOOST_PP_ITERATION())`
`246`	`246`	`BOOST_PP_ENUM_PARAMS(BOOST_PP_ITERATION(), T)`
`247`	`247`	`>`
`248`	`248`	`get_signature`