Changeset 1708

Timestamp:

07/01/10 21:14:49 (14 years ago)

Author:

kyllingstad

Message:

Improved file name/line number propagation in std.file (FileException? and cenforce())

Files:

• trunk/phobos/std/file.d (modified) (1 diff)

trunk/phobos/std/file.d

@@ -125 +125 @@
- */
-
-class FileException : Exception
-{
-/**
-OS error code.
- */ 
-    immutable uint errno;
-    
-/**
-
-
-
+
+
- */ 
-    this(in char[] name, in char[] message)
-    {
-        super(text(name, ": ", message));
+        errno = 0;
+    }
+
+    this(in char[] name, in char[] message, string sourceFile, int sourceLine)
+    {
+        super(text(name, ": ", message), sourceFile, sourceLine);
-        errno = 0;
-    }
-
-/**
-Constructor taking the name of the file where error happened and the
-error number ($(LUCKY GetLastError) in Windows, $(D getErrno) in
-Posix).
- */ 
-string
+in char[]
-    {
-        this(name, sysErrorString(errno));
-        this.errno = errno;
-    }
-
-    version(Posix) this(in char[] name, uint errno = .getErrno)
-    {
-        auto s = strerror(errno);
-        this(name, to!string(s));
-        this.errno = errno;
-    }
+
+    version(Windows) this(in char[] name, string sourceFile, int sourceLine,
+        uint errno = GetLastError)
+    {
+        this(name, sysErrorString(errno), sourceFile, sourceLine);
+        this.errno = errno;
+    }
+
+    version(Posix) this(in char[] name, string sourceFile, int sourceLine,
+        uint errno = .getErrno)
+    {
+        auto s = strerror(errno);
+        this(name, to!string(s), sourceFile, sourceLine);
+        this.errno = errno;
+    }
-}
-
-private T cenforce(T, string file = __FILE__, uint line = __LINE__)
-(T condition, lazy const(char)[] name)
-{
-    if (!condition)
-    {
-
-
+
-    }
-    return condition;
-}
-
-/* **********************************
- * Basic File operations.
- */
-
-/********************************************
-Read entire contents of file $(D name).