Changeset 237

Timestamp:

11/17/07 00:24:58 (1 year ago)

Author:

JarrettBillingsley

Message:

--

Files:

• trunk/minid/bind.d (modified) (17 diffs)
• trunk/minid/utils.d (modified) (1 diff)
• trunk/samples/simple.md (modified) (4 diffs)
• trunk/test.d (modified) (4 diffs)

trunk/minid/bind.d

@@ -46 +46 @@
-            {
-                dchar[] name = utf.toUtf32(member.Name);
-Function
+WrappedFunc
-            }
-            else static if(is(typeof(member.isClass)))
-            {
-                dchar[] name = utf.toUtf32(member.Name);
-new member.
+member.make
-            }
-            else static if(is(typeof(member.isStruct)))
@@ -80 +80 @@
-This wraps a function, and is meant to be used as a parameter to WrapModule.
-*/
-, char[] name = NameOfFunc!(func), funcType = typeof(&func)
+
-{
-    const bool isFunc = true;
-alias WrappedFunc!(func, name, funcType) Function
-const char[] Name = name
+const char[] Name = NameOfFunc!(func)
+mixin WrappedFunc!(func, Name, typeof(&func))
-}
-
@@ -90 +90 @@
-public template WrapFunc(alias func, funcType)
-{
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-
@@ -116 +134 @@
-}
-
+private class WrappedClass : MDClass
+{
+    private this(dchar[] name, MDClass base)
+    {
+        super(name, base);
+    }
+
+    public override WrappedInstance newInstance()
+    {
+        return new WrappedInstance(this);
+    }
+}
+
-private class WrappedInstance : MDInstance
-{
@@ -128 +159 @@
-private class WrappedStruct(T) : MDInstance
-{
-//  alias FieldNames!(T) fieldNames;
-    private T inst;
-
@@ -135 +165 @@
-        super(owner);
-    }
-
-//  private void updateFields()
-//  {
-//      foreach(i, v; fieldNames)
-//          mFields[mixin("\"" ~ fieldNames[i] ~ "\"d")] = MDValue(inst.tupleof[i]);
-//  }
-// 
-//  private T* toStruct()
-//  {
-//      foreach(i, v; fieldNames)
-//          inst.tupleof[i] = mFields[mixin("\"" ~ fieldNames[i] ~ "\"d")].to!(typeof(inst.tupleof[i]));
-// 
-//      return &inst;
-//  }
-}
-
-/**
-Wraps a D class of the given type with the given members.  name is the name that will be given to the class in MiniD.
+This is meant to be used as a parameter to WrapModule.
-*/
-public struct WrapClass(ClassType, char[] name = ClassType.stringof, Members...)
@@ -161 +178 @@
-    const char[] Name = name;
-    const CtorCount = CountCtors!(Members);
+    const className = ToUTF32!(name);
-
-    static assert(CtorCount <= 1, "Cannot have more than one WrapCtors instance in wrapped class parameters for class " ~ ClassType.stringof);
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-            
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        {
-            auto self = s.getContext!(WrappedInstance);
@@ -256 +271 @@
-                }
-            }
-       
+
-            for(uint i = 0; i < numParams; i++)
-                args[i] = s.getParam(i);
@@ -268 +283 @@
-            {
-                typeString ~= s.getParam(0u).typeString();
-       
+
-                for(uint i = 1; i < numParams; i++)
-                    typeString ~= ", " ~ s.getParam(i).typeString();
-            }
-       
+
-            typeString ~= ")";
-
@@ -387 +402 @@
-Wrap a class method given an alias to the method (like A.foo).  To be used as a parameter to one of the class wrapping templates.
-*/
-, char[] name = NameOfFunc!(func), funcType = typeof(&func)
+
-{
-    const bool isMethod = true;
+    const char[] Name = NameOfFunc!(func);
-    alias func Func;
+    alias typeof(&func) FuncType;
+}
+
+/// ditto
+public struct WrapMethod(alias func, char[] name)
+{
+    const bool isMethod = true;
-    const char[] Name = name;
+    alias func Func;
+    alias typeof(&func) FuncType;
+}
+
+/// ditto
+public struct WrapMethod(alias func, funcType)
+{
+    const bool isMethod = true;
+    const char[] Name = NameOfFunc!(func);
+    alias func Func;
-    alias funcType FuncType;
-}
-
-/// ditto
-
-
-
+
+
+
+
+
+
-}
-
@@ -408 +444 @@
-or getter as appropriate based on how many parameters were passed to the MiniD method.
-*/
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-{
-    const bool isProperty = true;
@@ -441 +504 @@
-    static class Class : MDClass
-    {
-rivate
+ublic
-        {
-            if(typeid(StructType) in WrappedClasses)
@@ -447 +510 @@
-
-            WrappedClasses[typeid(StructType)] = this;
-dchar[] structName = utf.toUtf32
-
+const structName = ToUTF32!
+
-            super(structName, null);
-
-            //foreach(i, n; FieldNames!(StructType))
-            //  mFields[mixin("\"" ~ FieldNames!(StructType)[i] ~ "\"d")] = MDValue(StructType.init.tupleof[i]);
-
-            mMethods["opIndex"d] = MDValue(new MDClosure(mMethods, &getField, structName ~ ".opIndex"));
@@ -526 +586 @@
-                }
-            }
-
+
-            for(uint i = 0; i < numParams; i++)
-                args[i] = s.getParam(i);
@@ -542 +602 @@
-                    typeString ~= ", " ~ s.getParam(i).typeString();
-            }
-
+
-            typeString ~= ")";
-
-            s.throwRuntimeException("Parameter list {} passed to constructor does not match any wrapped constructors", typeString);
-        }
-
+
-        private int getField(MDState s, uint numParams)
-        {
@@ -656 +716 @@
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        }
-        else
-        {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-                {
-                    static if(is(ReturnTypeOf!(funcType) == void))
-                    {
-args[0 .. argNum]
+
-                        return 0;
-                    }
-                    else
-                    {
-args[0 .. argNum]
+
-                        return 1;
-                    }
-                }
-            }
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-
@@ -906 +969 @@
-        if(!v.canCastTo!(WrappedInstance))
-            return false;
-
+
-        return (cast(T)v.as!(WrappedInstance).inst) !is null;
-    }

