Changeset 43

Timestamp:

10/27/06 01:05:57 (2 years ago)

Author:

KirkMcDonald

Message:

More operator overload wrapping, and docs

Files:

• trunk/html_doc/class_wrapping.html (modified) (2 diffs)
• trunk/infrastructure/pyd/op_wrap.d (modified) (8 diffs)

trunk/html_doc/class_wrapping.html

@@ -53 +53 @@
-<dd>This allows the user to specify a different overload of opApply than the default. (The default is always the one that is lexically first.) The <span class="t_arg">iter_t</span> argument should be the type of the delegate that forms the argument to opApply. This might be e.g. <code>int delegate(inout int)</code>. Don't forget the <code>inout</code> modifiers!</dd>
-
-iter_t
+<span class="t_arg">iter_t</span>
-<dd>This wraps alternate iterator methods as Python methods that return iterator objects. The wrapped methods should have a signature like that of opApply. (In other words, they should be methods intended to be used with D's ability to iterate over delgates.) The <span class="t_arg">iter_t</span> argument should be the type of the delegate argument to the method. This will usually be derived automatically.
-</dd>
@@ -81 +81 @@
-<p>At the moment, only the following operator overloads are supported:</p>
-
-
+, opIndex, opIndexAssign, opSlice, opSliceAssign
-
-ost notably missing from this list are <code>opIndex, opIndexAssign, opSlice</code>, and <code>opSliceAssign</code>. Support for these operators is forthcoming. Also missing from the list are <code>opUShr</code> and <code>opUShrAssign</code>. Python does not have an unsigned right-shift operator, so these operator overloads are not supported. (You may still wrap them with a normal method using <code>wrapped_class.def</code>, of course.) Also missing from the list is <code>opApplyReverse</code>. This must be wrapped explicitly with <code>
+issing from this list are <code>opUShr</code> and <code>opUShrAssign</code>. Python does not have an unsigned right-shift operator, so these operator overloads are not supported. (You may still wrap them with a normal method using <code>wrapped_class.def</code>, of course.) Also missing from the list is <code>opApplyReverse</code>. This must be wrapped explicitly with <code>wrapped_class.
-
-<!-- This is not yet implemented.
-if you wish it to be available as a normal property
+or <code>def</code> if you wish it to be available as a normal property or method
--->
-
-
+
+
+
+
+
+
+
+
+
-
-<h3><a class="anchor" name="examples">Examples</a></h3>

trunk/infrastructure/pyd/op_wrap.d

@@ -25 +25 @@
-
-private import pyd.class_wrap;
+private import pyd.dg_convert;
-private import pyd.func_wrap;
-private import pyd.exception;
@@ -76 +77 @@
-template wrapped_class_as_sequence(T) {
-    static PySequenceMethods wrapped_class_as_sequence = {
-
-
-
-null,          
-null, 
-null,                
-null,       
-
-
-
+           
+           
+           
+opIndex_sequence_wrap!(T),
+opSlice_wrap!(T),
+opIndexAssign_sequence_wrap!(T),
+opSliceAssign_wrap!(T),
+           
+           
+           
-    };
-}
@@ -91 +92 @@
-template wrapped_class_as_mapping(T) {
-    static PyMappingMethods wrapped_class_as_mapping = {
-
-null,          
-null,                
+          
+opIndex_mapping_wrap!(T),
+opIndexAssign_mapping_wrap!(T),
-    };
-}
@@ -99 +100 @@
-template opfunc_binary_wrap(T, alias opfn) {
-    alias wrapped_class_object!(T) wrap_object;
+    alias funcDelegInfoT!(typeof(&opfn)) Info;
-    extern(C)
-    PyObject* func(PyObject* self, PyObject* o) {
-
-
-
-
-
-
-
+
+
+
+
-    }
-}
-
-template opfunc_unary_wrap(T, alias opfn) {
-    alias wrapped_class_object!(T) wrap_object;
-    extern(C)
-    PyObject* func(PyObject* self) {
+        // func_wrap takes care of exception handling
-        return func_wrap!(opfn, 0, T).func(self, null);
-    }
@@ -132 +131 @@
-template opindexassign_sequence_pyfunc(T) {
-    alias wrapped_class_object!(T) wrap_object;
+    alias funcDelegInfoT!(typeof(&T.opIndexAssign)) Info;
+    alias Info.Meta.ArgType!(0) AssignT;
-
-    extern(C)
-    int func(PyObject* self, int i, PyObject* o) {
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    }
-}
@@ -159 +219 @@
-// The rest of the file is composed of these short stubs
-template opIndex_sequence_wrap(T) {
-
-
-
+
+
+
+
-    ) {
-        const intargfunc opIndex_sequence_wrap = &opindex_sequence_pyfunc!(T).func;
@@ -170 +231 @@
-
-template opIndexAssign_sequence_wrap(T) {
-
+
+
+
+
+
+
+
-        const intobjargproc opIndexAssign_sequence_wrap = null;
-    } else {
-        const intobjargproc opIndexAssign_sequence_wrap = null;
-    }
-}
-
-template opIndex_mapping_wrap(T) {
-
+
+
+
+
+
+
+
+
+
-}
-
-template opIndexAssign_mapping_wrap(T) {
-
+
+
+
+
+
+
+
+
+
-}
-
-template opSlice_wrap(T) {
-
+
+
+
+
+
+
+
+
+
+
-}
-
-template opSliceAssign_wrap(T) {
-
+
+
+
+
+
+
+
+
+
+
-}
-
@@ -410 +509 @@
-template opIn_wrap(T) {
-    static if (is(typeof(&T.opIn_r))) {
-func_binary_wrap!(T, T.opIn_r)
+in_wrap
-    } else {
-        const binaryfunc opIn_wrap = null;