Changeset 305:a401002c3a1f

Timestamp:

09/07/08 19:43:08 (4 months ago)

Author:

Frank Benoit <benoit@tionex.de>

branch:

default

Message:

Sync with dwt-linux

Files:

• dwt/dwthelper/System.d (modified) (2 diffs)
• dwt/dwthelper/utils.d (modified) (19 diffs)

dwt/dwthelper/System.d

@@ -6 +6 @@
-import dwt.dwthelper.utils;
-
+import tango.sys.Environment;
-import tango.core.Exception;
+import tango.io.model.IFile : FileConst;
-import tango.time.Clock;
-import tango.stdc.stdlib : exit;
@@ -145 +147 @@
-    }
-
+    public static String getProperty( String key, String defval ){
+        String res = getProperty(key);
+        if( res ){
+            return res;
+        }
+        return defval;
+    }
-    public static String getProperty( String key ){
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-

dwt/dwthelper/utils.d

@@ -5 +5 @@
-
-public import dwt.dwthelper.System;
+public import dwt.dwthelper.Runnable;
-public import Math = tango.math.Math;
-
@@ -14 +15 @@
-static import tango.text.Util;
-static import tango.text.Text;
+static import tango.text.Ascii;
-import tango.text.Unicode;
-import tango.text.convert.Utf;
@@ -21 +23 @@
-import tango.util.log.Trace;
-import tango.text.UnicodeData;
-static import tango.util.collection.model.Seq;
-
-alias char[] String;
-alias tango.text.Text.Text!(char) StringBuffer;
+
+alias ArrayBoundsException ArrayIndexOutOfBoundsException;
-
-void implMissing( String file, uint line ){
@@ -125 +128 @@
-        return b ? TRUE : FALSE;
-    }
+    public static bool getBoolean(String name){
+        return tango.text.Ascii.icompare(System.getProperty(name, "false"), "true" ) is 0;
+    }
-}
-
@@ -146 +152 @@
-        super( value );
-    }
+
+    public static String toString( byte i ){
+        return tango.text.convert.Integer.toString(i);
+    }
+
-}
-alias Byte ValueWrapperByte;
@@ -278 +289 @@
-        return null;
-    }
+    public static double parseDouble(String s){
+        implMissing( __FILE__, __LINE__ );
+        return 0.0;
+    }
-}
-
@@ -561 +576 @@
-    return i;
-}
+dchar getRelativeCodePoint( String str, int startIndex, int searchRelCp ){
+    int dummy;
+    return getRelativeCodePoint( str, startIndex, dummy );
+}
-dchar getRelativeCodePoint( String str, int startIndex, int searchRelCp, out int relIndex ){
-    relIndex = getRelativeCodePointOffset( str, startIndex, searchRelCp );
@@ -603 +622 @@
-}
-
+class Character {
+    public static bool isUpperCase( dchar c ){
+        implMissing( __FILE__, __LINE__);
+        return false;
+    }
+    public static dchar toUpperCase( dchar c ){
+        dchar[] r = tango.text.Unicode.toUpper( [c] );
+        return r[0];
+    }
+    public static dchar toLowerCase( dchar c ){
+        dchar[] r = tango.text.Unicode.toLower( [c] );
+        return r[0];
+    }
+    public static bool isWhitespace( dchar c ){
+        return tango.text.Unicode.isWhitespace( c );
+    }
+    public static bool isDigit( dchar c ){
+        return tango.text.Unicode.isDigit( c );
+    }
+    public static bool isLetterOrDigit( dchar c ){
+        return isDigit(c) || isLetter(c);
+    }
+    public static bool isUnicodeIdentifierPart(char ch){
+        implMissing( __FILE__, __LINE__);
+        return false;
+    }
+    public static bool isUnicodeIdentifierStart(char ch){
+        implMissing( __FILE__, __LINE__);
+        return false;
+    }
+    public static bool isIdentifierIgnorable(char ch){
+        implMissing( __FILE__, __LINE__);
+        return false;
+    }
+    public static bool isJavaIdentifierPart(char ch){
+        implMissing( __FILE__, __LINE__);
+        return false;
+    }
+
+    this( char c ){
+        // must be correct for container storage
+        implMissing( __FILE__, __LINE__);
+    }
+}
+
+String new_String( String cont, int offset, int len ){
+    return cont[ offset .. offset+len ].dup;
+}
+String new_String( String cont ){
+    return cont.dup;
+}
+String String_valueOf( bool v ){
+    return v ? "true" : "false";
+}
+String String_valueOf( int v ){
+    return tango.text.convert.Integer.toString(v);
+}
+String String_valueOf( long v ){
+    return tango.text.convert.Integer.toString(v);
+}
+String String_valueOf( float v ){
+    return tango.text.convert.Float.toString(v);
+}
+String String_valueOf( double v ){
+    return tango.text.convert.Float.toString(v);
+}
+String String_valueOf( dchar v ){
+    return dcharToString(v);
+}
+String String_valueOf( char[] v ){
+    return v.dup;
+}
+String String_valueOf( char[] v, int offset, int len ){
+    return v[ offset .. offset+len ].dup;
+}
+String String_valueOf( Object v ){
+    return v is null ? "null" : v.toString();
+}
-bool CharacterIsDefined( dchar ch ){
-    return (ch in tango.text.UnicodeData.unicodeData) !is null;
@@ -616 +713 @@
-    return r[0];
-}
-
+
+
+
-dchar CharacterToLower( dchar c ){
-    dchar[] r = tango.text.Unicode.toLower( [c] );
@@ -636 +735 @@
-public String toUpperCase( String str ){
-    return tango.text.Unicode.toUpper( str );
+}
+
+public String replaceFirst( String str, String regex, String replacement ){
+    implMissing(__FILE__,__LINE__);
+    return str;
-}
-
@@ -677 +781 @@
-}
-
+public String replaceAll( String str, String regex, String replacement ){
+    implMissing(__FILE__,__LINE__);
+    return null;
+}
-public String replace( String str, char from, char to ){
-    return tango.text.Util.replace( str.dup, from, to );
@@ -705 +813 @@
-}
-
-w
-toString16( str )
+
+str
-}
-
@@ -753 +861 @@
-}
-
+/++
+ + This is like tango.stdc.stringz.toStringz, but in case of an empty input string,
+ + this function returns a pointer to a null value instead of a null ptr.
+ +/
-public char* toStringzValidPtr( String src ){
-    if( src ){
@@ -862 +974 @@
-    }
-}
+class ClassCastException : Exception {
+    this( String e = null ){
+        super(e);
+    }
+}
-
-interface Cloneable{
@@ -927 +1044 @@
-}
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-interface Writer{
@@ -1045 +1197 @@
-}
-
-
+/+
-    int idx;
-    foreach( e; s ){
@@ -1054 +1206 @@
-    }
-    return -1;
-
+
+
-int arrayIndexOf(T)( T[] arr, T v ){
-    int res = -1;
@@ -1068 +1221 @@
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
+// 
+// 
+// 
+// 
+// 
+// 
+// 
+// 
+// 
+// 
+// 
+// 
-
-void PrintStackTrace( int deepth = 100, String prefix = "trc" ){
@@ -1109 +1262 @@
-}
-
+interface CharSequence {
+    char           charAt(int index);
+    int             length();
+    CharSequence    subSequence(int start, int end);
+    String          toString();
+}
+
+class StringCharSequence : CharSequence {
+    private String str;
+    this( String str ){
+        this.str = str;
+    }
+    char           charAt(int index){
+        return str[index];
+    }
+    int             length(){
+        return str.length;
+    }
+    CharSequence    subSequence(int start, int end){
+        return new StringCharSequence( str[ start .. end ]);
+    }
+    String          toString(){
+        return str;
+    }
+}
+
+