Get rid of obsolete CRuntime_DigitalMars support

std/experimental/allocator/mallocator.d

@@ -116,93 +116,11 @@ struct Mallocator
     test!Mallocator();
 }
 
-version (Windows)
+version (CRuntime_Microsoft)
 {
-    // DMD Win 32 bit, DigitalMars C standard library misses the _aligned_xxx
-    // functions family (snn.lib)
-    version (CRuntime_DigitalMars)
-    {
-        // Helper to cast the infos written before the aligned pointer
-        // this header keeps track of the size (required to realloc) and of
-        // the base ptr (required to free).
-        private struct AlignInfo
-        {
-            void* basePtr;
-            size_t size;
-
-            @nogc nothrow
-            static AlignInfo* opCall(void* ptr)
-            {
-                return cast(AlignInfo*) (ptr - AlignInfo.sizeof);
-            }
-        }
-
-        @nogc nothrow
-        private void* _aligned_malloc(size_t size, size_t alignment)
-        {
-            import core.stdc.stdlib : malloc;
-            size_t offset = alignment + size_t.sizeof * 2 - 1;
-
-            // unaligned chunk
-            void* basePtr = malloc(size + offset);
-            if (!basePtr) return null;
-
-            // get aligned location within the chunk
-            void* alignedPtr = cast(void**)((cast(size_t)(basePtr) + offset)
-                & ~(alignment - 1));
-
-            // write the header before the aligned pointer
-            AlignInfo* head = AlignInfo(alignedPtr);
-            head.basePtr = basePtr;
-            head.size = size;
-
-            return alignedPtr;
-        }
-
-        @nogc nothrow
-        private void* _aligned_realloc(void* ptr, size_t size, size_t alignment)
-        {
-            import core.stdc.stdlib : free;
-            import core.stdc.string : memcpy;
-
-            if (!ptr) return _aligned_malloc(size, alignment);
-
-            // gets the header from the exising pointer
-            AlignInfo* head = AlignInfo(ptr);
-
-            // gets a new aligned pointer
-            void* alignedPtr = _aligned_malloc(size, alignment);
-            if (!alignedPtr)
-            {
-                //to https://msdn.microsoft.com/en-us/library/ms235462.aspx
-                //see Return value: in this case the original block is unchanged
-                return null;
-            }
-
-            // copy exising data
-            memcpy(alignedPtr, ptr, head.size);
-            free(head.basePtr);
-
-            return alignedPtr;
-        }
-
-        @nogc nothrow
-        private void _aligned_free(void *ptr)
-        {
-            import core.stdc.stdlib : free;
-            if (!ptr) return;
-            AlignInfo* head = AlignInfo(ptr);
-            free(head.basePtr);
-        }
-
-    }
-    // DMD Win 64 bit, uses microsoft standard C library which implements them
-    else
-    {
     @nogc nothrow private extern(C) void* _aligned_malloc(size_t, size_t);
     @nogc nothrow private extern(C) void _aligned_free(void *memblock);
     @nogc nothrow private extern(C) void* _aligned_realloc(void *, size_t, size_t);
-    }
 }
 
 /**
@@ -399,50 +317,3 @@ version (Posix)
     assert(!AlignedMallocator.instance.alignedReallocate(c, size_t.max, 4096));
     AlignedMallocator.instance.deallocate(c);
 }
-
-version (CRuntime_DigitalMars)
-@nogc @system nothrow unittest
-{
-    void* m;
-
-    size_t m_addr() { return cast(size_t) m; }
-
-    m = _aligned_malloc(16, 0x10);
-    if (m)
-    {
-        assert((m_addr & 0xF) == 0);
-        _aligned_free(m);
-    }
-
-    m = _aligned_malloc(16, 0x100);
-    if (m)
-    {
-        assert((m_addr & 0xFF) == 0);
-        _aligned_free(m);
-    }
-
-    m = _aligned_malloc(16, 0x1000);
-    if (m)
-    {
-        assert((m_addr & 0xFFF) == 0);
-        _aligned_free(m);
-    }
-
-    m = _aligned_malloc(16, 0x10);
-    if (m)
-    {
-        assert((cast(size_t) m & 0xF) == 0);
-        m = _aligned_realloc(m, 32, 0x10000);
-        if (m) assert((m_addr & 0xFFFF) == 0);
-        _aligned_free(m);
-    }
-
-    m = _aligned_malloc(8, 0x10);
-    if (m)
-    {
-        *cast(ulong*) m = 0X01234567_89ABCDEF;
-        m = _aligned_realloc(m, 0x800, 0x1000);
-        if (m) assert(*cast(ulong*) m == 0X01234567_89ABCDEF);
-        _aligned_free(m);
-    }
-}

std/math/rounding.d

@@ -772,27 +772,18 @@ version (Posix)
  *
  * If the fractional part of x is exactly 0.5, the return value is rounded
  * away from zero.
- *
- * $(BLUE This function is not implemented for Digital Mars C runtime.)
  */
 long lround(real x) @trusted nothrow @nogc
 {
-    version (CRuntime_DigitalMars)
-        assert(0, "lround not implemented");
-    else
     return core.stdc.math.llroundl(x);
 }
 
 ///
 @safe nothrow @nogc unittest
 {
-    version (CRuntime_DigitalMars) {}
-    else
-    {
     assert(lround(0.49) == 0);
     assert(lround(0.5) == 1);
     assert(lround(1.5) == 2);
-    }
 }
 
 /**

std/process.d

@@ -127,18 +127,12 @@ else version (WatchOS)
     version = iOSDerived;
 }
 
-// When the DMC runtime is used, we have to use some custom functions
-// to convert between Windows file handles and FILE*s.
-version (Win32) version (CRuntime_DigitalMars) version = DMC_RUNTIME;
-
 
 // Some of the following should be moved to druntime.
 private
 {
     // Microsoft Visual C Runtime (MSVCRT) declarations.
-    version (Windows)
+    version (CRuntime_Microsoft)
-    {
-        version (DMC_RUNTIME) { } else
     {
         import core.stdc.stdint;
         enum
@@ -148,7 +142,6 @@ private
             STDERR_FILENO = 2,
         }
     }
-    }
 
     // POSIX API declarations.
     version (Posix)

std/stdio.d

@@ -123,9 +123,6 @@ alias KeepTerminator = Flag!"keepTerminator";
 version (CRuntime_Microsoft)
 {
 }
-else version (CRuntime_DigitalMars)
-{
-}
 else version (CRuntime_Glibc)
 {
 }
@@ -215,54 +212,7 @@ version (Posix)
     static import core.sys.posix.stdio; // getdelim, flockfile
 }
 
-version (CRuntime_DigitalMars)
+version (CRuntime_Microsoft)
-{
-    private alias _FPUTC = _fputc_nlock;
-    private alias _FPUTWC = _fputwc_nlock;
-    private alias _FGETC = _fgetc_nlock;
-    private alias _FGETWC = _fgetwc_nlock;
-    private alias _FLOCK = __fp_lock;
-    private alias _FUNLOCK = __fp_unlock;
-
-    // Alias for CRuntime_Microsoft compatibility.
-    // @@@DEPRECATED_2.107@@@
-    // Rename this back to _setmode once the deprecation phase has ended.
-    private alias __setmode = setmode;
-
-    // @@@DEPRECATED_2.107@@@
-    deprecated("internal alias FPUTC was unintentionally available from "
-               ~ "std.stdio and will be removed afer 2.107")
-    alias FPUTC = _fputc_nlock;
-    // @@@DEPRECATED_2.107@@@
-    deprecated("internal alias FPUTWC was unintentionally available from "
-               ~ "std.stdio and will be removed afer 2.107")
-    alias FPUTWC = _fputwc_nlock;
-    // @@@DEPRECATED_2.107@@@
-    deprecated("internal alias FGETC was unintentionally available from "
-               ~ "std.stdio and will be removed afer 2.107")
-    alias FGETC = _fgetc_nlock;
-    // @@@DEPRECATED_2.107@@@
-    deprecated("internal alias FGETWC was unintentionally available from "
-               ~ "std.stdio and will be removed afer 2.107")
-    alias FGETWC = _fgetwc_nlock;
-    // @@@DEPRECATED_2.107@@@
-    deprecated("internal alias FLOCK was unintentionally available from "
-               ~ "std.stdio and will be removed afer 2.107")
-    alias FLOCK = __fp_lock;
-    // @@@DEPRECATED_2.107@@@
-    deprecated("internal alias FUNLOCK was unintentionally available from "
-               ~ "std.stdio and will be removed afer 2.107")
-    alias FUNLOCK = __fp_unlock;
-    // @@@DEPRECATED_2.107@@@
-    deprecated("internal alias _setmode was unintentionally available from "
-               ~ "std.stdio and will be removed afer 2.107")
-    alias _setmode = setmode;
-    // @@@DEPRECATED_2.107@@@
-    deprecated("internal function _fileno was unintentionally available from "
-               ~ "std.stdio and will be removed afer 2.107")
-    fileno_t _fileno(FILE* f) { return f._file; }
-}
-else version (CRuntime_Microsoft)
 {
     private alias _FPUTC = _fputc_nolock;
     private alias _FPUTWC = _fputwc_nolock;
@@ -271,10 +221,6 @@ else version (CRuntime_Microsoft)
     private alias _FLOCK = _lock_file;
     private alias _FUNLOCK = _unlock_file;
 
-    // @@@DEPRECATED_2.107@@@
-    // Remove this once the deprecation phase for CRuntime_DigitalMars has ended.
-    private alias __setmode = _setmode;
-
     // @@@DEPRECATED_2.107@@@
     deprecated("internal alias FPUTC was unintentionally available from "
                ~ "std.stdio and will be removed afer 2.107")
@@ -413,10 +359,6 @@ else
 private extern (C) @nogc nothrow
 {
     pragma(mangle, _FPUTC.mangleof) int trustedFPUTC(int ch, _iobuf* h) @trusted;
-
-    version (CRuntime_DigitalMars)
-        pragma(mangle, _FPUTWC.mangleof) int trustedFPUTWC(int ch, _iobuf* h) @trusted;
-    else
     pragma(mangle, _FPUTWC.mangleof) int trustedFPUTWC(wchar_t ch, _iobuf* h) @trusted;
 }
 
@@ -829,7 +771,6 @@ Throws: `ErrnoException` in case of error.
         f.close();
     }
 
-    version (CRuntime_DigitalMars) {} else // Not implemented
     version (CRuntime_Microsoft) {} else // Not implemented
     @safe unittest // Test changing mode
     {
@@ -889,22 +830,7 @@ Params:
         auto modez = stdioOpenmode.tempCString();
         detach();
 
-        version (CRuntime_DigitalMars)
+        version (CRuntime_Microsoft)
-        {
-            // This is a re-implementation of DMC's fdopen, but without the
-            // mucking with the file descriptor.  POSIX standard requires the
-            // new fdopen'd file to retain the given file descriptor's
-            // position.
-            auto fp = fopen("NUL", modez);
-            errnoEnforce(fp, "Cannot open placeholder NUL stream");
-            _FLOCK(fp);
-            auto iob = cast(_iobuf*) fp;
-            .close(iob._file);
-            iob._file = fd;
-            iob._flag &= ~_IOTRAN;
-            _FUNLOCK(fp);
-        }
-        else version (CRuntime_Microsoft)
         {
             auto fp = _fdopen(fd, modez);
             errnoEnforce(fp);
@@ -943,10 +869,6 @@ Throws: `ErrnoException` in case of error.
         import std.format : format;
 
         // Create file descriptors from the handles
-        version (CRuntime_DigitalMars)
-            auto fd = _handleToFD(handle, FHND_DEVICE);
-        else // MSVCRT
-        {
         int mode;
         modeLoop:
         foreach (c; stdioOpenmode)
@@ -962,7 +884,6 @@ Throws: `ErrnoException` in case of error.
             }
 
         auto fd = _open_osfhandle(cast(intptr_t) handle, mode);
-        }
 
         errnoEnforce(fd >= 0, "Cannot open Windows HANDLE");
         fdopen(fd, stdioOpenmode, "HANDLE(%s)".format(handle));
@@ -1186,17 +1107,8 @@ Throws: `ErrnoException` if the file is not opened or the call to `fread` fails.
         version (Windows)
         {
             immutable fileno_t fd = .fileno(_p.handle);
-            immutable mode = .__setmode(fd, _O_BINARY);
+            immutable mode = ._setmode(fd, _O_BINARY);
-            scope(exit) .__setmode(fd, mode);
+            scope(exit) ._setmode(fd, mode);
-            version (CRuntime_DigitalMars)
-            {
-                import core.atomic : atomicOp;
-
-                // https://issues.dlang.org/show_bug.cgi?id=4243
-                immutable info = __fhnd_info[fd];
-                atomicOp!"&="(__fhnd_info[fd], ~FHND_TEXT);
-                scope(exit) __fhnd_info[fd] = info;
-            }
         }
         immutable freadResult = trustedFread(_p.handle, buffer);
         assert(freadResult <= buffer.length); // fread return guarantee
@@ -1276,24 +1188,14 @@ Throws: `ErrnoException` if the file is not opened or if the call to `fwrite` fa
         version (Windows)
         {
             immutable fileno_t fd = .fileno(_p.handle);
-            immutable oldMode = .__setmode(fd, _O_BINARY);
+            immutable oldMode = ._setmode(fd, _O_BINARY);
 
             if (oldMode != _O_BINARY)
             {
                 // need to flush the data that was written with the original mode
-                .__setmode(fd, oldMode);
+                ._setmode(fd, oldMode);
-                flush(); // before changing translation mode .__setmode(fd, _O_BINARY);
+                flush(); // before changing translation mode ._setmode(fd, _O_BINARY);
-                .__setmode(fd, _O_BINARY);
+                ._setmode(fd, _O_BINARY);
-            }
-
-            version (CRuntime_DigitalMars)
-            {
-                import core.atomic : atomicOp;
-
-                // https://issues.dlang.org/show_bug.cgi?id=4243
-                immutable info = __fhnd_info[fd];
-                atomicOp!"&="(__fhnd_info[fd], ~FHND_TEXT);
-                scope (exit) __fhnd_info[fd] = info;
             }
 
             scope (exit)
@@ -1301,7 +1203,7 @@ Throws: `ErrnoException` if the file is not opened or if the call to `fwrite` fa
                 if (oldMode != _O_BINARY)
                 {
                     flush();
-                    .__setmode(fd, oldMode);
+                    ._setmode(fd, oldMode);
                 }
             }
         }
@@ -1394,9 +1296,6 @@ Throws: `Exception` if the file is not opened.
         f.seek(7);
         assert(f.readln() == "hijklmnopqrstuvwxyz");
 
-        version (CRuntime_DigitalMars)
-            auto bigOffset = int.max - 100;
-        else
         version (CRuntime_Bionic)
             auto bigOffset = int.max - 100;
         else
@@ -2349,9 +2248,6 @@ Returns the underlying operating system `HANDLE` (Windows only).
     version (Windows)
     @property HANDLE windowsHandle()
     {
-        version (CRuntime_DigitalMars)
-            return _fdToHandle(fileno);
-        else
         return cast(HANDLE)_get_osfhandle(fileno);
     }
 
@@ -3151,11 +3047,11 @@ is empty, throws an `Exception`. In case of an I/O error throws
                 // concept of ANSI/UNICODE mode. fputc doesn't work in UNICODE
                 // mode; fputwc has to be used. So that essentially means
                 // "wide-oriented" for us.
-                immutable int mode = __setmode(f.fileno, _O_TEXT);
+                immutable int mode = _setmode(f.fileno, _O_TEXT);
                     // Set some arbitrary mode to obtain the previous one.
-                if (mode != -1) // __setmode() succeeded
+                if (mode != -1) // _setmode() succeeded
                 {
-                    __setmode(f.fileno, mode); // Restore previous mode.
+                    _setmode(f.fileno, mode); // Restore previous mode.
                     if (mode & (_O_WTEXT | _O_U16TEXT | _O_U8TEXT))
                     {
                         orientation_ = 1; // wide
@@ -3386,8 +3282,6 @@ is empty, throws an `Exception`. In case of an I/O error throws
         {
             fileno_t fd;
             int oldMode;
-            version (CRuntime_DigitalMars)
-                ubyte oldInfo;
         }
 
     public:
@@ -3407,15 +3301,7 @@ is empty, throws an `Exception`. In case of an I/O error throws
             {
                 .fflush(fps); // before changing translation mode
                 fd = .fileno(fps);
-                oldMode = .__setmode(fd, _O_BINARY);
+                oldMode = ._setmode(fd, _O_BINARY);
-                version (CRuntime_DigitalMars)
-                {
-                    import core.atomic : atomicOp;
-
-                    // https://issues.dlang.org/show_bug.cgi?id=4243
-                    oldInfo = __fhnd_info[fd];
-                    atomicOp!"&="(__fhnd_info[fd], ~FHND_TEXT);
-                }
             }
         }
 
@@ -3429,12 +3315,7 @@ is empty, throws an `Exception`. In case of an I/O error throws
             version (Windows)
             {
                 .fflush(fps); // before restoring translation mode
-                version (CRuntime_DigitalMars)
+                ._setmode(fd, oldMode);
-                {
-                    // https://issues.dlang.org/show_bug.cgi?id=4243
-                    __fhnd_info[fd] = oldInfo;
-                }
-                .__setmode(fd, oldMode);
             }
 
             _FUNLOCK(fps);
@@ -3887,19 +3768,12 @@ void main()
         return setlocale(LC_CTYPE, loc.ptr).fromStringz.endsWith(loc);
     });
     scope(exit) () @trusted { setlocale(LC_CTYPE, oldCt); } ();
-    version (CRuntime_DigitalMars) // DM can't handle Unicode above U+07FF.
-    {
-        alias strs = AliasSeq!("xä\u07FE", "yö\u07FF"w);
-    }
-    else
-    {
     alias strs = AliasSeq!("xä\U0001F607", "yö\U0001F608"w);
-    }
     {
         auto f = File(deleteme, "w");
         version (CRuntime_Microsoft)
         {
-            () @trusted { __setmode(fileno(f.getFP()), _O_U8TEXT); } ();
+            () @trusted { _setmode(fileno(f.getFP()), _O_U8TEXT); } ();
         }
         else
         {
@@ -5537,120 +5411,7 @@ private struct LockedFile
 // Private implementation of readln
 private size_t readlnImpl(FILE* fps, ref char[] buf, dchar terminator, File.Orientation orientation) @safe
 {
-    version (CRuntime_DigitalMars)
+    version (CRuntime_Microsoft)
-    return () @trusted {
-        auto lf = LockedFile(fps);
-        ReadlnAppender app;
-        app.initialize(buf);
-
-        if (__fhnd_info[lf.fp._file] & FHND_WCHAR)
-        {   /* Stream is in wide characters.
-             * Read them and convert to chars.
-             */
-            static assert(wchar_t.sizeof == 2);
-            for (int c = void; (c = lf.fgetwc()) != -1; )
-            {
-                if ((c & ~0x7F) == 0)
-                {
-                    app.putchar(cast(char) c);
-                    if (c == terminator)
-                        break;
-                }
-                else
-                {
-                    if (c >= 0xD800 && c <= 0xDBFF)
-                    {
-                        int c2 = void;
-                        if ((c2 = lf.fgetwc()) != -1 ||
-                                c2 < 0xDC00 && c2 > 0xDFFF)
-                        {
-                            StdioException("unpaired UTF-16 surrogate");
-                        }
-                        c = ((c - 0xD7C0) << 10) + (c2 - 0xDC00);
-                    }
-                    app.putdchar(cast(dchar) c);
-                }
-            }
-            if (ferror(fps))
-                StdioException();
-        }
-        else if (lf.fp._flag & _IONBF)
-        {
-            /* Use this for unbuffered I/O, when running
-             * across buffer boundaries, or for any but the common
-             * cases.
-             */
-        L1:
-            int c;
-            while ((c = lf.fgetc()) != -1)
-            {
-                app.putchar(cast(char) c);
-                if (c == terminator)
-                {
-                    buf = app.data;
-                    return buf.length;
-                }
-
-            }
-
-            if (ferror(fps))
-                StdioException();
-        }
-        else
-        {
-            int u = lf.fp._cnt;
-            char* p = lf.fp._ptr;
-            int i;
-            if (lf.fp._flag & _IOTRAN)
-            {   /* Translated mode ignores \r and treats ^Z as end-of-file
-                 */
-                char c;
-                while (1)
-                {
-                    if (i == u)         // if end of buffer
-                        goto L1;        // give up
-                    c = p[i];
-                    i++;
-                    if (c != '\r')
-                    {
-                        if (c == terminator)
-                            break;
-                        if (c != 0x1A)
-                            continue;
-                        goto L1;
-                    }
-                    else
-                    {   if (i != u && p[i] == terminator)
-                            break;
-                        goto L1;
-                    }
-                }
-                app.putonly(p[0 .. i]);
-                app.buf[i - 1] = cast(char) terminator;
-                if (terminator == '\n' && c == '\r')
-                    i++;
-            }
-            else
-            {
-                while (1)
-                {
-                    if (i == u)         // if end of buffer
-                        goto L1;        // give up
-                    auto c = p[i];
-                    i++;
-                    if (c == terminator)
-                        break;
-                }
-                app.putonly(p[0 .. i]);
-            }
-            lf.fp._cnt -= i;
-            lf.fp._ptr += i;
-        }
-
-        buf = app.data;
-        return buf.length;
-    }();
-    else version (CRuntime_Microsoft)
     {
         auto lf = LockedFile(fps);