uplime/lamb
uplime
/
lamb
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Allow slashed module names and use their base name

This commit is contained in:
darkf 2013-10-29 02:48:06 -07:00
parent c311d22c85
commit cda4a8a345
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
interp.hs
View File

@ -12,7 +12,7 @@ import Control.Monad.Trans (lift)
import Control.Monad.Trans.State (StateT, runStateT, evalStateT, get, put) import Control.Monad.Trans.State (StateT, runStateT, evalStateT, get, put)
import System.IO (Handle, hPutStr, hGetLine, hFlush, hClose, hIsEOF, openBinaryFile, IOMode(..), stdout, stdin) import System.IO (Handle, hPutStr, hGetLine, hFlush, hClose, hIsEOF, openBinaryFile, IOMode(..), stdout, stdin)
import System.Directory (doesFileExist) import System.Directory (doesFileExist)
import System.FilePath (FilePath, splitExtension) import System.FilePath (FilePath, splitExtension, takeBaseName)
import AST import AST
import Parser (parseProgram) import Parser (parseProgram)
@ -191,7 +191,7 @@ _Import (StrV modname) = do
let path = modname ++ ".lamb" let path = modname ++ ".lamb"
exists <- doesFileExist path exists <- doesFileExist path
if exists then if exists then
return (path, fst $ splitExtension path) return (path, takeBaseName path)
else error $ "module " ++ modname ++ " couldn't be found" else error $ "module " ++ modname ++ " couldn't be found"
initialState = ([stdout, stdin], initialState = ([stdout, stdin],