Changeset 118

Timestamp:

07/10/07 15:14:05 (1 year ago)

Author:

KirkMcDonald

Message:

Some identifier length shortening changes.

Files:

• trunk/examples/testdll/testdll.d (modified) (3 diffs)
• trunk/infrastructure/pyd/class_wrap.d (modified) (18 diffs)
• trunk/infrastructure/pyd/ctor_wrap.d (modified) (2 diffs)
• trunk/infrastructure/pyd/make_wrapper.d (modified) (1 diff)
• trunk/infrastructure/pyd/pyd.d (modified) (1 diff)
• trunk/infrastructure/pyd/struct_wrap.d (modified) (1 diff)

trunk/examples/testdll/testdll.d

@@ -59 +59 @@
-    int i() { return m_i; }
-    void i(int j) { m_i = j; }
+    void a() {}
+    void b() {}
+    void c() {}
+    void d() {}
+    void e() {}
+    void f() {}
+    void g() {}
+    void h() {}
+    void j() {}
+    void k() {}
+    void l() {}
+    void m() {}
+    void n() {}
+    void o() {}
+    void p() {}
+    void q() {}
+    void r() {}
+    void s() {}
+    void t() {}
+    void u() {}
+    void v() {}
+    void w() {}
+    void x() {}
+    void y() {}
+    void z() {}
-}
-
@@ -114 +139 @@
-    writefln(a.i);
-}
+
+mixin _wrap_class!(
+    Foo,
+    "Foo",
+    Init!(void delegate(int), void delegate(int, int)),
+    Property!(Foo.i, "A sample property of Foo."),
+    Def!(Foo.foo, "A sample method of Foo."),
+    Def!(Foo.a),
+    Def!(Foo.b),
+    Def!(Foo.c),
+    Def!(Foo.d),
+    Def!(Foo.e),
+    Def!(Foo.f),
+    Def!(Foo.g),
+    Def!(Foo.h),
+    Def!(Foo.j),
+    Def!(Foo.k),
+    Def!(Foo.l),
+    Def!(Foo.m),
+    Def!(Foo.n)/*, // Maximum length
+    Def!(Foo.o),
+    Def!(Foo.p),
+    Def!(Foo.q),
+    Def!(Foo.r),
+    Def!(Foo.s),
+    Def!(Foo.t),
+    Def!(Foo.u),
+    Def!(Foo.v),
+    Def!(Foo.w),
+    Def!(Foo.x),
+    Def!(Foo.y),
+    Def!(Foo.z)*/
+) F;
-
-extern(C) void PydMain() {
@@ -138 +196 @@
-    module_init();
-
-
-
-
-
-
-
+
-
-    wrap_struct!(

trunk/infrastructure/pyd/class_wrap.d

@@ -26 +26 @@
-import pyd.ctor_wrap;
-import pyd.def;
+import pyd.dg_convert;
-import pyd.exception;
-import pyd.func_wrap;
@@ -272 +273 @@
-       if more than one function has the same name as this one.
-*/
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    //static const type = ParamType.Def;
-    alias fn func;
-    alias fn_t func_t;
-
+symbolnameof!(fn);//
-    static const char[] funcname = name;
-
-
-
+
+
+
+
-        pragma(msg, "class.def: " ~ name);
-        static PyMethodDef empty = { null, null, 0, null };
@@ -314 +324 @@
-        const char[] shim =
-            "    alias Params["~ToString!(i)~"] __pyd_p"~ToString!(i)~";\n"
-_
-_
+
+
-            "    }\n";
-    }
@@ -323 +333 @@
-Wraps a static member function of the class. Identical to pyd.def.def
-*/
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    //static const type = ParamType.StaticDef;
-    alias fn func;
@@ -344 +366 @@
-    static const char[] funcname = name;
-    static const uint min_args = MIN_ARGS;
-
+
+
-        pragma(msg, "class.static_def: " ~ name);
-        static PyMethodDef empty = { null, null, 0, null };
@@ -371 +394 @@
-//    alias Property!(fn, symbolnameof!(fn), name, RO, docstring) Property;
-//}
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    alias property_parts!(fn).getter_type get_t;
-    alias property_parts!(fn).setter_type set_t;
@@ -389 +421 @@
-    static const char[] funcname = name;
-    static const bool readonly = RO;
-
+
+
-        pragma(msg, "class.prop: " ~ name);
-        static PyGetSetDef empty = { null, null, null, null, null };
@@ -431 +464 @@
-*/
-struct Repr(alias fn) {
-
+
+
-        alias wrapped_class_type!(T) type;
-        type.tp_repr = &wrapped_repr!(T, fn).repr;
@@ -454 +488 @@
-struct Init(C ...) {
-    alias C ctors;
-
-
-
+
+
+
+
+
+
+
-    }
-    template shim_impl(uint i, uint c=0) {
@@ -488 +526 @@
-*/
-struct Iter(iter_t) {
+    static const bool needs_shim = false;
-    alias iter_t iterator_t;
-, shim
+
-        PydStackContext_Ready();
-        // This strange bit of hackery is needed since we operate on pointer-
@@ -507 +546 @@
-*/
-struct AltIter(alias fn, char[] name = symbolnameof!(fn), iter_t = ParameterTypeTuple!(fn)[0]) {
-
+
+
-        static PyMethodDef empty = { null, null, 0, null };
-        alias wrapped_method_list!(T) list;
@@ -525 +565 @@
-
-void wrap_class(T, Params...) (char[] docstring="", char[] modulename="") {
-
-
-
-
-
+
+
+
+
+
+
+
+
-    static if (is(_T == class)) {
-        pragma(msg, "wrap_class: " ~ name);
-
+
+
-        alias _T T;
-//    } else static if (is(_T == interface)) {
@@ -543 +587 @@
-        alias _T* T;
-    }
+void wrap_class(char[] docstring="", char[] modulename="") {
+    pragma(msg, "shim.mangleof: " ~ shim_class.mangleof);
-    alias wrapped_class_type!(T) type;
-    //pragma(msg, "wrap_class, T is " ~ prettytypeof!(T));
@@ -548 +594 @@
-    //Params params;
-    foreach (param; Params) {
-
+
+
+
+
+
+
-    }
-
-    assert(Pyd_Module_p(modulename) !is null, "Must initialize module before wrapping classes.");
-
+python.
-
-    //////////////////
-    // Basic values //
-    //////////////////
-
+python.
-    type.tp_basicsize = (wrapped_class_object!(T)).sizeof;
-    type.tp_doc       = (docstring ~ \0).ptr;
-Py_TPFLAGS_DEFAULT | 
+python.Py_TPFLAGS_DEFAULT | python.
-    //type.tp_repr      = &wrapped_repr!(T).repr;
-    type.tp_methods   = wrapped_method_list!(T).ptr;
@@ -583 +634 @@
-    ////////////////////////
-    // Numerical operator overloads
-wrapped_class_as_number!(T) != 
-
+pyd.op_wrap.wrapped_class_as_number!(T) != python.
+pyd.op_wrap.
-    }
-    // Sequence operator overloads
-wrapped_class_as_sequence!(T) != 
-
+pyd.op_wrap.wrapped_class_as_sequence!(T) != python.
+pyd.op_wrap.
-    }
-    // Mapping operator overloads
-wrapped_class_as_mapping!(T) != 
-
+pyd.op_wrap.wrapped_class_as_mapping!(T) != python.
+pyd.op_wrap.
-    }
-
@@ -607 +658 @@
-    // opCmp
-    static if (is(typeof(&T.opCmp))) {
-
+pyd.op_wrap.
-    }
-    // opCall
@@ -637 +688 @@
-        throw new Exception("Couldn't ready wrapped type!");
-    }
-
-
+python.
+python.
-
-    is_wrapped!(T) = true;
@@ -647 +698 @@
-    }
-}
-
+
-////////////////
-// DOCSTRINGS //

trunk/infrastructure/pyd/ctor_wrap.d

@@ -67 +67 @@
-// This template accepts a tuple of function pointer types, which each describe
-// a ctor of T, and  uses them to wrap a Python tp_init function.
-
+
+
-    alias wrapped_class_object!(T) wrap_object;
-
-    extern(C)
-
+static 
-        int len = PyObject_Length(args);
-
@@ -92 +93 @@
-                        return -1;
-                    }
+                    alias typeof(fn) dg_t;
+                    mixin applyPyTupleToDelegate!(dg_t);
-                    T t = applyPyTupleToDelegate(fn, args);
-                    if (t is null) {

trunk/infrastructure/pyd/make_wrapper.d

@@ -182 +182 @@
-    "class wrapper : T {\n"~
-    "    mixin OverloadShim;\n"~
-
+pyd.make_wrapper.
-//    op_shims!(0, T)~
-    "}\n";

trunk/infrastructure/pyd/pyd.d

@@ -44 +44 @@
-        import pyd.iteration;
-    }
+    import pyd.make_wrapper;
-}
-

trunk/infrastructure/pyd/struct_wrap.d

@@ -63 +63 @@
-}
-
-
-
+
+
+
+
+
-}
-struct Member(char[] realname, char[] name, char[] docstring) {
-
+
+
+
+
+
-        pragma(msg, "struct.member: " ~ name);
-        static PyGetSetDef empty = {null, null, null, null, null};