Changeset 38

Timestamp:

08/16/06 13:03:32 (2 years ago)

Author:

KirkMcDonald

Message:

More opApply wrapping, docs

Files:

• trunk/examples/testdll/testdll.d (modified) (1 diff)
• trunk/html_doc/class_wrapping.html (modified) (1 diff)
• trunk/infrastructure/pyd/ftype.d (modified) (1 diff)
• trunk/infrastructure/pyd/generators/ftype.py (modified) (4 diffs)
• trunk/infrastructure/pyd/generators/ftype.txt (added)
• trunk/infrastructure/pyd/generators/iterate.py (added)
• trunk/infrastructure/pyd/generators/iterate.txt (added)
• trunk/infrastructure/pyd/iteration.d (modified) (3 diffs)

trunk/examples/testdll/testdll.d

@@ -53 +53 @@
-    }
-    Foo opAdd(Foo f) { return new Foo(m_i + f.m_i); }
-
+, inout int
-        int result = 0;
+        int j;
-        for (int i=0; i<10; ++i) {
-
+
+
-            if (result) break;
-        }

trunk/html_doc/class_wrapping.html

@@ -74 +74 @@
-<p>At the moment, only the following operator overloads are supported:</p>
-
-
+, opApply
-
-
+
+
+
-
-<h3><a class="anchor" name="examples">Examples</a></h3>

trunk/infrastructure/pyd/ftype.d

@@ -144 +144 @@
-    const uint NumberOfArgs = ArglenConvT!(NumberOfArgsSwitchT!(Tf).type);
-}
+
+/* NumberOfArgsInout */
+template
+ArgleninoutT(Tr)
+{
+    Arglen0
+    ArgleninoutT(Tr function() fn) { assert(false); }
+}
+
+template
+ArgleninoutT(Tr, Ta1)
+{
+    Arglen1
+    ArgleninoutT(Tr function(inout Ta1) fn) { assert(false); }
+}
+
+template
+ArgleninoutT(Tr, Ta1, Ta2)
+{
+    Arglen2
+    ArgleninoutT(Tr function(inout Ta1, inout Ta2) fn) { assert(false); }
+}
+
+template
+ArgleninoutT(Tr, Ta1, Ta2, Ta3)
+{
+    Arglen3
+    ArgleninoutT(Tr function(inout Ta1, inout Ta2, inout Ta3) fn) { assert(false); }
+}
+
+template
+ArgleninoutT(Tr, Ta1, Ta2, Ta3, Ta4)
+{
+    Arglen4
+    ArgleninoutT(Tr function(inout Ta1, inout Ta2, inout Ta3, inout Ta4) fn) { assert(false); }
+}
+
+template
+ArgleninoutT(Tr, Ta1, Ta2, Ta3, Ta4, Ta5)
+{
+    Arglen5
+    ArgleninoutT(Tr function(inout Ta1, inout Ta2, inout Ta3, inout Ta4, inout Ta5) fn) { assert(false); }
+}
+
+template
+ArgleninoutT(Tr, Ta1, Ta2, Ta3, Ta4, Ta5, Ta6)
+{
+    Arglen6
+    ArgleninoutT(Tr function(inout Ta1, inout Ta2, inout Ta3, inout Ta4, inout Ta5, inout Ta6) fn) { assert(false); }
+}
+
+template
+ArgleninoutT(Tr, Ta1, Ta2, Ta3, Ta4, Ta5, Ta6, Ta7)
+{
+    Arglen7
+    ArgleninoutT(Tr function(inout Ta1, inout Ta2, inout Ta3, inout Ta4, inout Ta5, inout Ta6, inout Ta7) fn) { assert(false); }
+}
+
+template
+ArgleninoutT(Tr, Ta1, Ta2, Ta3, Ta4, Ta5, Ta6, Ta7, Ta8)
+{
+    Arglen8
+    ArgleninoutT(Tr function(inout Ta1, inout Ta2, inout Ta3, inout Ta4, inout Ta5, inout Ta6, inout Ta7, inout Ta8) fn) { assert(false); }
+}
+
+template
+ArgleninoutT(Tr, Ta1, Ta2, Ta3, Ta4, Ta5, Ta6, Ta7, Ta8, Ta9)
+{
+    Arglen9
+    ArgleninoutT(Tr function(inout Ta1, inout Ta2, inout Ta3, inout Ta4, inout Ta5, inout Ta6, inout Ta7, inout Ta8, inout Ta9) fn) { assert(false); }
+}
+
+template
+ArgleninoutT(Tr, Ta1, Ta2, Ta3, Ta4, Ta5, Ta6, Ta7, Ta8, Ta9, Ta10)
+{
+    Arglen10
+    ArgleninoutT(Tr function(inout Ta1, inout Ta2, inout Ta3, inout Ta4, inout Ta5, inout Ta6, inout Ta7, inout Ta8, inout Ta9, inout Ta10) fn) { assert(false); }
+}
+
+template
+NumberOfArgsInoutT(Tf)
+{
+    private Tf fptr;
+    alias typeof(ArgleninoutT(fptr)) type;
+}
+
+template
+NumberOfArgsSwitchInoutT(Tf)
+{
+    static if( is( typeof(*Tf) == function ) )
+        alias NumberOfArgsInoutT!(Tf).type type;
+    else static if( is( Tf U == delegate ) )
+        alias NumberOfArgsSwitchInoutT!(U*).type type;
+}
+
+public
+template
+NumberOfArgsInout(Tf)
+{
+    const uint NumberOfArgsInout = ArglenConvT!(NumberOfArgsSwitchInoutT!(Tf).type);
+}
+
+/* ReturnType */
-
-template

