Changeset 853

Timestamp:

10/11/08 00:56:40 (16 years ago)

Author:

sean

Message:

This commit includes all the changes necessary for Phobos to run against druntime. Here is a sucinct list of the changes made:

• Removed gcstats. Garbage collector statistics will be avaialable in durintime's 'memory' module.
  
• Removed object.d. This module is replaced by the object.d provided by druntime.
  
• Removed std.array. To trap an array bounds error, import 'exception' from druntime and catch ArrayBoundsException?.
  
• Removed std.asserterror. To trap an asertion failure, import 'exception' from druntime and catch AssertException?.
  
• Removed std.gc. To interact with the garbage collector, import 'memory' from druntime.
  
• Removed std.hiddenfunc. No equivalent exception is currently exposed by druntime, but if one is exposed it will be called HiddenFuncException? and be declared in 'exception'.
  
• Removed std.moduleinit. druntime declares ModuleInfo? in object.d, so it is implicitly availble without importing.
  
• Removed std.outofmemory. To trap an out of memory error, import 'exception' from druntime and catch OutOfMemoryException?.
  
• Removed std.switcherr. To trap a switch error, import 'exception' from druntime and catch SwitchException?.
  
• Removed std.synchro. This functionality will exist within druintime.
  
• Removed std.thread. A Thread class is available within druntime's 'thread' module. An interface comparison will be provided separately.
  
• Removed std.typeinfo. The classes defined in this package are for runtime use and should not be visible to the user.
  

The prior version of Phobos has been archived in tags/phobos-2.019 if needed.

Files:

• trunk/phobos/etc/gamma.d (modified) (1 diff)
• trunk/phobos/gcstats.d (deleted)
• trunk/phobos/internal (deleted)
• trunk/phobos/linux.mak (modified) (4 diffs)
• trunk/phobos/object.d (deleted)
• trunk/phobos/std/array.d (deleted)
• trunk/phobos/std/asserterror.d (deleted)
• trunk/phobos/std/c/stdio.d (modified) (1 diff)
• trunk/phobos/std/encoding.d (modified) (2 diffs)
• trunk/phobos/std/file.d (modified) (3 diffs)
• trunk/phobos/std/gc.d (deleted)
• trunk/phobos/std/hiddenfunc.d (deleted)
• trunk/phobos/std/md5.d (modified) (1 diff)
• trunk/phobos/std/moduleinit.d (deleted)
• trunk/phobos/std/outbuffer.d (modified) (2 diffs)
• trunk/phobos/std/outofmemory.d (deleted)
• trunk/phobos/std/path.d (modified) (2 diffs)
• trunk/phobos/std/random.d (modified) (1 diff)
• trunk/phobos/std/signals.d (modified) (3 diffs)
• trunk/phobos/std/socket.d (modified) (1 diff)
• trunk/phobos/std/stdio.d (modified) (5 diffs)
• trunk/phobos/std/string.d (modified) (2 diffs)
• trunk/phobos/std/switcherr.d (deleted)
• trunk/phobos/std/synchro.d (deleted)
• trunk/phobos/std/thread.d (deleted)
• trunk/phobos/std/typeinfo (deleted)
• trunk/phobos/std/variant.d (modified) (1 diff)
• trunk/phobos/unittest.d (modified) (1 diff)
• trunk/phobos/win32.mak (modified) (11 diffs)

trunk/phobos/etc/gamma.d

@@ -407 +407 @@
-    q = ( x - 0.5L ) * log(x) - x + LOGSQRT2PI;
-    if (x > 1.0e10L) return q;
-    real p = 1.0L/(x*x);
-    q += poly( p, logGammaStirlingCoeffs ) / x;
-    return q ;
-}
-
-unittest
-{
-    // return true if x is +0.0
-it
+ool
-    {
-       return (x==0) && (signbit(x)==0);
-    }
-
-    assert(isnan(lgamma(real.nan)));
-    assert(lgamma(real.infinity) == real.infinity);
-    assert(lgamma(-1.0) == real.infinity);
-    assert(lgamma(0.0) == real.infinity);
-    assert(isPosZero(lgamma(1.0L)));
-    assert(isPosZero(lgamma(2.0L)));

trunk/phobos/linux.mak

@@ -83 +83 @@
-    DFLAGS := $(DFLAGS) -O -release
-    OBJDIR = none
-endif
-
-ifndef OBJDIR
-    $(error Cannot make $(MAKECMDGOALS). Please make either all,    \
-debug, release, unittest/debug, unittest/release, clean, or html)
-endif
-
-ifneq (none,$(OBJDIR))
-
-
+
-endif
-
-LIB=$(OBJDIR)/libphobos2.$(LIBEXT)
-DOC_OUTPUT_DIR=../web/phobos
-
-.SUFFIXES: .d
-$(OBJDIR)/%.$(OBJEXT) : %.c
-    $(CC) -c $(CFLAGS) -o$@ $<
-
-$(OBJDIR)/%.$(OBJEXT) : %.cpp
@@ -131 +130 @@
-endif
-ifeq (release,$(MAKECMDGOALS))
-    ln -sf `pwd`/$(OBJDIR)/libphobos2.$(LIBEXT) ../../lib
-endif
-
-$(OBJDIR)/unittest.$(OBJEXT) : unittest.d all_std_modules_generated.d
-
-all_std_modules_generated.d : $(MAKEFILE_LIST)
-    for m in $(STD_MODULES); do echo public import std.$$m\;; done > $@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-        bitmanip boxer compiler complex contracts conv cover cpuid  \
-        cstream ctype date dateparse demangle encoding file format  \
-hiddenfunc intrinsic iterator loader math   
-moduleinit numeric openrj outbuffer 
-outofmemory path perf process random regexp signals socket 
-witcherr syserror 
-nchro system thread traits typecons typetuple uni uri utf
+intrinsic iterator loader math          
+numeric openrj outbuffer                    
+path perf process random regexp signals socket                 
+yserror           
+stem traits typecons typetuple uni uri utf               
-        variant xml zip zlib
- gc
+
-
-STD_C_MODULES = stdarg stdio
-STD_C_MODULES_NOTBUILT = fenv math process stddef stdlib string time locale \
-    wcharh
-
-STD_C_LINUX_MODULES = linux socket
-STD_C_LINUX_MODULES_NOTBUILT = linuxextern pthread termios
-
-STD_C_WINDOWS_MODULES_NOTBUILT = windows com winsock stat
-
@@ -200 +182 @@
-    win32.mak zconf.h zconf.in.h zlib.3 zlib.h zutil.c zutil.h
-SRC_ZLIB := $(addprefix etc/c/zlib/,$(SRC_ZLIB))
-
-SRC_DOCUMENTABLES = phobos.d $(addprefix std/, $(addsuffix .d,      \
-    $(STD_MODULES) $(STD_MODULES_NOTBUILT))) $(addprefix std/c/,    \
-    $(addsuffix .d, $(STD_C_MODULES) $(STD_C_MODULES_NOTBUILT)))    \
-    $(addprefix std/c/linux/,$(addsuffix .d,            \
-    $(STD_C_LINUX_MODULES) $(STD_C_LINUX_MODULES_NOTBUILT)))
-
-SRC_RELEASEZIP = linux.mak win32.mak phoboslicense.txt $(SRC)       \
-
-
-
-
-
-
-
+
-    $(STD_MODULES_NOTBUILT))) $(addprefix std/c/, $(addsuffix .d,   \
-    $(STD_C_MODULES) $(STD_C_MODULES_NOTBUILT))) $(addprefix    \
-    std/c/linux/, $(addsuffix .d, $(STD_C_LINUX_MODULES)        \
-    $(STD_C_LINUX_MODULES_NOTBUILT))) $(addprefix std/c/windows/,   \
-    $(addsuffix .d, $(STD_C_WINDOWS_MODULES_NOTBUILT)))     \
-
-
+
-    .d, $(STD_WINDOWS_MODULES_NOTBUILT))) $(addprefix etc/,     \
-    $(addsuffix .d, $(ETC_MODULES_NOTBUILT))) $(addprefix etc/c/,   \
-    $(addsuffix .d, $(ETC_C_MODULES)))
-
-
-
-
-
+
-
-OBJS := $(addsuffix .$(OBJEXT),$(addprefix $(OBJDIR)/,$(OBJS)))
-
-
-
+
-$(STD_C_MODULES)) $(addprefix std/c/linux/, $(STD_C_LINUX_MODULES)) \
-$(addprefix etc/c/, $(ETC_C_MODULES))
-
-SRC2LIB := $(addsuffix .d,$(SRC2LIB))
-
-$(LIB) : $(SRC2LIB) $(OBJS) $(MAKEFILE_LIST)
-    @echo $(DMD) $(DFLAGS) -lib -of$@ "[...tons of files...]"
-    @$(DMD) $(DFLAGS) -lib -of$@ $(SRC2LIB) $(OBJS)
-
-###########################################################
@@ -267 +238 @@
-zip : $(SRC_RELEASEZIP)
-    $(RM) phobos.zip
-    zip phobos $(SRC_RELEASEZIP)
-
-clean:
-    $(RM) libphobos2.$(LIBEXT) all_std_modules_generated.d
-    $(RM) -r $(DOC_OUTPUT_DIR) obj
-
-
-HEADERDIR = include
-
-
+
-    $(addprefix std/,$(addsuffix .d,$(STD_MODULES_NOTBUILT))) \
-    $(addprefix std/c/,$(addsuffix .d,$(STD_C_MODULES))) \
-    $(addprefix std/c/,$(addsuffix .d,$(STD_C_MODULES_NOTBUILT))) \
-    $(addprefix std/c/linux/,$(addsuffix .d,$(STD_C_LINUX_MODULES))) \
-    $(addprefix std/c/linux/,$(addsuffix .d,$(STD_C_LINUX_MODULES_NOTBUILT))) 
-
-HEADERS := $(addprefix $(HEADERDIR)/,$(HEADERS))
-
-$(HEADERDIR)/%.d : %.d
-    $(DMD) -I$(dir $<) -o- -c -H $(DFLAGS) -Hf$@ $<

