diff options
| author | aarne <aarne@chalmers.se> | 2012-12-20 16:05:34 +0000 |
|---|---|---|
| committer | aarne <aarne@chalmers.se> | 2012-12-20 16:05:34 +0000 |
| commit | 5ff33f47be003088bd5a5b0e5b7c35a83151a751 (patch) | |
| tree | be984e0bdca7b543425516365f35b0e86a74dc3b | |
| parent | d968503d90cbc3a2fa7e41616652a1cd07683c45 (diff) | |
added alltenses to the default search path (just like prelude)
| -rw-r--r-- | src/compiler/GF/Compile.hs | 2 | ||||
| -rw-r--r-- | src/compiler/GF/Infra/UseIO.hs | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/compiler/GF/Compile.hs b/src/compiler/GF/Compile.hs index cd5c643b2..b8db1e1a9 100644 --- a/src/compiler/GF/Compile.hs +++ b/src/compiler/GF/Compile.hs @@ -124,7 +124,7 @@ compileModule opts1 env file = do exists <- ioeIO $ doesFileExist file1 if exists 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.")) compileOne :: Options -> CompileEnv -> FullPath -> IOE CompileEnv diff --git a/src/compiler/GF/Infra/UseIO.hs b/src/compiler/GF/Infra/UseIO.hs index dec2269fd..756df0679 100644 --- a/src/compiler/GF/Infra/UseIO.hs +++ b/src/compiler/GF/Infra/UseIO.hs @@ -70,7 +70,8 @@ getLibraryDirectory opts = getGrammarPath :: FilePath -> IO [FilePath] 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 -- 'gfLibraryPath' and 'gfGrammarPathVar' |