moved contents of builtin_to_python_converters.hpp to builtin_converters.hpp

dabrahams · dabrahams · commit 8ff5450ece16 · 2002-02-04T20:14:53.000Z
[SVN r12705]
diff --git a/include/boost/python/converter/builtin_converters.hpp b/include/boost/python/converter/builtin_converters.hpp
@@ -5,11 +5,65 @@
 // to its suitability for any purpose.
 #ifndef BUILTIN_CONVERTERS_DWA2002124_HPP
 # define BUILTIN_CONVERTERS_DWA2002124_HPP
+# include <boost/python/detail/wrap_python.hpp>
+# include <string>
 
-namespace boost { namespace python { namespace converter { 
+namespace boost { namespace python {
 
-void initialize_builtin_converters();
+// Provide specializations of to_python_value
+template <class T> struct to_python_value;
 
-}}} // namespace boost::python::converter
+namespace detail
+{
+  struct builtin_to_python
+  {
+      static bool convertible() { return true; }
+  };
+}
+
+# define BOOST_PYTHON_TO_PYTHON_BY_VALUE(T, expr)   \
+    template <> struct to_python_value<T&>          \
+        : detail::builtin_to_python                 \
+    {                                               \
+        PyObject* operator()(T const& x) const      \
+        {                                           \
+            return (expr);                          \
+        }                                           \
+    };                                              \
+    template <> struct to_python_value<T const&>    \
+        : detail::builtin_to_python                 \
+    {                                               \
+        PyObject* operator()(T const& x) const      \
+        {                                           \
+            return (expr);                          \
+        }                                           \
+    };
+
+
+# define BOOST_PYTHON_TO_INT(T)                                         \
+    BOOST_PYTHON_TO_PYTHON_BY_VALUE(signed T, PyInt_FromLong(x))        \
+    BOOST_PYTHON_TO_PYTHON_BY_VALUE(unsigned T, PyInt_FromLong(x))
+
+BOOST_PYTHON_TO_INT(char)
+BOOST_PYTHON_TO_INT(short)
+BOOST_PYTHON_TO_INT(int)
+BOOST_PYTHON_TO_INT(long)
+# undef BOOST_TO_PYTHON_INT
+
+BOOST_PYTHON_TO_PYTHON_BY_VALUE(char const*, PyString_FromString(x))
+BOOST_PYTHON_TO_PYTHON_BY_VALUE(std::string, PyString_FromString(x.c_str()))
+BOOST_PYTHON_TO_PYTHON_BY_VALUE(float, PyFloat_FromDouble(x))
+BOOST_PYTHON_TO_PYTHON_BY_VALUE(double, PyFloat_FromDouble(x))
+BOOST_PYTHON_TO_PYTHON_BY_VALUE(long double, PyFloat_FromDouble(x))
+BOOST_PYTHON_TO_PYTHON_BY_VALUE(PyObject*, x)
+
+namespace converter
+{ 
+
+  void initialize_builtin_converters();
+
+}
+
+}} // namespace boost::python::converter
 
 #endif // BUILTIN_CONVERTERS_DWA2002124_HPP
diff --git a/include/boost/python/converter/builtin_to_python_converters.hpp b/include/boost/python/converter/builtin_to_python_converters.hpp
diff --git a/include/boost/python/to_python_value.hpp b/include/boost/python/to_python_value.hpp
@@ -10,7 +10,7 @@
 # include <boost/python/converter/type_id.hpp>
 # include <boost/python/converter/registry.hpp>
 # include <boost/python/converter/to_python_function.hpp>
-# include <boost/python/converter/builtin_to_python_converters.hpp>
+# include <boost/python/converter/builtin_converters.hpp>
 
 namespace boost { namespace python { 
 
