Changeset 13

Timestamp:

06/24/06 20:35:19 (6 years ago)

Author:

KirkMcDonald

Message:

Added support for default function arguments.

Files:

• trunk/pyd/def.d (modified) (5 diffs)
• trunk/pyd/func_wrap.py (modified) (1 diff)
• trunk/pyd/func_wrap.txt (modified) (1 diff)
• trunk/test.py (modified) (1 diff)
• trunk/testdll.d (modified) (1 diff)
• trunk/testdll.map (modified) (2 diffs)

trunk/pyd/def.d

@@ -36 +36 @@
-/**
- * Wraps a D function, making it callable from Python.
+ *
+ * Params:
+ *      name = The name of the function as it will appear in Python.
+ *      fn   = The function to wrap.
+ *      MIN_ARGS = The minimum number of arguments this function can accept.
+ *                 For use with functions with default arguments. Defaults to
+ *                 the maximum number of arguments this function supports.
- *
- * For example:
@@ -58 +65 @@
- *It's greater than 10!)
- */
-
+, uint MIN_ARGS = NumberOfArgs!(typeof(&fn))
-    void def() {
-        static PyMethodDef empty = { null, null, 0, null };
-        module_global_methods[length-1].ml_name = name ~ \0;
-        module_global_methods[length-1].ml_meth =
-
+, MIN_ARGS
-        module_global_methods[length-1].ml_flags = METH_VARARGS;
-        module_global_methods[length-1].ml_doc = "";
@@ -78 +85 @@
-}
-
-
+, uint MIN_ARGS
-    //typeof(&r_fn) fn = &r_fn;
-    alias typeof(&fn) fn_t;
-
+MAX_
-    alias ReturnType!(fn_t) RetType;
-    extern (C)
@@ -88 +95 @@
-
-        // Sanity check!
-
-
+
+
+
-            return null;
-        }
@@ -95 +103 @@
-        try { /* begin try */
-        
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        
-        } /* end try */

trunk/pyd/func_wrap.py

@@ -1 +1 @@
-f = open('func_wrap.txt', 'w')
-
-typeof(fn), %s))(PyTuple_GET_ITEM
+fn_t, %s))(PyTuple_GetItem
-
-for i in range(1, 11):
-
-
-
+
+
+
+
-    for j in range(i):
-0
+4
-        if j < i-1:
-            f.write(',')
-        f.write('\n')
-16
-16
-16
-2
-16 +        "return
+20
+20
+20
+6
+20 +        "ret =
-    for j in range(i):
-0
+4
-        if j < i-1:
-            f.write(',')
-        f.write('\n')
-
-
+
+
+
-f.write (" " * 8 + "}")

trunk/pyd/func_wrap.txt

@@ -1 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-            }
-        }

trunk/test.py

@@ -19 +19 @@
-print
-
+print "testdll.baz():"
+testdll.baz()
+print "testdll.baz(20):"
+testdll.baz(20)
+print "testdll.baz(30, 'cat'):"
+testdll.baz(30, 'cat')
+
+print
+
-print '--------'
-print 'SUCCESS'

trunk/testdll.d

@@ -20 +20 @@
-}
-
+void baz(int i=10, char[] s="moo") {
+    writefln("i = %s\ns = %s", i, s);
+}
+
-extern (C)
-export void inittestdll() {
-    def!("bar", bar);
-    def!("foo", foo);
+    // Minimum argument count.
+    def!("baz", baz, 0);
-
-    module_init("testdll");

trunk/testdll.map

@@ -1 +1 @@
-
- Start         Length     Name                   Class
-40
-400 0000035A
+74
+740 00000360
- 0004:00000000 00000004H  .CRT$XIA               DATA 32-bit
- 0004:00000010 00000004H  .CRT$XIZ               DATA 32-bit
@@ -12 +12 @@
- 0004:00000070 00000004H  .CRT$XTZ               DATA 32-bit
- 0004:00000074 00000000H  IMP__DATA              IMP__DATA 32-bit
-C4
-CC
-CC
-D3
-D3
-D3
-D5
-D5
-D5
-D6
-D6
-D6
-D6
-D6
-D6
-D7
-D7
-D70 0000327
-AFE
-AFE
-AFE
-AFE
-AFE
-0F
-0
-52
+D2
+DA
+DA
+E1
+E1
+E1
+E3
+E3
+E3
+E4
+E4
+E4
+E4
+E4
+E4
+E5
+E5
+E50 0000328
+B0D
+B0D
+B0D
+B0D
+B0D
+1E
+F
+61
-
-540
+874