on master help sign in
Merge remote-tracking branch 'upstream/master' into idrisdoc
commitd34b7fccbb257328d19c22daf3b7da76bd48e00e authorPhilip Rasmussen <pjor@itu.dk> dateThu 3 Apr 2014, 18:28 (13 years ago) parent20e0bf493b1c81
6 files changed+133−26
libs/effects/Effect/File.idr+85−14 libs/prelude/Prelude/Fin.idr+6 libs/prelude/Prelude/Vect.idr+8 src/Idris/Coverage.hs+18−4 src/Idris/ElabDecls.hs+11−6 src/Idris/IBC.hs+5−2
libs/effects/Effect/File.idr+85−14
@@ -1,24 +1,78 @@
1+-- -------------------------------------------------------- [ Effectful FileIO ]
12module Effect.File
23
34import Effects
45import Control.IOExcept
56
6−data OpenFile : Mode -> Type where
7+
8+||| A Dependent type to describe File Handles. File handles are
9+||| parameterised with the current state of the file: Closed; Open for
10+||| reading; and Open for writing.
11+|||
12+||| @ m The file mode.
13+data OpenFile : (m : Mode) -> Type where
714 FH : File -> OpenFile m
815
916openOK : Mode -> Bool -> Type
1017openOK m True = OpenFile m
1118openOK m False = ()
1219
20+-- ------------------------------------------------------------ [ The Protocol ]
21+
22+||| Here the protocol for resource access is defined as an effect.
23+||| The state transitions diagram for the protocol is as follows:
24+|||
25+||| digraph G {
26+|||
27+||| empty; read; write; // States
28+|||
29+||| empty -> read [label="Open R"];
30+||| read -> empty [label="Close"];
31+||| read -> read [label="ReadLine"];
32+||| read -> read [label="EOF"];
33+|||
34+||| empty -> write [label="Open W"];
35+||| write -> empty [label="Close"];
36+||| write -> write [label="WriteLine"];
37+|||
38+||| }
1339data FileIO : Effect where
14− Open : String -> (m : Mode) ->
15− {() ==> {res} if res then OpenFile m else ()} FileIO Bool
16− Close : {OpenFile m ==> ()} FileIO ()
17−
18− ReadLine : {OpenFile Read} FileIO String
19− WriteLine : String -> {OpenFile Write} FileIO ()
20− EOF : {OpenFile Read} FileIO Bool
21−
40+ ||| Open a file with the specified mode.
41+ |||
42+ ||| Opening a file successful moves the state from 'empty' to the
43+ ||| specified mode. If not successful the state is still 'empty'.
44+ |||
45+ ||| @ fname The file name to be opened.
46+ ||| @ m The file mode.
47+ Open : (fname: String)
48+ -> (m : Mode)
49+ -> {() ==> {res} if res
50+ then OpenFile m
51+ else ()} FileIO Bool
52+
53+ ||| Close a file.
54+ |||
55+ ||| Closing a file moves the state from Open to closed.
56+ Close : {OpenFile m ==> ()} FileIO ()
57+
58+ ||| Read a line from the file.
59+ |||
60+ ||| Only files that are open for reading can be read.
61+ ReadLine : {OpenFile Read} FileIO String
62+
63+ ||| Write a line to a file.
64+ |||
65+ ||| Only file that are open for writing can be written to.
66+ WriteLine : String -> {OpenFile Write} FileIO ()
67+
68+ ||| End of file?
69+ |||
70+ ||| Only files open for reading can be tested for EOF
71+ EOF : {OpenFile Read} FileIO Bool
72+
73+-- ------------------------------------------------------------ [ The Handlers ]
74+
75+--- An implementation of the resource access protocol for the IO Context.
2276instance Handler FileIO IO where
2377 handle () (Open fname m) k = do h <- openFile fname m
2478 valid <- validFile h
@@ -33,30 +87,47 @@ instance Handler FileIO IO where
3387 handle (FH h) EOF k = do e <- feof h
3488 k e (FH h)
3589
90+-- -------------------------------------------------------------- [ The Effect ]
3691FILE_IO : Type -> EFFECT
3792FILE_IO t = MkEff t FileIO
3893
94+-- ------------------------------------------------------------ [ The Bindings ]
95+--
96+-- Bind the IO context handlers to functions. These functions will run
97+-- in the IO context.
98+--
99+
100+||| Open a file with the specified mode.
101+|||
102+||| @ fname The file name to be opened.
103+||| @ m The file mode.
39104open : Handler FileIO e =>
40− String -> (m : Mode) ->
41− { [FILE_IO ()] ==> [FILE_IO (if result then OpenFile m else ())] } Eff e Bool
105+ (fname : String)
106+ -> (m : Mode)
107+ -> { [FILE_IO ()] ==> [FILE_IO (if result
108+ then OpenFile m
109+ else ())] } Eff e Bool
42110open f m = Open f m
43111
112+
113+||| Close a file.
44114close : Handler FileIO e =>
45115 { [FILE_IO (OpenFile m)] ==> [FILE_IO ()] } Eff e ()
46116close = Close
47117
118+||| Read a line from the file.
48119readLine : Handler FileIO e =>
49120 { [FILE_IO (OpenFile Read)] } Eff e String
50121readLine = ReadLine
51122
123+||| Write a line to a file.
52124writeLine : Handler FileIO e =>
53125 String -> { [FILE_IO (OpenFile Write)] } Eff e ()
54126writeLine str = WriteLine str
55127
128+||| End of file?
56129eof : Handler FileIO e =>
57130 { [FILE_IO (OpenFile Read)] } Eff e Bool
58131eof = EOF
59132
60−
61−
62−
133+-- --------------------------------------------------------------------- [ EOF ]
libs/prelude/Prelude/Fin.idr+6
@@ -98,6 +98,12 @@ instance MaxBound (Fin (S n)) where
9898(+) {n=S n} {m=m} fZ f' = rewrite plusCommutative n m in weaken (weakenN n f')
9999(+) (fS f) f' = fS (f + f')
100100
101+||| Substract two Fins, keeping the bound of the minuend
102+(-) : Fin n -> Fin m -> Fin n
103+fZ - _ = fZ
104+f - fZ = f
105+(fS f) - (fS f') = weaken $ f - f'
106+
101107||| Multiply two Fins, extending the bound
102108(*) : Fin n -> Fin m -> Fin (n * m)
103109(*) {n=Z} f f' = FinZElim f
libs/prelude/Prelude/Vect.idr+8
@@ -381,6 +381,14 @@ nub = nubBy (==)
381381-- Splitting and breaking lists
382382--------------------------------------------------------------------------------
383383
384+||| A tuple where the first element is a Vect of the n first elements and
385+||| the second element is a Vect of the remaining elements of the original Vect
386+||| It is equivalent to (take n xs, drop n xs)
387+||| @ m the index to split at
388+||| @ xs the Vect to split in two
389+splitAt : {n : Nat} -> (m : Fin (S n)) -> (xs : Vect n a) -> (Vect (cast m) a, Vect (n - cast m) a)
390+splitAt n xs = (take n xs, drop n xs)
391+
384392--------------------------------------------------------------------------------
385393-- Predicates
386394--------------------------------------------------------------------------------
src/Idris/Coverage.hs+18−4
@@ -51,13 +51,18 @@ mkPatTm t = do i <- getIState
5151-- This will only work after the given clauses have been typechecked and the
5252-- names are fully explicit!
5353
54−genClauses :: FC -> Name -> [Term] -> [PClause] -> Idris [PTerm]
54+genClauses :: FC -> Name -> [Term] -> [PTerm] -> Idris [PTerm]
5555genClauses fc n xs given
5656 = do i <- getIState
57− let lhss = map (getLHS i) xs
57+ let lhs_tms = map (\x -> delab' i x True True) xs
58+ -- if a placeholder was given, don't bother generating cases for it
59+ let lhs_tms' = zipWith mergePlaceholders lhs_tms given
60+ let lhss = map pUnApply lhs_tms'
61+
5862 let argss = transpose lhss
5963 let all_args = map (genAll i) argss
6064 logLvl 5 $ "COVERAGE of " ++ show n
65+ logLvl 5 $ show lhss
6166 logLvl 5 $ show (map length argss) ++ "\n" ++ show (map length all_args)
6267 logLvl 10 $ show argss ++ "\n" ++ show all_args
6368 logLvl 1 $ "Original: \n" ++
@@ -82,8 +87,8 @@ genClauses fc n xs given
8287 | (f, args) <- unApply term = map (\t -> delab' i t True True) args
8388 | otherwise = []
8489
85− lhsApp (PClause _ _ l _ _ _) = l
86− lhsApp (PWith _ _ l _ _ _) = l
90+ pUnApply (PApp _ _ args) = map getTm args
91+ pUnApply _ = []
8792
8893 -- Return whether the given clause matches none of the input clauses
8994 -- (xs)
@@ -92,6 +97,14 @@ genClauses fc n xs given
9297 Left miss -> True) xs
9398
9499
100+ mergePlaceholders :: PTerm -> PTerm -> PTerm
101+ mergePlaceholders x Placeholder = Placeholder
102+ mergePlaceholders (PApp fc f args) (PApp fc' f' args')
103+ = PApp fc' f' (zipWith mergePArg args args')
104+ where mergePArg x y = let xtm = mergePlaceholders (getTm x) (getTm y) in
105+ x { getTm = xtm}
106+ mergePlaceholders x _ = x
107+
95108 mkClauses :: [PArg] -> [[PTerm]] -> [PTerm]
96109 mkClauses parg args
97110 | all (== [Placeholder]) args = []
@@ -114,6 +127,7 @@ fnub' acc [] = acc
114127
115128-- quick check for constructor equality
116129quickEq :: PTerm -> PTerm -> Bool
130+quickEq (PConstant n) (PConstant n') = n == n'
117131quickEq (PRef _ n) (PRef _ n') = n == n'
118132quickEq (PApp _ t as) (PApp _ t' as')
119133 | length as == length as'
src/Idris/ElabDecls.hs+11−6
@@ -908,8 +908,10 @@ elabClauses info fc opts n_in cs = let n = liftname info n_in in
908908 tclift $ tfail $ At fc (NoTypeDecl n)
909909 [ty] -> return ty
910910 let atys = map snd (getArgTys fty)
911− pats_in <- mapM (elabClause info opts)
911+ cs_elab <- mapM (elabClause info opts)
912912 (zip [0..] cs)
913+ let (pats_in, cs_full) = unzip cs_elab
914+
913915 logLvl 3 $ "Elaborated patterns:\n" ++ show pats_in
914916
915917 -- if the return type of 'ty' is collapsible, the optimised version should
@@ -994,7 +996,7 @@ elabClauses info fc opts n_in cs = let n = liftname info n_in in
994996 cov <- coverage
995997 pmissing <-
996998 if cov && not (hasDefault cs)
997− then do missing <- genClauses fc n (map getLHS pdef) cs
999+ then do missing <- genClauses fc n (map getLHS pdef) cs_full
9981000 -- missing <- genMissing n scargs sc
9991001 missing' <- filterM (checkPossible info fc True n) missing
10001002 let clhs = map getLHS pdef
@@ -1352,16 +1354,19 @@ propagateParams ps t (PRef fc n)
13521354 = PApp fc (PRef fc n) (map (\x -> pimp x (PRef fc x) True) ps)
13531355propagateParams ps t x = x
13541356
1357+-- Return the elaborated LHS/RHS, and the original LHS with implicits added
13551358elabClause :: ElabInfo -> FnOpts -> (Int, PClause) ->
1356− Idris (Either Term (Term, Term))
1359+ Idris (Either Term (Term, Term), PTerm)
13571360elabClause info opts (_, PClause fc fname lhs_in [] PImpossible [])
13581361 = do let tcgen = Dictionary `elem` opts
1362+ i <- get
1363+ let lhs = addImpl i lhs_in
13591364 b <- checkPossible info fc tcgen fname lhs_in
13601365 case b of
13611366 True -> tclift $ tfail (At fc
13621367 (Msg $ show lhs_in ++ " is a valid case"))
13631368 False -> do ptm <- mkPatTm lhs_in
1364− return (Left ptm)
1369+ return (Left ptm, lhs)
13651370elabClause info opts (cnum, PClause fc fname lhs_in withs rhs_in whereblock)
13661371 = do let tcgen = Dictionary `elem` opts
13671372 ctxt <- getContext
@@ -1502,7 +1507,7 @@ elabClause info opts (cnum, PClause fc fname lhs_in withs rhs_in whereblock)
15021507 when (rev || ErrorReverse `elem` opts) $ do
15031508 addIBC (IBCErrRev (crhs, clhs))
15041509 addErrRev (crhs, clhs)
1505− return $ Right (clhs, crhs)
1510+ return $ (Right (clhs, crhs), lhs)
15061511 where
15071512 mkLHSapp t@(PRef _ _) = trace ("APP " ++ show t) $ PApp fc t []
15081513 mkLHSapp t = t
@@ -1669,7 +1674,7 @@ elabClause info opts (_, PWith fc fname lhs_in withs wval_in withblock)
16691674 mapM_ (elabCaseBlock info opts) is
16701675 logLvl 5 ("Checked RHS " ++ show rhs')
16711676 (crhs, crhsty) <- recheckC fc [] rhs'
1672− return $ Right (clhs, crhs)
1677+ return $ (Right (clhs, crhs), lhs)
16731678 where
16741679 getImps (Bind n (Pi _) t) = pexp Placeholder : getImps t
16751680 getImps _ = []
src/Idris/IBC.hs+5−2
@@ -400,8 +400,11 @@ pPatdefs ds
400400pDefs :: [Name] -> [(Name, Def)] -> Idris ()
401401pDefs syms ds
402402 = mapM_ (\ (n, d) ->
403− do i <- getIState
404− let d' = updateDef d
403+ do let d' = updateDef d
404+ case d' of
405+ TyDecl _ _ -> return ()
406+ _ -> solveDeferred n
407+ i <- getIState
405408 logLvl 5 $ "Added " ++ show (n, d')
406409 putIState (i { tt_ctxt = addCtxtDef n d' (tt_ctxt i) })) ds
407410 where