Changeset 3779

Timestamp:

07/21/08 08:49:59 (5 months ago)

Author:

larsivi

Message:

Merging [3768]:[3778] into 0.99.7 release

Files:

• branches/next/0.99.7/dsss.conf (modified) (3 diffs)
• branches/next/0.99.7/install/windows/switch.d (modified) (3 diffs)
• branches/next/0.99.7/tango/io/model/IConduit.d (modified) (1 diff)
• branches/next/0.99.7/tango/text/convert/Layout.d (modified) (4 diffs)

branches/next/0.99.7/dsss.conf

@@ -11 +11 @@
-    $DSSS_BUILD -obj -explicit lib/common/tango/core/Exception.d -fintfc-file=tango/core/Exception.di ; \
-    $DSSS_BUILD -obj -explicit lib/common/tango/core/Memory.d -fintfc-file=tango/core/Memory.di ; \
-
-
+
-} else version (DigitalMars) {
-    prebuild = $DSSS_BUILD -obj -explicit lib/common/tango/core/BitManip.d -Hftango/core/BitManip.di ; \
@@ -33 +32 @@
-
-[tango/sys]
-win32/* tango/sys/
+
-exclude += tango/sys/TimeConverter.d
+exclude += tango/sys/win32/Type.di
+exclude += tango/sys/win32/UserGdi.di
+exclude += tango/sys/win32/Process.di
+exclude += tango/sys/win32/Macros.di
-
-version (linux) {
@@ -70 +73 @@
-[tango/time]
-
-
+
+
+
+
-
-[+std]
-preinstall = installdir std $INCLUDE_PREFIX/std

branches/next/0.99.7/install/windows/switch.d

@@ -26 +26 @@
-    {
-        if(useMessageBoxes)
-cast(ubyte*) toStringz(msg), cast(ubyte*)
+toStringz(msg),
-        else
-            printf("%s\n", toStringz(msg));
@@ -94 +94 @@
-        }
-        
-cast(ubyte*) toStringz(targetConf), cast(ubyte*)
-cast(ubyte*) toStringz(phobosConf), cast(ubyte*)
+toStringz(targetConf),
+toStringz(phobosConf),
-        
-cast(ubyte*) toStringz(phobosLib), cast(ubyte*)
+toStringz(phobosLib),
-            showMessage("Error: Could not find " ~ phobosLib);
-        else
@@ -111 +111 @@
-        }
-        
-cast(ubyte*) toStringz(targetConf), cast(ubyte*)
-cast(ubyte*) toStringz(tangoConf), cast(ubyte*)
+toStringz(targetConf),
+toStringz(tangoConf),
-        
-cast(ubyte*) toStringz(tangoLib), cast(ubyte*)
+toStringz(tangoLib),
-            showMessage("Error: Could not find " ~ tangoLib);
-        else

branches/next/0.99.7/tango/io/model/IConduit.d

@@ -13 +13 @@
-
-module tango.io.model.IConduit;
-
-public import tango.io.model.IBuffer;
-
-/*******************************************************************************

branches/next/0.99.7/tango/text/convert/Layout.d

@@ -15 +15 @@
-
-        Layout can be customized via configuring various handlers and
-e
+a
-        for handling custom formats, date/time and culture-specific
-        conversions.
@@ -33 +33 @@
-private import  Float  = tango.text.convert.Float,
-                Integer = tango.text.convert.Integer;
+
+private import  tango.io.model.IConduit : OutputStream;
-
-/*******************************************************************************
@@ -144 +146 @@
-        {
-                return convert (sink, _arguments, _argptr, formatStr);
+        }
+
+        /**********************************************************************
+
+            Tentative convert using an OutputStream as sink - may still be
+            removed.
+
+            Since: 0.99.7
+
+        **********************************************************************/
+
+        public final uint convert (OutputStream output, T[] formatStr, ...)
+        {
+                return convert (cast(Sink) &output.write, _arguments, _argptr, formatStr);
-        }
-
@@ -901 +917 @@
-                auto layout = new Layout!(char);
-
+                layout.convert (Cout.stream, "hi {}", "there\n");
+
-                Cout (layout.sprint (new char[1], "hi")).newline;
-                Cout (layout.sprint (new char[10], "{.4}", "hello")).newline;