GitHub/gf-core
1
0
Fork 1
mirror of https://github.com/GrammaticalFramework/gf-core.git synced 2026-05-14 13:42:50 -06:00
Code Issues Packages Projects Releases Wiki Activity

added alltenses to the default search path (just like prelude)

Browse Source
This commit is contained in:
aarne
2012-12-20 16:05:34 +00:00
parent fa6f8f49ce
commit 793ba98249
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/compiler/GF/Compile.hs
View File

@@ -124,7 +124,7 @@ compileModule opts1 env file = do
exists <- ioeIO $ doesFileExist file1 exists <- ioeIO $ doesFileExist file1
if exists if exists
then return file1 then return file1
else ioeErr $ Bad (render (text "None of this files exist:" $$ nest 2 (text file $$ text file1))) else ioeErr $ Bad (render (text "None of these files exists:" $$ nest 2 (text file $$ text file1)))
else ioeErr $ Bad (render (text "File" <+> text file <+> text "does not exist.")) else ioeErr $ Bad (render (text "File" <+> text file <+> text "does not exist."))
compileOne :: Options -> CompileEnv -> FullPath -> IOE CompileEnv compileOne :: Options -> CompileEnv -> FullPath -> IOE CompileEnv

3
src/compiler/GF/Infra/UseIO.hs
View File

@@ -70,7 +70,8 @@ getLibraryDirectory opts =
getGrammarPath :: FilePath -> IO [FilePath] getGrammarPath :: FilePath -> IO [FilePath]
getGrammarPath lib_dir = do getGrammarPath lib_dir = do
catch (fmap splitSearchPath $ getEnv gfGrammarPathVar) (\_ -> return [lib_dir </> "prelude"]) -- e.g. GF_GRAMMAR_PATH catch (fmap splitSearchPath $ getEnv gfGrammarPathVar)
(\_ -> return [lib_dir </> "alltenses",lib_dir </> "prelude"]) -- e.g. GF_GRAMMAR_PATH
-- | extends the search path with the -- | extends the search path with the
-- 'gfLibraryPath' and 'gfGrammarPathVar' -- 'gfLibraryPath' and 'gfGrammarPathVar'