# HG changeset patch # User Jacob Carlborg # Date 1282496009 -7200 # Node ID e944a4cf537bec6c8dbed09311b3eb2f4e0abac0 # Parent bacf7be144c44e669707717df6d730c495bc44d8 Updated to dmd 1.063 and Tango trunk. diff -r bacf7be144c4 -r e944a4cf537b base/src/java/beans/Introspector.d --- a/base/src/java/beans/Introspector.d Sun Nov 08 12:44:48 2009 +0100 +++ b/base/src/java/beans/Introspector.d Sun Aug 22 18:53:29 2010 +0200 @@ -14,12 +14,10 @@ static void flushCaches(){ implMissing(__FILE__, __LINE__); - return null; } static void flushFromCaches(Class clz){ implMissing(__FILE__, __LINE__); - return null; } static BeanInfo getBeanInfo(Class beanClass){ diff -r bacf7be144c4 -r e944a4cf537b base/src/java/io/ByteArrayOutputStream.d --- a/base/src/java/io/ByteArrayOutputStream.d Sun Nov 08 12:44:48 2009 +0100 +++ b/base/src/java/io/ByteArrayOutputStream.d Sun Aug 22 18:53:29 2010 +0200 @@ -20,7 +20,7 @@ public this (){ version(Tango){ - buffer = new Array(); + buffer = new Array(0); } else { // Phobos implMissing( __FILE__, __LINE__ ); } diff -r bacf7be144c4 -r e944a4cf537b base/src/java/io/File.d --- a/base/src/java/io/File.d Sun Nov 08 12:44:48 2009 +0100 +++ b/base/src/java/io/File.d Sun Aug 22 18:53:29 2010 +0200 @@ -10,11 +10,12 @@ static import tango.io.FilePath; static import tango.io.Path; static import tango.io.FileSystem; + static import tango.sys.Environment; } else { // Phobos static import std.file; static import std.path; } - +// Implement this more efficient by using FilePath in Tango public class File { public static char separatorChar; @@ -105,7 +106,7 @@ public String getAbsolutePath(){ version(Tango){ - return tango.io.FileSystem.FileSystem.toAbsolute( mFilePath ); + return (new tango.io.FilePath.FilePath(mFilePath)).absolute(tango.sys.Environment.Environment.cwd).toString; } else { // Phobos implMissing( __FILE__, __LINE__ ); return ""; diff -r bacf7be144c4 -r e944a4cf537b base/src/java/lang/Float.d --- a/base/src/java/lang/Float.d Sun Nov 08 12:44:48 2009 +0100 +++ b/base/src/java/lang/Float.d Sun Aug 22 18:53:29 2010 +0200 @@ -11,7 +11,7 @@ public static float NEGATIVE_INFINITY = ((-1.0f) / 0.0f); public static float NaN = (0.0f / 0.0f); public static float MAX_VALUE = 3.4028235e+38f; - public static float MIN_VALUE = 1.4e-45f; + public static float MIN_VALUE = float.min; //1.4e-45f public static int SIZE = 32; private float value; diff -r bacf7be144c4 -r e944a4cf537b base/src/java/lang/all.d --- a/base/src/java/lang/all.d Sun Nov 08 12:44:48 2009 +0100 +++ b/base/src/java/lang/all.d Sun Aug 22 18:53:29 2010 +0200 @@ -6,7 +6,7 @@ public import java.lang.Byte; public import java.lang.Character; public import java.lang.Class; -public import java.lang.ClassLoader; +//public import java.lang.ClassLoader; public import java.lang.Double; public import java.lang.Float; public import java.lang.Integer; @@ -14,14 +14,14 @@ public import java.lang.Math; public import java.lang.Number; public import java.lang.Runnable; -public import java.lang.SecurityManager; +//public import java.lang.SecurityManager; public import java.lang.Short; public import java.lang.String; public import java.lang.StringBuffer; public import java.lang.System; public import java.lang.Thread; public import java.lang.ThreadLocal; -public import java.lang.ThreadGroup; +//public import java.lang.ThreadGroup; public import java.lang.exceptions; public import java.lang.interfaces; diff -r bacf7be144c4 -r e944a4cf537b base/src/java/util/ArrayList.d --- a/base/src/java/util/ArrayList.d Sun Nov 08 12:44:48 2009 +0100 +++ b/base/src/java/util/ArrayList.d Sun Aug 22 18:53:29 2010 +0200 @@ -174,7 +174,6 @@ } public void add(String o){ implMissing( __FILE__, __LINE__ ); - return false; } public bool hasPrevious(){ return idx_next > 0; diff -r bacf7be144c4 -r e944a4cf537b base/src/java/util/Collections.d --- a/base/src/java/util/Collections.d Sun Nov 08 12:44:48 2009 +0100 +++ b/base/src/java/util/Collections.d Sun Aug 22 18:53:29 2010 +0200 @@ -76,7 +76,6 @@ } public void add(String o){ unsupported(); - return false; // make compiler happy } public bool hasNext(){ return it.hasNext(); @@ -129,7 +128,6 @@ } public void clear(){ unsupported(); - return false; // make compiler happy } public bool contains(Object o){ return list.contains(o); diff -r bacf7be144c4 -r e944a4cf537b base/src/java/util/Comparator.d --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/base/src/java/util/Comparator.d Sun Aug 22 18:53:29 2010 +0200 @@ -0,0 +1,7 @@ +module java.util.Comparator; + +interface Comparator +{ + //bool equals (Object obj); + int compare (Object o1, Object o2); +} diff -r bacf7be144c4 -r e944a4cf537b base/src/java/util/LinkedList.d --- a/base/src/java/util/LinkedList.d Sun Nov 08 12:44:48 2009 +0100 +++ b/base/src/java/util/LinkedList.d Sun Aug 22 18:53:29 2010 +0200 @@ -32,7 +32,6 @@ void add(int index, Object element){ version(Tango){ list.addAt(index,element); - return true; } else { // Phobos implMissing( __FILE__, __LINE__ ); } diff -r bacf7be144c4 -r e944a4cf537b base/src/java/util/zip/InflaterInputStream.d --- a/base/src/java/util/zip/InflaterInputStream.d Sun Nov 08 12:44:48 2009 +0100 +++ b/base/src/java/util/zip/InflaterInputStream.d Sun Aug 22 18:53:29 2010 +0200 @@ -6,7 +6,7 @@ import java.lang.all; import java.io.InputStream; version(Tango){ - import tango.io.compress.ZlibStream; + import tango.io.stream.Zlib; import tango.io.device.Conduit; version(Windows){ pragma(lib,"zlib.lib");