11d4fee · Idris-dev · git.iko.soy

git.iko.soy/Idris-dev

Some file handling

commit11d4fee42681bdd7982ec0577d220e400ac1b57b authorEdwin Brady <eb@cs.st-andrews.ac.uk> dateThu 15 Dec 2011, 14:36 (15 years ago) parente261167

7 files changed+87−5

compare with master

unifiedsplit

lib/io.idr+3−3 lib/prelude.idr+39 src/Idris/AbsSyntax.hs+1−1 src/Idris/Compiler.hs+7−1 test/test004/expected+5 test/test004/run+4 test/test004/test004.idr+28

lib/io.idr+3−3

@@ -6,13 +6,13 @@ io_bind : IO a -> (a -> IO b) -> IO b;

66io_bind (prim__IO v) k = k v;

88io_return : a -> IO a;

9−io_return = prim__IO;

9+io_return x = prim__IO x;

1010

1111-- This may seem pointless, but we can use it to force an

1212-- evaluation of main that Epic wouldn't otherwise do...

1313

14−run__IO : IO () -> IO ();

15−run__IO (prim__IO v) = prim__IO v;

14+-- run__IO : IO () -> IO ();

15+-- run__IO (prim__IO v) = prim__IO v;

1616

1717

lib/prelude.idr+39

@@ -141,3 +141,42 @@ print = putStrLn . show;

141141readLine : IO String;

142142readLine = mkForeign (FFun "readStr" Nil FString);

143143

144+---- some basic file handling

145+

146+data File = FHandle Ptr;

147+

148+do_fopen : String -> String -> IO Ptr;

149+do_fopen f m = mkForeign (FFun "fileOpen" [FString, FString] FPtr) f m;

150+

151+fopen : String -> String -> IO File;

152+fopen f m = do { h <- do_fopen f m;

153+ return (FHandle h); };

154+

155+do_fclose : Ptr -> IO ();

156+do_fclose h = mkForeign (FFun "fileClose" [FPtr] FUnit) h;

157+

158+fclose : File -> IO ();

159+fclose (FHandle h) = do_fclose h;

160+

161+do_fread : Ptr -> IO String;

162+do_fread h = mkForeign (FFun "freadStr" [FPtr] FString) h;

163+

164+fread : File -> IO String;

165+fread (FHandle h) = do_fread h;

166+

167+do_fwrite : Ptr -> String -> IO ();

168+do_fwrite h s = mkForeign (FFun "fputStr" [FPtr, FString] FUnit) h s;

169+

170+fwrite : File -> String -> IO ();

171+fwrite (FHandle h) s = do_fwrite h s;

172+

173+do_feof : Ptr -> IO Int;

174+do_feof h = mkForeign (FFun "feof" [FPtr] FInt) h;

175+

176+feof : File -> IO Bool;

177+feof (FHandle h) = do { eof <- do_feof h;

178+ return (not (eof == 0)); };

179+

180+

181+

182+

src/Idris/AbsSyntax.hs+1−1

@@ -288,7 +288,7 @@ impl = Imp False Dynamic

288288expl = Exp False Dynamic

289289constraint = Constraint False Static

290290

291−data FnOpt = Inlinable | Partial

291+data FnOpt = Inlinable | Partial | Abstract | Private

292292 deriving (Show, Eq)

293293

294294type FnOpts = [FnOpt]

src/Idris/Compiler.hs+7−1

@@ -32,7 +32,7 @@ mkDecls = do i <- getIState

3232ename x = name ("idris_" ++ show x)

3333aname x = name ("a_" ++ show x)

3434

35−epicMain = effect_ $ ref (ename (UN "run__IO")) @@

35+epicMain = effect_ $ -- ref (ename (UN "run__IO")) @@

3636 ref (ename (NS (UN "main") ["main"]))

3737

3838class ToEpic a where

@@ -63,6 +63,12 @@ instance ToEpic (TT Name) where

6363 return $ lazy_ arg'

6464 | (P _ (UN "believe_me") _, [_, _, arg]) <- unApply tm

6565 = epic' env arg

66+-- | (P _ (UN "prim__IO") _, [_, v]) <- unApply tm

67+-- = epic' env v

68+-- | (P _ (UN "io_bind") _, [_,_,v,k]) <- unApply tm

69+-- = do v' <- epic' env v

70+-- k' <- epic' env k

71+-- return (k' @@ v')

6672 epic' env (P (DCon t a) n _) = return $ con_ t

6773 epic' env (P (TCon t a) n _) = return $ con_ t

6874 epic' env (P _ n _) = return $ ref (ename n)

test/test004/expectednew file+5

@@ -0,0 +1,5 @@

1+Reading testfile

2+Hello!

3+World!

5+---

test/test004/runnew file+4

@@ -0,0 +1,4 @@

1+#!/bin/bash

2+idris test004.idr -o test004

3+./test004

4+rm -f test004 test004.ibc testfile

test/test004/test004.idrnew file+28

@@ -0,0 +1,28 @@

1+module main;

3+readFile : String -> IO String;

4+readFile fn = do { h <- fopen fn "r";

5+ c <- readFile' h "";

6+ fclose h;

7+ return c;

8+ }

9+ where {

10+ readFile' : File -> String -> IO String;

11+ readFile' h contents =

12+ do { x <- feof h;

13+ if (not x) then (do { l <- fread h;

14+ readFile' h (contents ++ l);

15+ })

16+ else (return contents); };

17+ }

18+

19+main : IO ();

20+main = do { h <- fopen "testfile" "w";

21+ fwrite h "Hello!\nWorld!\n";

22+ fclose h;

23+ putStrLn "Reading testfile";

24+ f <- readFile "testfile";

25+ putStrLn f;

26+ putStrLn "---";

27+ };

28+