Changeset 114

Timestamp:

07/06/07 00:38:29 (1 year ago)

Author:

KirkMcDonald

Message:

Added advanced type conversion. Updated site CSS.

Files:

• trunk/examples/testdll/test.py (modified) (1 diff)
• trunk/examples/testdll/testdll.d (modified) (3 diffs)
• trunk/html_doc/adv_conversion.html (added)
• trunk/html_doc/basics.html (modified) (1 diff)
• trunk/html_doc/celerid.html (modified) (1 diff)
• trunk/html_doc/class_wrapping.html (modified) (3 diffs)
• trunk/html_doc/conversion.html (modified) (1 diff)
• trunk/html_doc/credits.html (modified) (1 diff)
• trunk/html_doc/except_wrapping.html (modified) (1 diff)
• trunk/html_doc/func_wrapping.html (modified) (1 diff)
• trunk/html_doc/index.html (modified) (1 diff)
• trunk/html_doc/inherit.html (modified) (1 diff)
• trunk/html_doc/install.html (modified) (1 diff)
• trunk/html_doc/pyd.css (modified) (2 diffs)
• trunk/html_doc/pydobject.html (modified) (1 diff)
• trunk/html_doc/struct_wrapping.html (modified) (1 diff)
• trunk/html_doc/vsboost.html (modified) (1 diff)
• trunk/infrastructure/pyd/make_object.d (modified) (11 diffs)
• trunk/raw_html/adv_conversion.html (added)
• trunk/raw_html/class_wrapping.html (modified) (2 diffs)
• trunk/raw_html/header_template.html (modified) (1 diff)

trunk/examples/testdll/test.py

@@ -77 +77 @@
-print
-
+print "Testing custom conversion function"
+print testdll.conv1()
+testdll.conv2(20)
+
+print
+
-print '--------'
-print 'SUCCESS'

trunk/examples/testdll/testdll.d