trunk/minid/utils.d

@@ -706 +706 @@
-        alias QSort_greater!(Pred, List[0], List[2 .. $]) QSort_greater;
-}
+
+/**
+Convert string literals between unicode encodings at compile time.  I swear, this should be
+built into the compiler or something.
+*/
+public template ToUTF8(char[] s)
+{
+    const char[] ToUTF8 = s;
+}
+
+/// ditto
+public template ToUTF8(wchar[] s)
+{
+    const char[] ToUTF8 = mixin("\"" ~ s ~ "\"c");
+}
+
+/// ditto
+public template ToUTF8(dchar[] s)
+{
+    const char[] ToUTF8 = mixin("\"" ~ s ~ "\"c");
+}
+
+/// ditto
+public template ToUTF16(char[] s)
+{
+    const wchar[] ToUTF16 = mixin("\"" ~ s ~ "\"w");
+}
+
+/// ditto
+public template ToUTF16(wchar[] s)
+{
+    const wchar[] ToUTF16 = s;
+}
+
+/// ditto
+public template ToUTF16(dchar[] s)
+{
+    const wchar[] ToUTF16 = mixin("\"" ~ s ~ "\"w");
+}
+
+/// ditto
+public template ToUTF32(char[] s)
+{
+    const dchar[] ToUTF32 = mixin("\"" ~ s ~ "\"d");
+}
+
+/// ditto
+public template ToUTF32(wchar[] s)
+{
+    const dchar[] ToUTF32 = mixin("\"" ~ s ~ "\"d");
+}
+
+/// ditto
+public template ToUTF32(dchar[] s)
+{
+    const dchar[] ToUTF32 = s;
+}

trunk/samples/simple.md

@@ -23 +23 @@
-    local origin = Point(0.0, 0.0);
-    local white = Color(255, 255, 255);
+    local p1 = Point(100.0, 100.0);
-
-    while(!arc.input.keyDown(key.Quit) && !arc.input.keyDown(key.Esc))
@@ -30 +31 @@
-        arc.time.process();
-
-        col.a = (math.sin(((arc.time.getTime() % 1000) / 500.0) * math.pi) + 1) / 4.0 + 0.5;
-
-        local p = arc.input.mousePos();
-
-        font.draw(p.toString(), p, col);
-col.a
+p1.distance(p)
-        font.draw(toString(arc.time.fps()), Point(0.0, 16.0), white);
-
@@ -67 +66 @@
-    {
-        mX;
-
+
-        this()
-        {
@@ -79 +78 @@
-        }
-    }
-
+
-    class B : A
-    {
-        mY;
-
+
-        this()
-        {
-            mY = 10;
-
+
-            writefln("B ctor");
-            super();
-        }
-    }
-
+
-    class C : B
-    {

trunk/test.d

@@ -116 +116 @@
-                arc.font.Font,
-                WrapCtors!(void function(char[], int)),
-
+
+
+
+
+
+
+
-            )
-        )(ctx);
@@ -134 +140 @@
-                WrapMethod!(Point.minComponent),
-                WrapMethod!(Point.opNeg),
-
+
+
-                WrapMethod!(Point.scale),
-                // apply
@@ -140 +147 @@
-                WrapMethod!(Point.normalise, "normalize"),
-                WrapMethod!(Point.normaliseCopy, "normalizeCopy"),
-                // angle
-                WrapMethod!(Point.rotate),
+                WrapMethod!(Point.rotateCopy),
-                WrapMethod!(Point.abs),
-                WrapMethod!(Point.absCopy),
-// clamp
+WrapMethod!(Point.clamp),
-                WrapMethod!(Point.randomise, "randomize"),
-// distance, distanceSquared
-rotateCopy
+WrapMethod!(Point.distance),
+distanceSquared
-                WrapMethod!(Point.getX),
-                WrapMethod!(Point.getY),
@@ -154 +161 @@
-                WrapMethod!(Point.addX),
-                WrapMethod!(Point.addY)
+                // above, below, left, right
-            )
-        )(ctx);