Changeset 1721

Timestamp:

07/04/10 21:49:23 (14 years ago)

Author:

andrei

Message:

Implemented readf (yay)

Files:

• trunk/phobos/std/stdio.d (modified) (9 diffs)

trunk/phobos/std/stdio.d

@@ -1 +1 @@
-// Written in the D programming language.
-
-/**
-Standard I/O functions that extend $(B std.c.stdio).  $(B std.c.stdio)
-is $(D_PARAM public)ally imported when importing $(B std.stdio).
-
-Macros:
-WIKI=Phobos/StdStdio
-
- - 2009
-<a href="http://www.boost.org/LICENSE_1_0.txt">Boost License 1.0</a>
+-
+$(WEB boost.org/LICENSE_1_0.txt, Boost License 1.0)
-Authors:   $(WEB digitalmars.com, Walter Bright),
-           $(WEB erdani.org, Andrei Alexandrescu)
-
-         Copyright Digital Mars 2007 - 2009.
-Distributed under the Boost Software License, Version 1.0.
-   (See accompanying file LICENSE_1_0.txt or copy at
-         http://www.boost.org/LICENSE_1_0.txt)
- */
-module std.stdio;
-
-public import core.stdc.stdio;
-private 
-private import core.memory, core.stdc.errno, core.stdc.stddef
-dlib, core.stdc.st
-private 
-/*std.metastrings,*/ 
+
+import core.memory, core.stdc.errno, core.stdc.stddef, core.stdc.stdlib
+
+
+
-    std.typetuple, std.utf;
-
-version (DigitalMars) version (Windows)
-{
-    // Specific to the way Digital Mars C does stdio
-    version = DIGITAL_MARS_STDIO;
-    import std.c.stdio : __fhnd_info, FHND_WCHAR, FHND_TEXT;
-}
-
-version (linux)
@@ -128 +123 @@
-}
-else version (GENERIC_IO)
-{
-    extern (C)
-    {
-        void flockfile(FILE*);
-        void funlockfile(FILE*);
-    }
-
-    int fputc_unlocked(int c, _iobuf* fp) { return fputc(c, cast(shared) fp); }
-
+
+
+
+
-    int fgetc_unlocked(_iobuf* fp) { return fgetc(cast(shared) fp); }
-    int fgetwc_unlocked(_iobuf* fp) { return fgetwc(cast(shared) fp); }
-
-    alias fputc_unlocked FPUTC;
-    alias fputwc_unlocked FPUTWC;
-    alias fgetc_unlocked FGETC;
-    alias fgetwc_unlocked FGETWC;
-
-    alias flockfile FLOCK;
-    alias funlockfile FUNLOCK;
-}
-else
-{
-    static assert(0, "unsupported C I/O system");
-}
-
-//------------------------------------------------------------------------------
-struct ByRecord(Fields...)
-{
+private:
-    File file;
-    char[] line;
-    Tuple!(Fields) current;
-    string format;
-
+public:
-    this(File f, string format)
-    {
-        assert(f.isOpen);
-        file = f;
-        this.format = format;
-        popFront; // prime the range
-    }
-
-    /// Range primitive implementations.
-
+@property 
-    {
-        return !file.isOpen;
-    }
-
-    /// Ditto
-
+@property 
-    {
-        return current;
-    }
-
-    /// Ditto
-    void popFront()
-    {
-        enforce(file.isOpen);
-        file.readln(line);
-        if (!line.length)
@@ -240 +240 @@
-----
-<pre class=console>
-% rdmd test.d Jimmy
-% cat test.txt
-Hello, Jimmy!
-% __
-</pre>
- */
-struct File
-{
-/*private*/
+private
-    {
-        FILE * handle = null;
-        uint refs = uint.max / 2;
-        string name = null;
-        this(FILE* h, uint r, string n)
-        {
-            handle = h;
-            refs = r;
-            name = n;
-        }
-    }
-/*private*/
+private
-
-/**
-Constructor taking the name of the file to open and the open mode
-(with the same semantics as in the C standard library $(WEB
-cplusplus.com/reference/clibrary/cstdio/fopen.html, fopen)
-function). Throws an exception if the file could not be opened.
-
-Copying one $(D File) object to another results in the two $(D File)
-objects referring to the same underlying file.
-
-The destructor automatically closes the file as soon as no $(D File)
-object refers to it anymore.
- */
-
-    this(string name, in char[] stdioOpenmode = "rb")
-    {
-        p = new Impl(errnoEnforce(.fopen(name, stdioOpenmode),
-"Cannot open file `"~name
-~"' in mode `"~stdioOpenmode.idup~"'"
+text("Cannot open file `", name, "' in mode `",
+        stdioOpenmode, "'")
-                1, name);
-    }
-
-    ~this()
-    {
-        if (!p) return;
-        // @@@BUG@@@ These lines prematurely close the file
-        //printf("Destroying file `%s' with %d refs\n", toStringz(p.name), p.refs);
-        if (p.refs == 1) close;
-        else --p.refs;
-    }
-
-    this(this)
-    {
-        if (!p) return;
-
-
+
-        ++p.refs;
-    }
-
-/**
-Assigns a file to another. The target of the assignment gets detached
-from whatever file it was attached to, and attaches itself to the new
-file.
- */
-    void opAssign(File rhs)
-    {
-        // printf("Assigning file %s with %d refs\n",
-        //         toStringz(rhs.p.name), rhs.p.refs);
-        // @@@BUG@@@
-        swap(p, rhs.p);
-        // p = rhs.p;
-        // rhs.p = null;
-    }
-
-/**
-First calls $(D detach) (throwing on failure), and then attempts to
-_open file $(D name) with mode $(D stdioOpenmode). The mode has the
-same semantics as in the C standard library $(WEB
-cplusplus.com/reference/clibrary/cstdio/fopen.html, fopen) function.
-Throws exception in case of error.
- */
-string
+in char[]
-    {
-        detach;
-        auto another = File(name, stdioOpenmode);
-        swap(this, another);
-    }
-
-/**
-First calls $(D detach) (throwing on failure), and then runs a command
-by calling the C standard library function $(WEB
-opengroup.org/onlinepubs/007908799/xsh/_popen.html, _popen).
- */
-string
+in char[]
-    {
-        detach;
-        p = new Impl(errnoEnforce(.popen(command, stdioOpenmode),
-                        "Cannot run command `"~command~"'"),
-                1, command);
-    }
-
-/** Returns $(D true) if the file is opened. */
-
+@property 
-    {
-        return p !is null && p.handle;
-    }
-
-/**
-Returns $(D true) if the file is at end (see $(WEB
-cplusplus.com/reference/clibrary/cstdio/feof.html, feof)). The file
-must be opened, otherwise an exception is thrown.
- */
-
+@property 
-    {
-        enforce(p && p.handle, "Calling eof() against an unopened file.");
-        return .feof(cast(FILE*) p.handle) != 0;
-    }
-
-/** Returns the name of the file, if any. */
-
+@property 
-    {
-        return p.name;
-    }
-
-/**
-If the file is not opened, returns $(D false). Otherwise, returns
-$(WEB cplusplus.com/reference/clibrary/cstdio/ferror.html, ferror) for
-the file handle.
- */
-
+@property 
-    {
-        return !p.handle || .ferror(cast(FILE*) p.handle);
-    }
-
-/**
-Detaches from the underlying file. If the sole owner, calls $(D close)
-and throws if that fails.
-  */
-    void detach()
-    {
@@ -514 +505 @@
-                        p.name, "'"));
-    }
-
-    unittest
-    {
-        auto f = File("deleteme", "w");
-        scope(exit) std.file.remove("deleteme");
-        f.rawWrite("\r\n\n\r\n");
-        f.close();
-        assert(std.file.read("deleteme") == "\r\n\n\r\n");
-        /+
-        stdout.rawWrite("\r\n\n\r\n");
-        +/
-    }
-
-/**
-If the file is not opened, throws an exception. Otherwise, calls $(WEB
-cplusplus.com/reference/clibrary/cstdio/fseek.html, fseek) for the
-file handle. Throws on error.
- */
-    void seek(long offset, int origin = SEEK_SET)
-    {
-        enforce(p && p.handle,
@@ -556 +544 @@
-        return result;
-    }
-
-/**
-If the file is not opened, throws an exception. Otherwise, calls $(WEB
-cplusplus.com/reference/clibrary/cstdio/_rewind.html, _rewind) for the
-file handle. Throws on error.
- */
-    void rewind()
-    {
-
-
+
-        .rewind(p.handle);
-    }
-
-/**
-If the file is not opened, throws an exception. Otherwise, calls $(WEB
-cplusplus.com/reference/clibrary/cstdio/_setvbuf.html, _setvbuf) for
-the file handle.
- */
-    void setvbuf(size_t size, int mode = _IOFBF)
-    {
-
-
-
-
-
+
+
+
-    }
-
-/**
-If the file is not opened, throws an exception. Otherwise, calls
-$(WEB cplusplus.com/reference/clibrary/cstdio/_setvbuf.html,
-_setvbuf) for the file handle. */
-    void setvbuf(void[] buf, int mode = _IOFBF)
-    {
-
-
-
-
-
+
+
+
+
-    }
-
-/**
-If the file is not opened, throws an exception. Otherwise, writes its
-arguments in text format to the file. */
-    void write(S...)(S args)
-    {
-
+()
-        foreach (arg; args)
-        {
-            static if (isSomeString!(typeof(arg)))
-            {
-                w.put(arg);
-            }
-            else
-            {
-                std.format.formattedWrite(w, "%s", arg);
-            }
-        }
-    }
-
-/**
-If the file is not opened, throws an exception. Otherwise, writes its
-arguments in text format to the file, followed by a newline. */
-    void writeln(S...)(S args)
-    {
-        write(args, '\n');
-
+
+
-    }
-
-    private enum errorMessage =
-        "You must pass a formatting string as the first"
-        " argument to writef or writefln. If no formatting is needed,"
-        " you may want to use write or writeln.";
-
-/**
-If the file is not opened, throws an exception. Otherwise, writes its
-arguments in text format to the file, according to the format in the
@@ -767 +752 @@
-        char[] buf;
-        while (f.readln(buf, "\n\r"))
-        {
-            assert(i < witness.length);
-            assert(buf == witness[i++]);
-        }
-    }
-
-    size_t readf(Data...)(in char[] format, Data data)
-    {
-
+
+
-        formattedRead(input, format, data);
-        return 1;
+    }
+
+    unittest
+    {
+        std.file.write("deleteme", "hello\nworld\n");
+        scope(exit) std.file.remove("deleteme");
+        string s;
+        auto f = File("deleteme");
+        f.readf("%s\n", &s);
+        assert(s == "hello", "["~s~"]");
-    }
-
-/**
- Returns a temporary file by calling $(WEB
- cplusplus.com/reference/clibrary/cstdio/_tmpfile.html, _tmpfile). */
-    static File tmpfile()
-    {
-        auto h = errnoEnforce(core.stdc.stdio.tmpfile,
-                "Could not create temporary file with tmpfile()");
-        File result = void;
@@ -1127 +1123 @@
-
-        // void opAssign(LockingTextWriter rhs)
-        // {
-        //     swap(this, rhs);
-        // }
-    }
-
-/// Convenience function.
-    LockingTextWriter lockingTextWriter()
-    {
-        // @@@BUG2341@@@
-        return LockingTextWriter(this);
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-unittest
-{
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-}
-
-private
-void writefx(FILE* fps, TypeInfo[] arguments, void* argptr, int newline=false)
-{
-    int orientation = fwide(fps, 0);    // move this inside the lock?
-
-    /* Do the file stream locking at the outermost level
-     * rather than character by character.
-     */
@@ -1480 +1501 @@
-        writeln(b);
-    }
-    stdout.close;
-    auto read = cast(char[]) std.file.read(file);
-    version (Windows)
-        assert(read == "Hello, nice world number 42!\r\n1\r\n1\r\n1\r\n", read);
-    else
-        assert(read == "Hello, nice world number 42!\n1\n1\n1\n", "["~read~"]");
-}
-
+/**
+ * Formatted read one line from stdin.
+ */
+void readf(A...)(in char[] format, A args)
+{
+    return stdin.readf(format, args);
+}
+
+unittest
+{
+    float f;
+    if (false) readf("%s", &f);
+}
+
-/**********************************
- * Read line from stream $(D fp).
- * Returns:
- *        $(D null) for end of file,
- *        $(D char[]) for line read from $(D fp), including terminating character
- * Params:
- *        $(D fp) = input stream
- *        $(D terminator) = line terminator, '\n' by default
- * Throws:
- *        $(D StdioException) on error
@@ -2018 +2053 @@
-        scope(exit) f.close;
-        auto t = [ tuple(1, 2), tuple(4, 1), tuple(5, 100) ];
-        uint i;
-        foreach (e; f.byRecord!(int, int)("%s %s"))
-        {
-            //writeln(e);
-            assert(e == t[i++]);
-        }
-        assert(i == 3);
-    }
-    // {
-    //     std.file.write("deleteme", "1:2 3\n4:1 5\n5:100");
-    //     File f = File("deleteme");
-    //     scope(exit) f.close;
-    //     auto t = [ tuple(1, [2,3][]), tuple(4, [1,5][]), tuple(5, [100][]) ];
-    //     uint i;
-    //     foreach (e; f.byRecord!(int, int[])("%s:%(s )"))
-    //     {
-    //         //writeln(e);
-    //         assert(e == t[i++]);
-    //     }
-    //     assert(i == 3);
-    // }
-}
-
-// Private implementation of readln
+version (DIGITAL_MARS_STDIO)
-private size_t readlnImpl(FILE* fps, ref char[] buf, dchar terminator = '\n')
-{
-
-
-
-
+
+
-
-    /* Since fps is now locked, we can create an "unshared" version
-     * of fp.
-     */
-    auto fp = cast(_iobuf*)fps;
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-             */
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-            buf.length = 0;
-            int c2;
-            for (int c = void; (c = FGETWC(fp)) != -1; )
-            {
-                if ((c & ~0x7F) == 0)
-app.put(cast(char) c)
+buf ~= c
-                    if (c == terminator)
-                        break;
-                }
-                else
-                {
-                    if (c >= 0xD800 && c <= 0xDBFF)
-                    {
+                        int c2 = void;
-                        if ((c2 = FGETWC(fp)) != -1 ||
-                                c2 < 0xDC00 && c2 > 0xDFFF)
-                        {
-                            StdioException("unpaired UTF-16 surrogate");
-                        }
-                        c = ((c - 0xD7C0) << 10) + (c2 - 0xDC00);
-                    }
-                    std.utf.encode(buf, c);
-                }
-            }
+            if (ferror(fp))
+                StdioException();
+            return buf.length;
+        }
+        else version (Posix)
+        {
+            buf.length = 0;
+            for (int c; (c = FGETWC(fp)) != -1; )
+            {
+                if ((c & ~0x7F) == 0)
+                    buf ~= cast(char)c;
+                else
+                    std.utf.encode(buf, cast(dchar)c);
+                if (c == terminator)
+                    break;
+            }
-            if (ferror(fps))
-                StdioException();
-            return buf.length;
-        }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                }
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-            if (ferror(fps))
-                StdioException();
-            return buf.length;
-        }
-        else
-        {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+