trunk/infrastructure/pyd/generators/ftype.py

@@ -20 +20 @@
-
-# This is the file the module will be output to.
-d
+txt
-
-# This is the full name of the module.
-
+pyd.
-
-#
@@ -40 +40 @@
-        return "Ta%d" % i
-
+def typenameinout(i):
+    if i == 0:
+        return "Tr"
+    else:
+        return "inout Ta%d" % i
+
-def typeargs(n, omit_first=False):
-    if omit_first:
@@ -48 +54 @@
-    return ", ".join(typename(x) for x in xs)
-
+def typeargsinout(n, omit_first=False):
+    if omit_first:
+        xs = range(1,n+1)
+    else:
+        xs = range(n+1)
+        
+    return ", ".join(typenameinout(x) for x in xs)
+
-def typefptr(n):
-    return "%s function(%s)" % (typename(0), typeargs(n, True))
+
+def typefninout(n):
+    return "%s function(%s)" % (typenameinout(0), typeargsinout(n, True))
-
-def typedelegate(n):
@@ -168 +185 @@
-
-#
+# NumberOfArgsInout
+#
+for i in range(MAX_ARGS+1):
+    print ""
+    print "template"
+    print "ArgleninoutT(%s)" % typeargs(i)
+    print "{"
+    print "    Arglen%d" % i
+    print "    ArgleninoutT(%s fn) { assert(false); }" % typefninout(i)
+    print "}"
+
+print """
+template
+NumberOfArgsInoutT(Tf)
+{
+    private Tf fptr;
+    alias typeof(ArgleninoutT(fptr)) type;
+}"""
+
+print """
+template
+NumberOfArgsSwitchInoutT(Tf)
+{
+    static if( is( typeof(*Tf) == function ) )
+        alias NumberOfArgsInoutT!(Tf).type type;
+    else static if( is( Tf U == delegate ) )
+        alias NumberOfArgsSwitchInoutT!(U*).type type;
+}"""
+
+print """
+public
+template
+NumberOfArgsInout(Tf)
+{
+    const uint NumberOfArgsInout = ArglenConvT!(NumberOfArgsSwitchInoutT!(Tf).type);
+}"""
+
+#
-# ReturnType(Tf)
-#

trunk/infrastructure/pyd/iteration.d

@@ -23 +23 @@
-/**
- * This module provides the support for wrapping opApply with Python's
-modul
+packag
- */
-module pyd.iteration;
@@ -30 +30 @@
-private import pyd.class_wrap;
-private import pyd.exception;
+private import pyd.ftype;
-private import pyd.make_object;
-private import st.stackcontext;
@@ -43 +44 @@
-}
-
+// Makes a PyTuple and "steals" all of the passed references
+PyObject* _make_pytuple(PyObject*[] pyobjs ...) {
+    PyObject* temp = PyTuple_New(pyobjs.length);
+    if (temp is null) {
+        foreach (PyObject* o; pyobjs) {
+            Py_DECREF(o);
+        }
+        return null;
+    }
+    foreach (uint i, PyObject* o; pyobjs) {
+        PyTuple_SetItem(temp, i, o);
+    }
+    return temp;
+}
+
-// Creates an iterator object from an object.
-PyObject* DPySC_FromWrapped(T) (T obj) {
+    // Get the number of args the opApply's delegate argument takes
+    const uint ARGS = NumberOfArgsInout!(ArgType!(typeof(&T.opApply), 1));
-    auto sc = new StackContext(delegate void() {
-        T t = obj;
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        }
-    });