on master help sign in
Merge pull request #181 from raichoo/master
1eed9c2Edwin Brady
src/Idris/Parser.hs+6−5
@@ -63,12 +63,13 @@ fixErrorMsg msg fixes = msg ++ ", possible fixes:\n" ++ (concat $ intersperse "\
63loadModule :: FilePath -> Idris String
63loadModule :: FilePath -> Idris String
64loadModule f
64loadModule f
65 = idrisCatch (do i <- getIState
65 = idrisCatch (do i <- getIState
66+ let file = takeWhile (/= ' ') f
66 ibcsd <- valIBCSubDir i
67 ibcsd <- valIBCSubDir i
67 ids <- allImportDirs i
68 ids <- allImportDirs i
68− fp <- liftIO $ findImport ids ibcsd f
69+ fp <- liftIO $ findImport ids ibcsd file
69− if f `elem` imported i
70+ if file `elem` imported i
70− then iLOG $ "Already read " ++ f
71+ then iLOG $ "Already read " ++ file
71− else do putIState (i { imported = f : imported i })
72+ else do putIState (i { imported = file : imported i })
72 case fp of
73 case fp of
73 IDR fn -> loadSource False fn
74 IDR fn -> loadSource False fn
74 LIDR fn -> loadSource True fn
75 LIDR fn -> loadSource True fn
@@ -78,7 +79,7 @@ loadModule f
78 case src of
79 case src of
79 IDR sfn -> loadSource False sfn
80 IDR sfn -> loadSource False sfn
80 LIDR sfn -> loadSource True sfn)
81 LIDR sfn -> loadSource True sfn)
81− let (dir, fh) = splitFileName f
82+ let (dir, fh) = splitFileName file
82 return (dropExtension fh))
83 return (dropExtension fh))
83 (\e -> do let msg = show e
84 (\e -> do let msg = show e
84 setErrLine (getErrLine msg)
85 setErrLine (getErrLine msg)