trunk/phobos/std/c/stdio.d

@@ -188 +188 @@
-int  fflush(FILE *);    ///
-int  fclose(FILE *);    ///
-int  fputs(in char *,FILE *);   ///
-char *   gets(char *);  ///
-int  fputc(int,FILE *); ///
-int  _fputchar(int);    ///
-int  puts(in char *);   ///
-int  ungetc(int,FILE *);    ///
-size_t   fread(void *,size_t,size_t,FILE *);    ///
-size_t   fwrite(in void *,size_t,size_t,FILE *);    ///
-//
+
-int  fprintf(FILE *,in char *,...); ///
-int  vfprintf(FILE *,in char *,va_list);    ///
-int  vprintf(in char *,va_list);    ///
-int  sprintf(char *,in char *,...); ///
-int  vsprintf(char *,in char *,va_list);    ///
-int  scanf(in char *,...);  ///
-int  fscanf(FILE *,in char *,...);  ///
-int  sscanf(char *,in char *,...);  ///
-void     setbuf(FILE *,char *); ///
-int  setvbuf(FILE *,char *,int,size_t); ///

trunk/phobos/std/encoding.d

@@ -2066 +2066 @@
-     * {
-     *     static this()
-     *     {
-     *         EncodingScheme.register("path.to.Amiga1251");
-     *     }
-     * }
-     * ----------------------------------------------
-     */
-    static void register(string className)
-    {
-Object.factory(className
+ClassInfo.find(className).create(
-        if (scheme is null)
-            throw new EncodingException("Unable to create class "~className);
-        foreach(encodingName;scheme.names())
-        {
-            supported[tolower(encodingName)] = className;
-        }
-    }
-
-    /**
-     * Obtains a subclass of EncodingScheme which is capable of encoding
@@ -2093 +2093 @@
-     * ---------------------------------------------------
-     * auto scheme = EncodingScheme.create("Amiga-1251");
-     * ---------------------------------------------------
-     */
-    static EncodingScheme create(string encodingName)
-    {
-        auto p = std.string.tolower(encodingName) in supported;
-        if (p is null)
-            throw new EncodingException("Unrecognized Encoding: "~encodingName);
-        string className = *p;
-Object.factory(className
+ClassInfo.find(className).create(
-        if (scheme is null) throw new EncodingException("Unable to create class "~className);
-        return scheme;
-    }
-
-    const
-    {
-        /**
-         * Returns the standard name of the encoding scheme
-         */
-        abstract override string toString();

trunk/phobos/std/file.d

@@ -30 +30 @@
- *     in a product, an acknowledgment in the product documentation would be
- *     appreciated but is not required.
- *  o  Altered source versions must be plainly marked as such, and must not
- *     be misrepresented as being the original software.
- *  o  This notice may not be removed or altered from any source
- *     distribution.
- */
-
-module std.file;
-
+private import memory;
-private import std.c.stdio;
-private import std.c.stdlib;
-private import std.path;
-private import std.string;
-private import std.regexp;
-private import std.gc;
-private import std.c.string;
-private import std.traits;
-private import std.conv;
-private import std.contracts;
-private import std.utf;
-version (unittest) {
-    private import std.stdio; // for testing only
-}
-
-/* =========================== Win32 ======================= */
@@ -124 +124 @@
-        FILE_ATTRIBUTE_NORMAL | FILE_FLAG_SEQUENTIAL_SCAN,cast(HANDLE)null);
-    }
-
-    if (h == INVALID_HANDLE_VALUE)
-    goto err1;
-
-    auto size = GetFileSize(h, null);
-    if (size == INVALID_FILE_SIZE)
-    goto err2;
-
-
-
-
+
-
-    if (ReadFile(h,buf.ptr,size,&numread,null) != 1)
-    goto err2;
-
-    if (numread != size)
-    goto err2;
-
-    if (!CloseHandle(h))
-    goto err;
-
@@ -947 +945 @@
-void[] read(string name)
-{
-    invariant fd = std.c.linux.linux.open(toStringz(name), O_RDONLY);
-    cenforce(fd != -1, name);
-    scope(exit) std.c.linux.linux.close(fd);
-
-    struct_stat statbuf = void;
-    cenforce(std.c.linux.linux.fstat(fd, &statbuf) == 0, name);
-    invariant size = statbuf.st_size;
-    if (!size) return null;
-std.gc.malloc(size
+GC.malloc(size, GC.BlkAttr.NO_SCAN
-    enforce(buf, "Out of memory");
-    scope(failure) delete buf;
-    std.gc.hasNoPointers(buf.ptr);
-
-    cenforce(std.c.linux.linux.read(fd, buf.ptr, size) == size, name);
-
-    return buf[0 .. size];
-}
-
-/********************************************
- * Read and validates (using $(XREF utf, validate)) a text file. $(D
- * S) can be a type of array of characters of any width and constancy.
- *

trunk/phobos/std/md5.d

@@ -81 +81 @@
-These notices must be retained in any copies of any part of this
-documentation and/or software.
- */
-
-module std.md5;
-
-//debug=md5;        // uncomment to turn on debugging printf's
-
-import std.string;
-import std.contracts;
+import std.c.stdio : printf;
-
-/***************************************
- * Computes MD5 digest of several arrays of data.
- */
-
-void sum(ubyte[16] digest, in void[][] data...)
-{
-    MD5_CTX context;
-    context.start();
-    foreach (datum; data)

trunk/phobos/std/outbuffer.d

@@ -11 +11 @@
- *  www.digitalmars.com
- */
-
-
-// Written by Walter Bright
-
-module std.outbuffer;
-
-private
-{
+    import memory;
-    import std.string;
-    import std.gc;
-    import std.c.stdio;
-    import std.c.stdlib;
-    import std.c.stdarg;
-}
-
-/*********************************************
- * OutBuffer provides a way to build up an array of bytes out
- * of raw data. It is useful for things like preparing an
- * array of bytes to write out to a file.
- * OutBuffer's byte order is the format native to the computer.
@@ -73 +73 @@
-    out
-    {
-        assert(offset + nbytes <= data.length);
-    }
-    body
-    {
-        //c.stdio.printf("OutBuffer.reserve: length = %d, offset = %d, nbytes = %d\n", data.length, offset, nbytes);
-        if (data.length < offset + nbytes)
-        {
-        data.length = (offset + nbytes) * 2;
-std.gc.hasPointers(data.ptr
+GC.clrAttr(data.ptr, GC.BlkAttr.NO_SCAN
-        }
-    }
-
-    /*************************************
-     * Append data to the internal buffer.
-     */
-
-    void write(const(ubyte)[] bytes)
-    {
-        reserve(bytes.length);

trunk/phobos/std/path.d

@@ -27 +27 @@
-//private import std.stdio;
-
-private import std.string;
-private import std.file;
-private import std.contracts;
-
-version(linux)
-{
-    private import std.c.stdlib;
-    private import std.c.linux.linux;
-std.outofmemory
+exception : onOutOfMemoryError
-}
-
-version(Windows)
-{
-
-    /** String used to separate directory names in a path. Under
-     *  Windows this is a backslash, under Linux a slash. */
-    invariant char[1] sep = "\\";
-    /** Alternate version of sep[] used in Windows (a slash). Under
-     *  Linux this is empty. */
@@ -1250 +1250 @@
-    path = combineCPathWithDPath(result.pw_dir, path, last_char);
-
-Lnotfound:
-    std.c.stdlib.free(extra_memory);
-    return path;
-
-Lerror:
-    // Errors are going to be caused by running out of memory
-    if (extra_memory)
-    std.c.stdlib.free(extra_memory);
-_d_OutOfMemory
+onOutOfMemoryError
-    return null;
-}
-
-}

trunk/phobos/std/random.d

@@ -459 +459 @@
-auto n = rnd.next;
-...
-----   
-*/
-
-uint unpredictableSeed()
-{
-    static bool seeded;
-    static MinstdRand0 rand;
-    if (!seeded) {
-
+cast(uint)
-        seeded = true;
-    }
-    return cast(uint) (getUTCtime ^ rand.next);
-}
-
-unittest
-{
-    // not much to test here
-    auto a = unpredictableSeed;
-    static assert(is(typeof(a) == uint));

trunk/phobos/std/signals.d

@@ -51 +51 @@
- *  SIGNALS=signals
- * Copyright:
- *  Public Domain
- * Author: Walter Bright, Digital Mars, www.digitalmars.com
- */
-
-module std.signals;
-
-import std.stdio;
-import std.c.stdlib : calloc, realloc, free;
-std.outofmemory : _d_OutOfMemory
+exception : onOutOfMemoryError
-
-// Special function for internal use only.
-// Use of this is where the slot had better be a delegate
-// to an object or an interface that is part of an object.
-extern (C) Object _d_toObject(void* p);
-
+// Used in place of Object.notifyRegister and Object.notifyUnRegister.
+alias void delegate(Object) DisposeEvt;
+extern (C) void  rt_attachDisposeEvent( Object obj, DisposeEvt evt );
+extern (C) void  rt_detachDisposeEvent( Object obj, DisposeEvt evt );
-//debug=signal;
-
-/************************
- * Mixin to create a signal within a class object.
- *
- * Different signals can be added to a class by naming the mixins.
- *
- * Example:
----
-import std.signals;
@@ -163 +167 @@
-     * but use malloc() and friends instead
-     */
-    auto len = slots.length;
-    if (slots_idx == len)
-    {
-        if (slots.length == 0)
-        {
-        len = 4;
-        auto p = std.signals.calloc(slot_t.sizeof, len);
-        if (!p)
-std.signals._d_OutOfMemory
+onOutOfMemoryError
-        slots = (cast(slot_t*)p)[0 .. len];
-        }
-        else
-        {
-        len = len * 2 + 4;
-        auto p = std.signals.realloc(slots.ptr, slot_t.sizeof * len);
-        if (!p)
-std.signals._d_OutOfMemory
+onOutOfMemoryError
-        slots = (cast(slot_t*)p)[0 .. len];
-        slots[slots_idx + 1 .. length] = null;
-        }
-    }
-    slots[slots_idx++] = slot;
-
-     L1:
-    Object o = _d_toObject(slot.ptr);
-o.notifyRegister(
+rt_attachDisposeEvent(o, 
-    }
-
-    /***
-     * Remove a slot from the list of slots to be called when emit() is called.
-     */
-    void disconnect( slot_t slot)
-    {
-    debug (signal) writefln("Signal.disconnect(slot)");
-    for (size_t i = 0; i < slots_idx; )
-    {
-        if (slots[i] == slot)
-        {   slots_idx--;
-        slots[i] = slots[slots_idx];
-        slots[slots_idx] = null;    // not strictly necessary
-
-        Object o = _d_toObject(slot.ptr);
-o.notifyUnRegister(
+rt_detachDisposeEvent(o, 
-        }
-        else
-        i++;
-    }
-    }
-
-    /* **
-     * Special function called when o is destroyed.
-     * It causes any slots dependent on o to be removed from the list
-     * of slots to be called by emit().
@@ -240 +244 @@
-     * When this object is destroyed, need to let every slot
-     * know that this object is destroyed so they are not left
-     * with dangling references to it.
-     */
-    if (slots)
-    {
-        foreach (slot; slots[0 .. slots_idx])
-        {
-        if (slot)
-        {   Object o = _d_toObject(slot.ptr);
-o.notifyUnRegister(
+rt_detachDisposeEvent(o, 
-        }
-        }
-        std.signals.free(slots.ptr);
-        slots = null;
-    }
-    }
-
-  private:
-    slot_t[] slots;     // the slots to call from emit()
-    size_t slots_idx;       // used length of slots[]

trunk/phobos/std/socket.d

@@ -31 +31 @@
- * Example: See /dmd/samples/d/listener.d.
- * Authors: Christopher E. Miller 
- * Macros:
- *  WIKI=Phobos/StdSocket
- */
-
-module std.socket;
-
-private import std.string, std.stdint, std.c.string, std.c.stdlib;
-
+version(unittest)
+{
+    private import std.c.stdio : printf;
+}
+
-
-version(linux)
-{
-    version = BsdSockets;
-}
-
-version(Win32)
-{
-
-    pragma (lib, "ws2_32.lib");

trunk/phobos/std/stdio.d

@@ -17 +17 @@
-Alexandrescu)
- * 
- * Macros:
- *  WIKI=Phobos/StdStdio
- */
-
-module std.stdio;
-
-public import std.c.stdio;
-
+import memory;
-import std.format;
-import std.utf;
-import std.string;
-import std.gc;
-import std.c.stdlib;
-import std.c.string;
-import std.c.stddef;
-import std.conv;
-import std.traits;
-import std.contracts;
-import std.file;
-import std.typetuple;
-
-version (DigitalMars)
@@ -560 +560 @@
-            c = ((c - 0xD7C0) << 10) + (c2 - 0xDC00);
-            }
-            std.utf.encode(buf, c);
-        }
-        }
-        if (ferror(fp))
-        StdioException();
-        return buf.length;
-    }
-
-std.gc.capacity
+GC.sizeOf
-    //auto sz = buf.length;
-    buf = buf.ptr[0 .. sz];
-    if (fp._flag & _IONBF)
-    {
-        /* Use this for unbuffered I/O, when running
-         * across buffer boundaries, or for any but the common
-         * cases.
-         */
-        L1:
-        char *p;
-
-        if (sz)
-        {
-        p = buf.ptr;
-        }
-        else
-        {
-        sz = 64;
-
-
+
-        buf = p[0 .. sz];
-        }
-        size_t i = 0;
-        for (int c; (c = FGETC(fp)) != -1; )
-        {
-        if ((p[i] = c) != terminator)
-        {
-            i++;
-            if (i < sz)
-            continue;
@@ -637 +636 @@
-            goto L1;
-            }
-            else
-            {   if (i != u && p[i] == terminator)
-                break;
-            goto L1;
-            }
-        }
-        if (i > sz)
-        {
-
-
+
-        }
-        if (i - 1)
-            memcpy(buf.ptr, p, i - 1);
-        buf[i - 1] = terminator;
-        buf = buf[0 .. i];
-        if (terminator == '\n' && c == '\r')
-            i++;
-        }
-        else
-        {
@@ -660 +658 @@
-        {
-            if (i == u)     // if end of buffer
-            goto L1;    // give up
-            auto c = p[i];
-            i++;
-            if (c == terminator)
-            break;
-        }
-        if (i > sz)
-        {
-
-
+
-        }
-        memcpy(buf.ptr, p, i);
-        buf = buf[0 .. i];
-        }
-        fp._cnt -= i;
-        fp._ptr += i;
-        return i;
-    }
-    }
-    else version (GCC_IO)
@@ -741 +738 @@
-             size_t n = 0;
-             auto s = getdelim(&lineptr, &n, terminator, fp);
-             scope(exit) free(lineptr);
-             if (s < 0)
-             {
-                 if (ferror(fp))
-                     StdioException();
-                 buf.length = 0;        // end of file
-                 return 0;
-             }
-std.gc.capacity
+GC.sizeOf
-             if (s <= buf.length)
-             {
-                 buf.length = s;
-                 buf[] = lineptr[0 .. s];
-             }
-             else
-             {
-                 buf = lineptr[0 .. s].dup;
-             }
-             return s;

trunk/phobos/std/string.d

@@ -32 +32 @@
-//debug=string;     // uncomment to turn on debugging printf's
-
-private import std.algorithm;
-private import std.stdio;
-private import std.c.stdio;
-private import std.c.stdlib;
-private import std.c.string;
-private import std.utf;
-private import std.encoding;
-private import std.uni;
-private import std.array;
-private import std.format;
-private import std.ctype;
-private import std.stdarg;
-private import std.contracts;
-private import std.typetuple;
-private import std.conv;
-private import std.traits;
+private import exception : onArrayBoundsError;
-
-extern (C)
-{
-
-    size_t wcslen(in wchar *);
-    int wcscmp(in wchar *, in wchar *);
-}
-
-/* ************* Exceptions *************** */
-
@@ -3036 +3036 @@
- * Returns: s
- */
-char[] sformat(char[] s, ...)
-{   size_t i;
-
-    void putc(dchar c)
-    {
-    if (c <= 0x7F)
-    {
-        if (i >= s.length)
-throw new 
+on
-        s[i] = cast(char)c;
-        ++i;
-    }
-    else
-    {   char[4] buf;
-        auto b = std.utf.toUTF8(buf, c);
-        if (i + b.length > s.length)
-throw new 
+on
-        s[i..i+b.length] = b[];
-        i += b.length;
-    }
-    }
-
-    std.format.doFormat(&putc, _arguments, _argptr);
-    return s[0 .. i];
-}
-
-

trunk/phobos/std/variant.d

@@ -76 +76 @@
- *     in a product, an acknowledgment in the product documentation would be
- *     appreciated but is not required.
- *  o  Altered source versions must be plainly marked as such, and must not
- *     be misrepresented as being the original software.
- *  o  This notice may not be removed or altered from any source
- *     distribution.
- */
-
-module std.variant;
-
-, std.gc
+
-import std.stdio; // for testing only
-import std.contracts; // for testing only
-
-private template maxSize(T...)
-{
-    static if (T.length == 1)
-    {
-        static const size_t maxSize = T[0].sizeof;
-    }
-    else

trunk/phobos/unittest.d

@@ -18 +18 @@
- *  o  Altered source versions must be plainly marked as such, and must not
- *     be misrepresented as being the original software.
- *  o  This notice may not be removed or altered from any source
- *     distribution.
- */
-
-// This test program pulls in all the library modules in order
-// to run the unit tests on them.
-// Then, it prints out the arguments passed to main().
-
-public import std.array;
-public import std.asserterror;
-public import std.base64;
-public import std.bind;
-public import std.bitarray;
-public import std.boxer;
-public import std.compiler;
-public import std.contracts;
-public import std.conv;
-public import std.cover;
-public import std.cpuid;
-public import std.cstream;
-public import std.ctype;
-public import std.date;
-public import std.dateparse;
-public import std.demangle;
-public import std.file;
-public import std.format;
-public import std.gc;
-public import std.getopt;
-public import std.hiddenfunc;
-public import std.intrinsic;
-public import std.loader;
-public import std.math;
-public import std.md5;
-public import std.metastrings;
-public import std.mmfile;
-public import std.moduleinit;
-public import std.openrj;
-public import std.outbuffer;
-public import std.outofmemory;
-public import std.path;
-public import std.perf;
-public import std.process;
-public import std.random;
-public import std.regexp;
-public import std.signals;
-//public import std.slist;
-public import std.socket;
-public import std.socketstream;
-public import std.stdint;
-public import std.stdio;
-public import std.stream;
-public import std.string;
-public import std.switcherr;
-public import std.syserror;
-public import std.system;
-public import std.thread;
-public import std.traits;
-public import std.typetuple;
-public import std.uni;
-public import std.uri;
-public import std.utf;
-public import std.variant;
-public import std.zip;
-public import std.zlib;
-
-int main(char[][] args)

trunk/phobos/win32.mak

@@ -63 +63 @@
-
-.cpp.obj:
-    $(CC) -c $(CFLAGS) $*
-
-.d.obj:
-    $(DMD) -c $(DFLAGS) $*
-
-.asm.obj:
-    $(CC) -c $*
-
- gcstub.obj
+
-
-test : test.exe
-
-test.obj : test.d
-    $(DMD) -c test -g -unittest
-
-test.exe : test.obj phobos.lib
-    $(DMD) test.obj -g -L/map
-
-
-
-
-
+
-    oldsyserror.obj \
-    errno.obj \
-
-
+
-
-#   ti_bit.obj ti_Abit.obj
-
-SRCS= std\math.d std\stdio.d std\dateparse.d std\date.d std\uni.d std\string.d \
-    std\atomics.d std\base64.d std\md5.d std\xml.d std\bigint.d std\regexp.d \
-    std\compiler.d std\cpuid.d std\format.d std\demangle.d \
-    std\path.d std\file.d std\outbuffer.d std\utf.d std\uri.d \
-array.d std\
+
-    std\bitarray.d std\algorithm.d std\numeric.d std\functional.d \
-hiddenfunc.d std\
+
-    std\signals.d std\typetuple.d std\traits.d std\bind.d \
-std\switcherr.d 
-thread.d std\synchro.d std\moduleinit.d std\
-asserterror.d std\outofmemory.d std\
+
+
+
-    std\iterator.d std\encoding.d std\variant.d \
-    std\stream.d std\socket.d std\socketstream.d \
-std\cover.d 
+
-    std\zip.d std\cstream.d std\loader.d \
-
-
-
-
-
-
-
-
+
-    etc\gamma.d \
-    std\c\stdarg.d \
-    std\c\windows\com.d \
-    std\c\windows\stat.d \
-    std\c\windows\windows.d \
-    std\c\windows\winsock.d \
-    std\windows\charset.d \
-    std\windows\iunknown.d \
-    std\windows\registry.d \
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
-DOCS=   $(DOC)\std_path.html $(DOC)\std_math.html $(DOC)\std_outbuffer.html \
-    $(DOC)\std_stream.html $(DOC)\std_string.html $(DOC)\std_base64.html \
-    $(DOC)\object.html $(DOC)\std_compiler.html $(DOC)\std_format.html \
-    $(DOC)\std_random.html $(DOC)\std_file.html $(DOC)\std_date.html \
-    $(DOC)\std_md5.html $(DOC)\std_zip.html $(DOC)\std_zlib.html \
-    $(DOC)\std_algorithm.html \
-    $(DOC)\std_array.html \
-    $(DOC)\std_bigint.html \
-    $(DOC)\std_bind.html \
-    $(DOC)\std_bitarray.html \
-    $(DOC)\std_bitmanip.html \
-    $(DOC)\std_boxer.html \
-    $(DOC)\std_complex.html \
-    $(DOC)\std_contracts.html \
-    $(DOC)\std_conv.html \
-    $(DOC)\std_cover.html \
-    $(DOC)\std_cpuid.html \
@@ -220 +173 @@
-    $(DOC)\std_c_process.html \
-    $(DOC)\std_c_stdarg.html \
-    $(DOC)\std_c_stddef.html \
-    $(DOC)\std_c_stdio.html \
-    $(DOC)\std_c_stdlib.html \
-    $(DOC)\std_c_string.html \
-    $(DOC)\std_c_time.html \
-    $(DOC)\std_c_wcharh.html \
-    $(DOC)\phobos.html
-
-object.d unittest.d crc32.d gcstats
+unittest.d crc32
-
-SRC_STD= std\zlib.d std\zip.d std\stdint.d std\conv.d std\utf.d std\uri.d \
-gc.d std\
+
-    std\ctype.d std\file.d std\compiler.d std\system.d std\moduleinit.d \
-synchro.d std\
-asserterror.d std\
-array.d std\
+
+
+
-    std\regexp.d std\random.d std\stream.d std\process.d \
-    std\socket.d std\socketstream.d std\loader.d std\stdarg.d std\format.d \
-    std\stdio.d std\perf.d std\openrj.d std\uni.d std\boxer.d \
-    std\cstream.d std\demangle.d std\cover.d std\bitarray.d \
-    std\signals.d std\cpuid.d std\typetuple.d std\traits.d std\bind.d \
-hiddenfunc.d std\
+
-    std\variant.d std\numeric.d std\bitmanip.d std\complex.d \
-    std\functional.d std\algorithm.d std\typecons.d std\iterator.d \
-    std\xml.d std\encoding.d std\bigint.d
-
-SRC_STD_C= std\c\process.d std\c\stdlib.d std\c\time.d std\c\stdio.d \
-    std\c\math.d std\c\stdarg.d std\c\stddef.d std\c\fenv.d std\c\string.d \
-    std\c\locale.d std\c\wcharh.d
-
-SRC_TI= \
-    std\typeinfo\ti_wchar.d std\typeinfo\ti_uint.d \
-    std\typeinfo\ti_short.d std\typeinfo\ti_ushort.d \
-    std\typeinfo\ti_byte.d std\typeinfo\ti_ubyte.d \
-    std\typeinfo\ti_long.d std\typeinfo\ti_ulong.d \
-    std\typeinfo\ti_ptr.d std\typeinfo\ti_dchar.d \
-    std\typeinfo\ti_float.d std\typeinfo\ti_double.d \
-    std\typeinfo\ti_real.d std\typeinfo\ti_delegate.d \
-    std\typeinfo\ti_creal.d std\typeinfo\ti_ireal.d \
-    std\typeinfo\ti_cfloat.d std\typeinfo\ti_ifloat.d \
-    std\typeinfo\ti_cdouble.d std\typeinfo\ti_idouble.d \
-    std\typeinfo\ti_Ashort.d \
-    std\typeinfo\ti_Ag.d \
-    std\typeinfo\ti_AC.d std\typeinfo\ti_C.d \
-    std\typeinfo\ti_int.d std\typeinfo\ti_char.d \
-    std\typeinfo\ti_Aint.d \
-    std\typeinfo\ti_Along.d \
-    std\typeinfo\ti_Afloat.d std\typeinfo\ti_Adouble.d \
-    std\typeinfo\ti_Areal.d \
-    std\typeinfo\ti_Acfloat.d std\typeinfo\ti_Acdouble.d \
-    std\typeinfo\ti_Acreal.d \
-    std\typeinfo\ti_void.d
-
-SRC_INT=    \
-    internal\switch.d internal\complex.c internal\critical.c \
-    internal\minit.asm internal\alloca.d internal\llmath.d internal\deh.c \
-    internal\arraycat.d internal\invariant.d internal\monitor.d \
-    internal\memset.d internal\arraycast.d internal\aaA.d internal\adi.d \
-    internal\dmain2.d internal\cast.d internal\qsort.d internal\deh2.d \
-    internal\cmath2.d internal\obj.d internal\mars.h internal\aApply.d \
-    internal\aApplyR.d internal\object.d internal\trace.d \
-    internal\qsort2.d internal\arrayassign.d \
-    internal\arrayfloat.d internal\arraydouble.d internal\arrayreal.d \
-    internal\arraybyte.d internal\arrayshort.d internal\arrayint.d
-
-
-SRC_STD_WIN= std\windows\registry.d \
-    std\windows\iunknown.d std\windows\syserror.d std\windows\charset.d
-
-SRC_STD_C_WIN= std\c\windows\windows.d std\c\windows\com.d \
-    std\c\windows\winsock.d std\c\windows\stat.d
-
-SRC_STD_C_LINUX= std\c\linux\linux.d std\c\linux\linuxextern.d \
-    std\c\linux\socket.d std\c\linux\pthread.d std\c\linux\termios.d \
-    std\c\linux\tipc.d
@@ -324 +241 @@
-    etc\c\zlib\inftrees.c \
-    etc\c\zlib\zutil.h \
-    etc\c\zlib\zlib.3 \
-    etc\c\zlib\zlib.h \
-    etc\c\zlib\adler32.c \
-    etc\c\zlib\ChangeLog \
-    etc\c\zlib\README \
-    etc\c\zlib\win32.mak \
-    etc\c\zlib\linux.mak
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-    etc\c\zlib\zlib.lib win32.mak
-#   lib -c -p64 phobos.lib $(OBJS) minit.obj internal\gc\dmgc.lib \
-#       etc\c\zlib\zlib.lib
-    $(DMD) -lib -ofphobos.lib $(DFLAGS) $(SRCS) $(OBJS) minit.obj \
-internal\gc\dmgc.lib 
+
-
-unittest : $(SRCS) phobos.lib
-    $(DMD) $(UDFLAGS) -L/co -unittest unittest.d $(SRCS) phobos.lib
-    unittest
-
-#unittest : unittest.exe
-#   unittest
-#
-#unittest.exe : unittest.d phobos.lib
-#   $(DMD) unittest -g
-#   dmc unittest.obj -g
-
-cov : $(SRCS) phobos.lib
-    $(DMD) -cov -unittest -ofcov.exe unittest.d $(SRCS) phobos.lib
-    cov
-
-html : $(DOCS)
-
-######################################################
-
-internal\gc\dmgc.lib:
-    cd internal\gc
-    make -f win32.mak dmgc.lib
-    cd ..\..
-
-etc\c\zlib\zlib.lib:
-    cd etc\c\zlib
-    make -f win32.mak zlib.lib
-    cd ..\..\..
-
-errno.obj : errno.c
-
-### internal
-
-aaA.obj : internal\aaA.d
-    $(DMD) -c $(DFLAGS) internal\aaA.d
-
-aApply.obj : internal\aApply.d
-    $(DMD) -c $(DFLAGS) internal\aApply.d
-
-aApplyR.obj : internal\aApplyR.d
-    $(DMD) -c $(DFLAGS) internal\aApplyR.d
-
-adi.obj : internal\adi.d
-    $(DMD) -c $(DFLAGS) internal\adi.d
-
-arrayassign.obj : internal\arrayassign.d
-    $(DMD) -c $(DFLAGS) internal\arrayassign.d
-
-arraycast.obj : internal\arraycast.d
-    $(DMD) -c $(DFLAGS) internal\arraycast.d
-
-arraycat.obj : internal\arraycat.d
-    $(DMD) -c $(DFLAGS) internal\arraycat.d
-
-cast.obj : internal\cast.d
-    $(DMD) -c $(DFLAGS) internal\cast.d
-
-icomplex.obj : internal\complex.c
-    $(CC) -c $(CFLAGS) internal\complex.c -oicomplex.obj
-
-critical.obj : internal\critical.c
-    $(CC) -c $(CFLAGS) internal\critical.c
-
-deh.obj : internal\mars.h internal\deh.c
-    $(CC) -c $(CFLAGS) internal\deh.c
-
-dmain2.obj : internal\dmain2.d
-    $(DMD) -c $(DFLAGS) internal\dmain2.d
-
-gcstub.obj : internal\gc\gcstub.d
-    $(DMD) -c $(DFLAGS) -Iinternal\gc internal\gc\gcstub.d
-
-invariant.obj : internal\invariant.d
-    $(DMD) -c $(DFLAGS) internal\invariant.d
-
-memset.obj : internal\memset.d
-    $(DMD) -c $(DFLAGS) internal\memset.d
-
-minit.obj : internal\minit.asm
-    $(CC) -c internal\minit.asm
-
-monitor.obj : internal\mars.h internal\monitor.d
-    $(DMD) -c $(DFLAGS) internal\monitor.d
-
-obj.obj : internal\obj.d
-    $(DMD) -c $(DFLAGS) internal\obj.d
-
-object.obj : internal\object.d
-    $(DMD) -c $(DFLAGS) internal\object.d
-
-qsort.obj : internal\qsort.d
-    $(DMD) -c $(DFLAGS) internal\qsort.d
-
-switch.obj : internal\switch.d
-    $(DMD) -c $(DFLAGS) internal\switch.d
-
-### std
-
-algorithm.obj : std\algorithm.d
-    $(DMD) -c $(DFLAGS) std\algorithm.d
-
-array.obj : std\array.d
-    $(DMD) -c $(DFLAGS) std\array.d
-
-asserterror.obj : std\asserterror.d
-    $(DMD) -c $(DFLAGS) std\asserterror.d
-
-atomics.obj : std\atomics.d
-    $(DMD) -c $(DFLAGS) -inline std\atomics.d
-
-base64.obj : std\base64.d
-    $(DMD) -c $(DFLAGS) -inline std\base64.d
-
-bind.obj : std\bind.d
-    $(DMD) -c $(DFLAGS) -inline std\bind.d
-
-bitarray.obj : std\bitarray.d
@@ -509 +337 @@
-
-file.obj : std\file.d
-    $(DMD) -c $(DFLAGS) std\file.d
-
-format.obj : std\format.d
-    $(DMD) -c $(DFLAGS) std\format.d
-
-functional.obj : std\functional.d
-    $(DMD) -c $(DFLAGS) std\functional.d
-
-gc.obj : std\gc.d
-    $(DMD) -c $(DFLAGS) std\gc.d
-
-getopt.obj : std\getopt.d
-    $(DMD) -c $(DFLAGS) std\getopt.d
-
-hiddenfunc.obj : std\hiddenfunc.d
-    $(DMD) -c $(DFLAGS) std\hiddenfunc.d
-
-iterator.obj : std\iterator.d
-    $(DMD) -c $(DFLAGS) std\iterator.d
-
-loader.obj : std\loader.d
-    $(DMD) -c $(DFLAGS) std\loader.d
-
-math.obj : std\math.d
-    $(DMD) -c $(DFLAGS) std\math.d
-
-md5.obj : std\md5.d
@@ -542 +364 @@
-
-mmfile.obj : std\mmfile.d
-    $(DMD) -c $(DFLAGS) std\mmfile.d
-
-moduleinit.obj : std\moduleinit.d
-    $(DMD) -c $(DFLAGS) std\moduleinit.d
-
-numeric.obj : std\numeric.d
-    $(DMD) -c $(DFLAGS) std\numeric.d
-
-#object.obj : object.d
-#   $(DMD) -c $(DFLAGS) object.d
-
-openrj.obj : std\openrj.d
-    $(DMD) -c $(DFLAGS) std\openrj.d
-
-outbuffer.obj : std\outbuffer.d
-    $(DMD) -c $(DFLAGS) std\outbuffer.d
-
-outofmemory.obj : std\outofmemory.d
-    $(DMD) -c $(DFLAGS) std\outofmemory.d
-
-path.obj : std\path.d
@@ -599 +418 @@
-
-oldsyserror.obj : std\syserror.d
-    $(DMD) -c $(DFLAGS) std\syserror.d -ofoldsyserror.obj
-
-system.obj : std\system.d
-    $(DMD) -c $(DFLAGS) std\system.d
-
-thread.obj : std\thread.d
-    $(DMD) -c $(DFLAGS) std\thread.d
-
-synchro.obj : std\synchro.d
-    $(DMD) -c $(DFLAGS) std\synchro.d
-
-traits.obj : std\traits.d
-    $(DMD) -c $(DFLAGS) std\traits.d -oftraits.obj
-
-typecons.obj : std\typecons.d
-    $(DMD) -c $(DFLAGS) std\typecons.d -oftypecons.obj
-
-typetuple.obj : std\typetuple.d
-    $(DMD) -c $(DFLAGS) std\typetuple.d -oftypetuple.obj
-
-uni.obj : std\uni.d
@@ -681 +497 @@
-
-stat.obj : std\c\windows\stat.d
-    $(DMD) -c $(DFLAGS) std\c\windows\stat.d
-
-winsock.obj : std\c\windows\winsock.d
-    $(DMD) -c $(DFLAGS) std\c\windows\winsock.d
-
-windows.obj : std\c\windows\windows.d
-    $(DMD) -c $(DFLAGS) std\c\windows\windows.d
-
-### std\typeinfo
-
-ti_void.obj : std\typeinfo\ti_void.d
-    $(DMD) -c $(DFLAGS) std\typeinfo\ti_void.d
-
-ti_bit.obj : std\typeinfo\ti_bit.d
-    $(DMD) -c $(DFLAGS) std\typeinfo\ti_bit.d
-
-ti_wchar.obj : std\typeinfo\ti_wchar.d
-    $(DMD) -c $(DFLAGS) std\typeinfo\ti_wchar.d
-
-ti_dchar.obj : std\typeinfo\ti_dchar.d
-    $(DMD) -c $(DFLAGS) std\typeinfo\ti_dchar.d
-
-ti_uint.obj : std\typeinfo\ti_uint.d
-    $(DMD) -c $(DFLAGS) std\typeinfo\ti_uint.d
-
-ti_short.obj : std\typeinfo\ti_short.d
-    $(DMD) -c $(DFLAGS) std\typeinfo\ti_short.d
-
-ti_ushort.obj : std\typeinfo\ti_ushort.d
-    $(DMD) -c $(DFLAGS) std\typeinfo\ti_ushort.d
-
-ti_byte.obj : std\typeinfo\ti_byte.d
-    $(DMD) -c $(DFLAGS) std\typeinfo\ti_byte.d
-
-ti_ubyte.obj : std\typeinfo\ti_ubyte.d
-    $(DMD) -c $(DFLAGS) std\typeinfo\ti_ubyte.d
-
-ti_long.obj : std\typeinfo\ti_long.d
-    $(DMD) -c $(DFLAGS) std\typeinfo\ti_long.d
-
-ti_ulong.obj : std\typeinfo\ti_ulong.d
-    $(DMD) -c $(DFLAGS) std\typeinfo\ti_ulong.d
-
-ti_ptr.obj : std\typeinfo\ti_ptr.d
-    $(DMD) -c $(DFLAGS) std\typeinfo\ti_ptr.d
-
-ti_float.obj : std\typeinfo\ti_float.d
-    $(DMD) -c $(DFLAGS) std\typeinfo\ti_float.d
-
-ti_double.obj : std\typeinfo\ti_double.d
-    $(DMD) -c $(DFLAGS) std\typeinfo\ti_double.d
-
-ti_real.obj : std\typeinfo\ti_real.d
-    $(DMD) -c $(DFLAGS) std\typeinfo\ti_real.d
-
-ti_delegate.obj : std\typeinfo\ti_delegate.d
-    $(DMD) -c $(DFLAGS) std\typeinfo\ti_delegate.d
-
-ti_creal.obj : std\typeinfo\ti_creal.d
-    $(DMD) -c $(DFLAGS) std\typeinfo\ti_creal.d
-
-ti_ireal.obj : std\typeinfo\ti_ireal.d
-    $(DMD) -c $(DFLAGS) std\typeinfo\ti_ireal.d
-
-ti_cfloat.obj : std\typeinfo\ti_cfloat.d
-    $(DMD) -c $(DFLAGS) std\typeinfo\ti_cfloat.d
-
-ti_ifloat.obj : std\typeinfo\ti_ifloat.d
-    $(DMD) -c $(DFLAGS) std\typeinfo\ti_ifloat.d
-
-ti_cdouble.obj : std\typeinfo\ti_cdouble.d
-    $(DMD) -c $(DFLAGS) std\typeinfo\ti_cdouble.d
-
-ti_idouble.obj : std\typeinfo\ti_idouble.d
-    $(DMD) -c $(DFLAGS) std\typeinfo\ti_idouble.d
-
-ti_AC.obj : std\typeinfo\ti_AC.d
-    $(DMD) -c $(DFLAGS) std\typeinfo\ti_AC.d
-
-ti_Ag.obj : std\typeinfo\ti_Ag.d
-    $(DMD) -c $(DFLAGS) std\typeinfo\ti_Ag.d
-
-ti_Abit.obj : std\typeinfo\ti_Abit.d
-    $(DMD) -c $(DFLAGS) std\typeinfo\ti_Abit.d
-
-ti_Ashort.obj : std\typeinfo\ti_Ashort.d
-    $(DMD) -c $(DFLAGS) std\typeinfo\ti_Ashort.d
-
-ti_Aint.obj : std\typeinfo\ti_Aint.d
-    $(DMD) -c $(DFLAGS) std\typeinfo\ti_Aint.d
-
-ti_Along.obj : std\typeinfo\ti_Along.d
-    $(DMD) -c $(DFLAGS) std\typeinfo\ti_Along.d
-
-ti_Afloat.obj : std\typeinfo\ti_Afloat.d
-    $(DMD) -c $(DFLAGS) std\typeinfo\ti_Afloat.d
-
-ti_Adouble.obj : std\typeinfo\ti_Adouble.d
-    $(DMD) -c $(DFLAGS) std\typeinfo\ti_Adouble.d
-
-ti_Areal.obj : std\typeinfo\ti_Areal.d
-    $(DMD) -c $(DFLAGS) std\typeinfo\ti_Areal.d
-
-ti_Acfloat.obj : std\typeinfo\ti_Acfloat.d
-    $(DMD) -c $(DFLAGS) std\typeinfo\ti_Acfloat.d
-
-ti_Acdouble.obj : std\typeinfo\ti_Acdouble.d
-    $(DMD) -c $(DFLAGS) std\typeinfo\ti_Acdouble.d
-
-ti_Acreal.obj : std\typeinfo\ti_Acreal.d
-    $(DMD) -c $(DFLAGS) std\typeinfo\ti_Acreal.d
-
-ti_C.obj : std\typeinfo\ti_C.d
-    $(DMD) -c $(DFLAGS) std\typeinfo\ti_C.d
-
-ti_char.obj : std\typeinfo\ti_char.d
-    $(DMD) -c $(DFLAGS) std\typeinfo\ti_char.d
-
-ti_int.obj : std\typeinfo\ti_int.d
-    $(DMD) -c $(DFLAGS) std\typeinfo\ti_int.d
-
-
-################## DOCS ####################################
-
-$(DOC)\phobos.html : std.ddoc phobos.d
-    $(DMD) -c -o- $(DFLAGS) -Df$(DOC)\phobos.html std.ddoc phobos.d
-
-$(DOC)\std_algorithm.html : std.ddoc std\algorithm.d
-    $(DMD) -c -o- $(DFLAGS) -Df$(DOC)\std_algorithm.html std.ddoc std\algorithm.d
-
-$(DOC)\std_array.html : std.ddoc std\array.d
-    $(DMD) -c -o- $(DFLAGS) -Df$(DOC)\std_array.html std.ddoc std\array.d
-
-$(DOC)\std_atomics.html : std.ddoc std\atomics.d
-    $(DMD) -c -o- $(DFLAGS) -Df$(DOC)\std_atomics.html std.ddoc std\atomics.d
-
-$(DOC)\std_base64.html : std.ddoc std\base64.d
-    $(DMD) -c -o- $(DFLAGS) -Df$(DOC)\std_base64.html std.ddoc std\base64.d
-
-$(DOC)\std_bigint.html : std.ddoc std\bigint.d
-    $(DMD) -c -o- $(DFLAGS) -Df$(DOC)\std_bigint.html std.ddoc std\bigint.d
-
-$(DOC)\std_bind.html : std.ddoc std\bind.d
@@ -866 +565 @@
-
-$(DOC)\std_file.html : std.ddoc std\file.d
-    $(DMD) -c -o- $(DFLAGS) -Df$(DOC)\std_file.html std.ddoc std\file.d
-
-$(DOC)\std_format.html : std.ddoc std\format.d
-    $(DMD) -c -o- $(DFLAGS) -Df$(DOC)\std_format.html std.ddoc std\format.d
-
-$(DOC)\std_functional.html : std.ddoc std\functional.d
-    $(DMD) -c -o- $(DFLAGS) -Df$(DOC)\std_functional.html std.ddoc std\functional.d
-
-$(DOC)\std_gc.html : std.ddoc std\gc.d
-    $(DMD) -c -o- $(DFLAGS) -Df$(DOC)\std_gc.html std.ddoc std\gc.d
-
-$(DOC)\std_getopt.html : std.ddoc std\getopt.d
-    $(DMD) -c -o- $(DFLAGS) -Df$(DOC)\std_getopt.html std.ddoc std\getopt.d
-
-$(DOC)\std_hiddenfunc.html : std.ddoc std\hiddenfunc.d
-    $(DMD) -c -o- $(DFLAGS) -Df$(DOC)\std_hiddenfunc.html std.ddoc std\hiddenfunc.d
-
-$(DOC)\std_iterator.html : std.ddoc std\iterator.d
-    $(DMD) -c -o- $(DFLAGS) -Df$(DOC)\std_iterator.html std.ddoc std\iterator.d
-
-$(DOC)\std_intrinsic.html : std.ddoc std\intrinsic.d
-    $(DMD) -c -o- $(DFLAGS) -Df$(DOC)\std_intrinsic.html std.ddoc std\intrinsic.d
-
-$(DOC)\std_math.html : std.ddoc std\math.d
-    $(DMD) -c -o- $(DFLAGS) -Df$(DOC)\std_math.html std.ddoc std\math.d
-
-$(DOC)\std_md5.html : std.ddoc std\md5.d
@@ -947 +640 @@
-
-$(DOC)\std_string.html : std.ddoc std\string.d
-    $(DMD) -c -o- $(DFLAGS) -Df$(DOC)\std_string.html std.ddoc std\string.d
-
-$(DOC)\std_system.html : std.ddoc std\system.d
-    $(DMD) -c -o- $(DFLAGS) -Df$(DOC)\std_system.html std.ddoc std\system.d
-
-$(DOC)\std_thread.html : std.ddoc std\thread.d
-    $(DMD) -c -o- $(DFLAGS) -Df$(DOC)\std_thread.html std.ddoc std\thread.d
-
-$(DOC)\std_synchro.html : std.ddoc std\synchro.d
-    $(DMD) -c -o- $(DFLAGS) -Df$(DOC)\std_synchro.html std.ddoc std\synchro.d
-
-$(DOC)\std_traits.html : std.ddoc std\traits.d
-    $(DMD) -c -o- $(DFLAGS) -Df$(DOC)\std_traits.html std.ddoc std\traits.d
-
-$(DOC)\std_typecons.html : std.ddoc std\typecons.d
-    $(DMD) -c -o- $(DFLAGS) -Df$(DOC)\std_typecons.html std.ddoc std\typecons.d
-
-$(DOC)\std_typetuple.html : std.ddoc std\typetuple.d
-    $(DMD) -c -o- $(DFLAGS) -Df$(DOC)\std_typetuple.html std.ddoc std\typetuple.d
-
-$(DOC)\std_uni.html : std.ddoc std\uni.d
@@ -985 +675 @@
-    $(DMD) -c -o- $(DFLAGS) -Df$(DOC)\std_encoding.html std.ddoc std\encoding.d
-
-$(DOC)\std_zip.html : std.ddoc std\zip.d
-    $(DMD) -c -o- $(DFLAGS) -Df$(DOC)\std_zip.html std.ddoc std\zip.d
-
-$(DOC)\std_zlib.html : std.ddoc std\zlib.d
-    $(DMD) -c -o- $(DFLAGS) -Df$(DOC)\std_zlib.html std.ddoc std\zlib.d
-
-$(DOC)\std_windows_charset.html : std.ddoc std\windows\charset.d
-    $(DMD) -c -o- $(DFLAGS) -Df$(DOC)\std_windows_charset.html std.ddoc std\windows\charset.d
-
-$(DOC)\object.html : std.ddoc internal\object.d
-    $(DMD) -c -o- $(DFLAGS) -Df$(DOC)\object.html std.ddoc internal\object.d
-
-$(DOC)\std_c_fenv.html : std.ddoc std\c\fenv.d
-    $(DMD) -c -o- $(DFLAGS) -Df$(DOC)\std_c_fenv.html std.ddoc std\c\fenv.d
-
-$(DOC)\std_c_locale.html : std.ddoc std\c\locale.d
-    $(DMD) -c -o- $(DFLAGS) -Df$(DOC)\std_c_locale.html std.ddoc std\c\locale.d
-
-$(DOC)\std_c_math.html : std.ddoc std\c\math.d
-    $(DMD) -c -o- $(DFLAGS) -Df$(DOC)\std_c_math.html std.ddoc std\c\math.d
-
@@ -1044 +731 @@
-    zip32 -u phobos $(SRC_STD_C)
-    zip32 -u phobos $(SRC_STD_WIN)
-    zip32 -u phobos $(SRC_STD_C_WIN)
-    zip32 -u phobos $(SRC_STD_C_LINUX)
-    zip32 -u phobos $(SRC_ETC)
-    zip32 -u phobos $(SRC_ETC_C)
-    zip32 -u phobos $(SRC_ZLIB)
-    zip32 -u phobos $(SRC_GC)
-
-clean:
-    cd internal\gc
-    make -f win32.mak clean
-    cd ..\..
-    cd etc\c\zlib
-    make -f win32.mak clean
-    cd ..\..\..
-    del $(OBJS)
-    del $(DOCS)
-    del unittest.obj unittest.map unittest.exe
- gcstub.obj
+
-
-cleanhtml:
-    del $(DOCS)
-
-install:
-    $(CP) phobos.lib gcstub.obj $(DIR)\lib
-    $(CP) win32.mak linux.mak phoboslicense.txt minit.obj std.ddoc $(DIR)\src\phobos
-    $(CP) $(SRC) $(DIR)\src\phobos
-    $(CP) $(SRC_STD) $(DIR)\src\phobos\std
-    $(CP) $(SRC_STD_C) $(DIR)\src\phobos\std\c
-    $(CP) $(SRC_TI) $(DIR)\src\phobos\std\typeinfo
-    $(CP) $(SRC_INT) $(DIR)\src\phobos\internal
-    $(CP) $(SRC_STD_WIN) $(DIR)\src\phobos\std\windows
-    $(CP) $(SRC_STD_C_WIN) $(DIR)\src\phobos\std\c\windows
-    $(CP) $(SRC_STD_C_LINUX) $(DIR)\src\phobos\std\c\linux
-    $(CP) $(SRC_ETC) $(DIR)\src\phobos\etc
-    $(CP) $(SRC_ETC_C) $(DIR)\src\phobos\etc\c
-    $(CP) $(SRC_ZLIB) $(DIR)\src\phobos\etc\c\zlib
-    $(CP) $(SRC_GC) $(DIR)\src\phobos\internal\gc
-