diff base/src/java/lang/util.d @ 121:dc6fc593e8d7

Update for dmd-2.054 and small fixes in java.lang.Character
author Denis Shelomovskij <verylonglogin.reg@gmail.com>
date Tue, 12 Jul 2011 11:59:58 +0300
parents 536e43f63c81
children
line wrap: on
line diff
--- a/base/src/java/lang/util.d	Sat Jul 09 15:50:20 2011 +0300
+++ b/base/src/java/lang/util.d	Tue Jul 12 11:59:58 2011 +0300
@@ -16,6 +16,7 @@
     static import core.exception;
     static import std.c.stdlib;
     static import std.stdio;
+    static import std.ascii;
     static import std.array;
     static import std.format;
     static import std.typetuple;
@@ -24,16 +25,6 @@
     alias std.c.stdlib.exit exit;
 }
 
-version(Tango){
-} else { // Phobos
-}
-version(Tango){
-} else { // Phobos
-}
-version(Tango){
-} else { // Phobos
-}
-
 interface IDwtLogger {
     void trace( String file, ulong line, String fmt, ... );
     void info( String file, ulong line, String fmt, ... );
@@ -168,7 +159,7 @@
                     if(f.length) {
                         string fres = "%";
                         try {
-                            if(std.ctype.isdigit(f[0])) {
+                            if(std.ascii.isDigit(f[0])) {
                                 int n = std.conv.parse!(int)(f);
                                 fres ~= std.conv.to!(string)(n + 1) ~ '$';
                             }
@@ -576,10 +567,10 @@
 }
 
 struct ImportData{
-    void[] data;
+    TryImmutable!(void)[] data;
     String name;
 
-    public static ImportData opCall( void[] data, String name ){
+    public static ImportData opCall( TryImmutable!(void)[] data, String name ){
         ImportData res;
         res.data = data;
         res.name = name;
@@ -588,5 +579,5 @@
 }
 
 template getImportData(String name) {
-    const ImportData getImportData = ImportData( cast(void[]) import(name), name );
+    const ImportData getImportData = ImportData( cast(TryImmutable!(void)[]) import(name), name );
 }
\ No newline at end of file