@@ -91 +91 @@
-}
-
+
+struct A {
+    int i;
+}
+
-Foo spam(Foo f) {
-    f.foo();
@@ -101 +106 @@
-}
-
+A conv1() {
+    A a;
+    a.i = 12;
+    return a;
+}
+void conv2(A a) {
+    writefln(a.i);
+}
+
-extern(C) void PydMain() {
-    pragma(msg, "testdll.PydMain");
+    d_to_python(delegate int(A a) { return a.i; });
+    python_to_d(delegate A(int i) { A a; a.i = i; return a; });
+
-    def!(foo);
-    // Python does not support function overloading. This allows us to wrap
@@ -116 +133 @@
-    def!(dg_test);
-    def!(throws);
+    def!(conv1);
+    def!(conv2);
-
-    module_init();

trunk/html_doc/basics.html

@@ -10 +10 @@
-<div id="nav">
-<p><big>Contents</big></p>
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-</div>
-

trunk/html_doc/celerid.html

@@ -10 +10 @@
-<div id="nav">
-<p><big>Contents</big></p>
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-</div>
-

trunk/html_doc/class_wrapping.html

@@ -10 +10 @@
-<div id="nav">
-<p><big>Contents</big></p>
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-</div>
-
@@ -150 +153 @@
-&gt;&gt;&gt; f.i
-0
-20
+<span class="number">20</span>
-&gt;&gt;&gt; f.foo(<span class="string">"Hello! i is "</span>)
-Hello! i is 20
-10, 10
+<span class="number">10</span>, <span class="number">10</span>
-&gt;&gt;&gt; f.i
-20
-30
+<span class="number">30</span>
-&gt;&gt;&gt; g.i
-30
@@ -165 +168 @@
-&gt;&gt;&gt; <span class="keyword">class</span> MyFoo(Foo):
-...     <span class="keyword">def</span> bar(self):
-3
+<span class="number">3</span>
-... 
-3
+<span class="number">3</span>
-&gt;&gt;&gt; h.bar()
-Hey, i+3 is 6

trunk/html_doc/conversion.html

@@ -10 +10 @@
-<div id="nav">
-<p><big>Contents</big></p>
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-</div>
-

trunk/html_doc/credits.html

@@ -10 +10 @@
-<div id="nav">
-<p><big>Contents</big></p>
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-</div>
-

trunk/html_doc/except_wrapping.html

@@ -10 +10 @@
-<div id="nav">
-<p><big>Contents</big></p>
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-</div>
-

trunk/html_doc/func_wrapping.html

@@ -10 +10 @@
-<div id="nav">
-<p><big>Contents</big></p>
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-</div>
-

trunk/html_doc/index.html

@@ -10 +10 @@
-<div id="nav">
-<p><big>Contents</big></p>
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-</div>
-

trunk/html_doc/inherit.html

@@ -10 +10 @@
-<div id="nav">
-<p><big>Contents</big></p>
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-</div>
-

trunk/html_doc/install.html

@@ -10 +10 @@
-<div id="nav">
-<p><big>Contents</big></p>
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-</div>
-

trunk/html_doc/pyd.css

@@ -27 +27 @@
-}
-/* navbar links */
-a.nav
+div#nav a
-    text-decoration: none;
-    font-weight: bold;
+}
+div#nav ul {
+    list-style-type: none;
+    padding: 0;
+    margin-bottom: 0;
+    margin-left: 1em;
+    text-indent: -1em;
+}
+a.nav {
-    color: #f0f0f0;
-}
-a.nav:visited {
-    text-decoration: none;
-    font-weight: bold;
-    color: #f0f0f0;
-}
-a.nav:hover {
-    text-decoration: none;
-    color: black;
-    background-color: #d8d8d8;
@@ -44 +50 @@
-/* the current navbar link */
-a.navcur {
-    text-decoration: none;
-    font-weight: bold;
-    color: black;
-    background-color: #d8d8d8;
-}
-a.navcur:visited {
-    text-decoration: none;
-    font-weight: bold;
-    color: black;
-}
-a.navcur:hover {
-    text-decoration: none;
-    color: #f0f0f0;
-    background-color: #305880;

trunk/html_doc/pydobject.html

@@ -10 +10 @@
-<div id="nav">
-<p><big>Contents</big></p>
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-</div>
-

trunk/html_doc/struct_wrapping.html

@@ -10 +10 @@
-<div id="nav">
-<p><big>Contents</big></p>
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-</div>
-

trunk/html_doc/vsboost.html

@@ -10 +10 @@
-<div id="nav">
-<p><big>Contents</big></p>
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-</div>
-

trunk/infrastructure/pyd/make_object.d

@@ -46 +46 @@
-import pyd.lib_abstract :
-    objToStr,
-
+
+
+
-;
-
@@ -68 +70 @@
-}
-
+class to_conversion_wrapper(dg_t) {
+    alias ParameterTypeTuple!(dg_t)[0] T;
+    alias ReturnType!(dg_t) Intermediate;
+    dg_t dg;
+    this(dg_t fn) { dg = fn; }
+    PyObject* opCall(T t) {
+        static if (is(Intermediate == PyObject*)) {
+            return dg(t);
+        } else {
+            return _py(dg(t));
+        }
+    }
+}
+class from_conversion_wrapper(dg_t) {
+    alias ParameterTypeTuple!(dg_t)[0] Intermediate;
+    alias ReturnType!(dg_t) T;
+    dg_t dg;
+    this(dg_t fn) { dg = fn; }
+    T opCall(PyObject* o) {
+        static if (is(Intermediate == PyObject*)) {
+            return dg(o);
+        } else {
+            return dg(d_type!(Intermediate)(o));
+        }
+    }
+}
+
+template to_converter_registry(From) {
+    PyObject* delegate(From) dg=null;
+}
+template from_converter_registry(To) {
+    To delegate(PyObject*) dg=null;
+}
+
+void d_to_python(dg_t) (dg_t dg) {
+    static if (is(dg_t == delegate) && is(ReturnType!(dg_t) == PyObject*)) {
+        to_converter_registry!(ParameterTypeTuple!(dg_t)[0]).dg = dg;
+    } else {
+        auto o = new to_conversion_wrapper!(dg_t)(dg);
+        to_converter_registry!(typeof(o).T).dg = &o.opCall;
+    }
+}
+void python_to_d(dg_t) (dg_t dg) {
+    static if (is(dg_t == delegate) && is(ParameterTypeTuple!(dg_t)[0] == PyObject*)) {
+        from_converter_registry!(ReturnType!(dg_t)).dg = dg;
+    } else {
+        auto o = new from_conversion_wrapper!(dg_t)(dg);
+        from_converter_registry!(typeof(o).T).dg = &o.opCall;
+    }
+}
+
-/**
- * Returns a new (owned) reference to a Python object based on the passed
@@ -79 +132 @@
- */
-PyObject* _py(T) (T t) {
+    static if (!is(T == PyObject*) && is(typeof(t is null))) {
+        if (t is null) {
+            Py_INCREF(Py_None);
+            return Py_None;
+        }
+    }
-    static if (is(T : bool)) {
-        PyObject* temp = (t) ? Py_True : Py_False;
@@ -94 +153 @@
-        return PyComplex_FromDoubles(t.re, t.im);
-    } else static if (is(T : char[])) {
-        if (t is null) {
-            Py_INCREF(Py_None);
-            return Py_None;
-        }
-        return PyString_FromString((t ~ \0).ptr);
-    } else static if (is(T : wchar[])) {
-        if (t is null) {
-            Py_INCREF(Py_None);
-            return Py_None;
-        }
-        return PyUnicode_FromWideChar(t, t.length);
-    // Converts any array (static or dynamic) to a Python list
-    } else static if (isArray!(T) || isStaticArray!(T)) {
-        if (t is null) {
-            Py_INCREF(Py_None);
-            return Py_None;
-        }
-        PyObject* lst = PyList_New(t.length);
-        PyObject* temp;
@@ -126 +173 @@
-    // Converts any associative array to a Python dict
-    } else static if (isAA!(T)) {
-        if (t is null) {
-            Py_INCREF(Py_None);
-            return Py_None;
-        }
-        PyObject* dict = PyDict_New();
-        PyObject* ktemp, vtemp;
@@ -153 +196 @@
-        return dict;
-    } else static if (is(T == delegate) || is(T == function)) {
-        if (t is null) {
-            Py_INCREF(Py_None);
-            return Py_None;
-        }
-        PydWrappedFunc_Ready!(T)();
-        return WrapPyObject_FromObject(t);
-    } else static if (is(T : PydObject)) {
-        if (t is null) {
-            Py_INCREF(Py_None);
-            return Py_None;
-        }
-        PyObject* temp = t.ptr();
-        Py_INCREF(temp);
-        return temp;
-
+
+
+
+
+
+
+
-    } else static if (is(T == class)) {
-        if (t is null) {
-            Py_INCREF(Py_None);
-            return Py_None;
-        }
-        // But only if it actually is a wrapped type. :-)
-        PyTypeObject** type = t.classinfo in wrapped_classes;
@@ -195 +232 @@
-            return WrapPyObject_FromObject(t);
-        }
-
-
-
-
-
-
+
+
+
+
-    }
-    PyErr_SetString(PyExc_RuntimeError, ("D conversion function _py failed with type " ~ objToStr(typeid(T))).ptr);
@@ -288 +323 @@
-        }
-        // Otherwise, throw up an exception.
-
+//
-    } else static if (is(T == struct)) { // struct by value
-        if (is_wrapped!(T*) && PyObject_TypeCheck(o, &wrapped_class_type!(T*))) { 
-            return *WrapPyObject_AsObject!(T*)(o);
-
+//
-    } else static if (is(typeof(*(T.init)) == struct)) { // pointer to struct   
-        if (is_wrapped!(T) && PyObject_TypeCheck(o, &wrapped_class_type!(T))) {
-            return WrapPyObject_AsObject!(T)(o);
-
+//
-    } else static if (is(T == delegate)) {
-        // Get the original wrapped delegate out if this is a wrapped delegate
@@ -304 +339 @@
-        } else if (PyCallable_Check(o)) {
-            return PydCallable_AsDelegate!(T)(o);
-
+//
-    } else static if (is(T == function)) {
-        // We can only make it a function pointer if we originally wrapped a
@@ -310 +345 @@
-        if (is_wrapped!(T) && PyObject_TypeCheck(o, &wrapped_class_type!(T))) {
-            return WrapPyObject_AsObject!(T)(o);
-
+//
-    /+
-    } else static if (is(wchar[] : T)) {
@@ -390 +425 @@
-        handle_exception();
-        return res == 1;
-
+/+
-        could_not_convert!(T)(o);
-
+
+
+
+
+
-}
-

trunk/raw_html/class_wrapping.html

@@ -134 +134 @@
->>> f.i
-0
-20
+<span class="number">20</span>
-&gt;&gt;&gt; f.foo(<span class="string">"Hello! i is "</span>)
-Hello! i is 20
-10, 10
+<span class="number">10</span>, <span class="number">10</span>
-&gt;&gt;&gt; f.i
-20
-30
+<span class="number">30</span>
-&gt;&gt;&gt; g.i
-30
@@ -149 +149 @@
-&gt;&gt;&gt; <span class="keyword">class</span> MyFoo(Foo):
-...     <span class="keyword">def</span> bar(self):
-3
+<span class="number">3</span>
-... 
-3
+<span class="number">3</span>
-&gt;&gt;&gt; h.bar()
-Hey, i+3 is 6

trunk/raw_html/header_template.html

@@ -1 +1 @@
-<div id="nav">
-<p><big>Contents</big></p>
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-</div>