on master help sign in
Merge pull request #2896 from sheganinans/master
2a6b577Niklas Larsson
libs/prelude/Prelude/File.idr+22−10
@@ -96,17 +96,33 @@ validFile (FHandle h) = do x <- nullPtr h
96 return (not x)
96 return (not x)
97
97
98||| Modes for opening files
98||| Modes for opening files
99−data Mode = Read | Write | ReadWrite
99+data Mode = Read | WriteTruncate | Append | ReadWrite | ReadWriteTruncate | ReadAppend
100+
101+Write : Mode
102+Write = WriteTruncate
103+%deprecate Write "Please use WriteTruncate instead."
104+
105+modeStr : Mode -> String
106+modeStr Read = "r"
107+modeStr WriteTruncate = "w"
108+modeStr Append = "a"
109+modeStr ReadWrite = "r+"
110+modeStr ReadWriteTruncate = "w+"
111+modeStr ReadAppend = "a+"
100
112
101||| Open a file
113||| Open a file
102||| @ f the filename
114||| @ f the filename
103−||| @ m the mode; either Read, Write, or ReadWrite
115+||| @ m the mode; either Read, WriteTruncate, Append, ReadWrite, ReadWriteTruncate, or ReadAppend
104export
116export
105openFile : (f : String) -> (m : Mode) -> IO (Either FileError File)
117openFile : (f : String) -> (m : Mode) -> IO (Either FileError File)
106−openFile f m = fopen f (modeStr m) where
118+openFile f m = fopen f (modeStr m)
107− modeStr Read = "r"
119+
108− modeStr Write = "w"
120+||| Open a file using C11 extended modes.
109− modeStr ReadWrite = "r+"
121+||| @ f the filename
122+||| @ m the mode; either Read, WriteTruncate, Append, ReadWrite, ReadWriteTruncate, or ReadAppend
123+export
124+openFileX : (f : String) -> (m : Mode) -> IO (Either FileError File)
125+openFileX f m = fopen f $ modeStr m ++ "x"
110
126
111private
127private
112do_fclose : Ptr -> IO ()
128do_fclose : Ptr -> IO ()
@@ -142,10 +158,6 @@ popen f m = do ptr <- do_popen f (modeStr m)
142 then do err <- getFileError
158 then do err <- getFileError
143 return (Left err)
159 return (Left err)
144 else return (Right (FHandle ptr))
160 else return (Right (FHandle ptr))
145− where
146− modeStr Read = "r"
147− modeStr Write = "w"
148− modeStr ReadWrite = "r+"
149
161
150export
162export
151pclose : File -> IO ()
163pclose : File -> IO ()
test/io001/test004.idr+1−1
@@ -17,7 +17,7 @@ dumpFile fn = do { Right h <- openFile fn Read
17 closeFile h }
17 closeFile h }
18
18
19main : IO ()
19main : IO ()
20−main = do { Right h <- openFile "testfile" Write
20+main = do { Right h <- openFile "testfile" WriteTruncate
21 fPutStr h "Hello!\nWorld!\n...\n3\n4\nLast line\n"
21 fPutStr h "Hello!\nWorld!\n...\n3\n4\nLast line\n"
22 closeFile h
22 closeFile h
23 putStrLn "Reading testfile"
23 putStrLn "Reading testfile"