Changeset 280:4ec36c3a04a3

Timestamp:

08/07/08 09:06:52 (4 months ago)

Author:

Frank Benoit <benoit@tionex.de>

branch:

default

Message:

sync with dwt-linux

Files:

• dwt/dwthelper/System.d (modified) (1 diff)
• dwt/dwthelper/WeakHashMap.d (modified) (2 diffs)
• dwt/dwthelper/utils.d (modified) (3 diffs)

dwt/dwthelper/System.d

@@ -148 +148 @@
-        switch( key ){
-        case "os.name": return "linux";
+        case "file.separator" : return ".";
-        default: return null;
-        }

dwt/dwthelper/WeakHashMap.d

@@ -1 +1 @@
-module dwt.dwthelper.WeakHashMap;
+
+
+private {
+    alias void delegate(Object) DisposeEvt;
+    extern (C) void  rt_attachDisposeEvent( Object obj, DisposeEvt evt );
+    extern (C) void  rt_detachDisposeEvent( Object obj, DisposeEvt evt );
+}
-
-
@@ -12 +19 @@
-            ptr = cast(size_t)cast(void*)k;
-        }
+        override hash_t toHash(){
+            return cast(hash_t)ptr;
+        }
+        override int opEquals( Object o ){
+            if( auto other = cast(Ref)o ){
+                return ptr is other.ptr;
+            }
+            return false;
+        }
+    }
+
+    private Ref unhookKey;
+
+    private void unhook(Object o) {
+        unhookKey.ptr = cast(size_t)cast(void*)o;
+        if( auto p = unhookKey in data ){
+            rt_detachDisposeEvent(o, &unhook);
+            data.remove( unhookKey );
+        }
-    }
-
-    Object[ Ref ] data;
+    ClassInfo gcLock;
+    this(){
+        unhookKey = new Ref(null);
+        gcLock = ClassInfo.find( "gcx.GCLock" );
+    }
-
-add
+put
-        auto k = new Ref(key);
+        rt_attachDisposeEvent(key, &unhook);
-        data[ k ] = element;
-    }
-Key
+
-        scope k = new Ref(key);
-
+
+
+
+
-    }
-    public Object get(Object key){

dwt/dwthelper/utils.d

@@ -846 +846 @@
-}
-
-interface Enumeration {
-    public bool hasMoreElements();
-    public Object nextElement();
-}
-
-
-template arraycast(T) {
-    T[] arraycast(U) (U[] u) {
@@ -895 +889 @@
-}
-
+String[] stringArrayFromObject( Object obj ){
+    if( auto wrapper = cast(ArrayWrapperString2)obj ){
+        return wrapper.array;
+    }
+    if( auto wrapper = cast(ArrayWrapperObject)obj ){
+        String[] res = new String[ wrapper.array.length ];
+        foreach( idx, o; wrapper.array ){
+            if( auto swrapper = cast(ArrayWrapperString) o ){
+                res[idx] = swrapper.array;
+            }
+        }
+        return res;
+    }
+    assert( obj is null ); // if not null, it was the wrong type
+    return null;
+}
+
+T[] arrayFromObject(T)( Object obj ){
+    if( auto wrapper = cast(ArrayWrapperObject)obj ){
+        T[] res = new T[ wrapper.array.length ];
+        foreach( idx, o; wrapper.array ){
+            res[idx] = cast(T)o;
+        }
+        return res;
+    }
+    assert( obj is null ); // if not null, it was the wrong type
+    return null;
+}
+
-
-bool ArrayEquals(T)( T[] a, T[] b ){
@@ -920 +943 @@
-    }
-    return true;
-}
-
-class Arrays{
-    public static bool equals(Object[] a, Object[] b){
-        if( a.length !is b.length ){
-            return false;
-        }
-        for( int i = 0; i < a.length; i++ ){
-            if( a[i] is null && b[i] is null ){
-                continue;
-            }
-            if( a[i] !is null && b[i] !is null && a[i] == b[i] ){
-                continue;
-            }
-            return false;
-        }
-        return true;
-    }
-}
-