diff options
| author | aarne <unknown> | 2004-08-11 10:02:26 +0000 |
|---|---|---|
| committer | aarne <unknown> | 2004-08-11 10:02:26 +0000 |
| commit | 8bc2cee83156fa923d466a1a9a77816f9049f352 (patch) | |
| tree | f1ce864e08b2204d48b0dd47f4fcebc5bbc73c9f /src/GF | |
| parent | 23db149b9b09dfda3dffc128d94f904cac8f9ff9 (diff) | |
bug fix in reading files
Diffstat (limited to 'src/GF')
| -rw-r--r-- | src/GF/Compile/Compile.hs | 7 | ||||
| -rw-r--r-- | src/GF/Infra/ReadFiles.hs | 2 |
2 files changed, 5 insertions, 4 deletions
diff --git a/src/GF/Compile/Compile.hs b/src/GF/Compile/Compile.hs index 78f3a1bb1..5dd4d3345 100644 --- a/src/GF/Compile/Compile.hs +++ b/src/GF/Compile/Compile.hs @@ -88,8 +88,9 @@ compileModule opts1 st0 file = do opts0 <- ioeIO $ getOptionsFromFile file let useFileOpt = maybe False (const True) $ getOptVal opts0 pathList let opts = addOptions opts1 opts0 - let ps0 = pathListOpts opts let fpath = justInitPath file + let ps0 = pathListOpts opts fpath + let ps1 = if useFileOpt then (map (prefixPathName fpath) ps0) else ps0 @@ -132,8 +133,8 @@ compileEnvShSt st fs = ((0,sgr,cgr),fts) where notIns i = notElem (prt i) $ map fileBody fs fts = readFiles st -pathListOpts :: Options -> [InitPath] -pathListOpts opts = maybe [""] pFilePaths $ getOptVal opts pathList +pathListOpts :: Options -> FileName -> [InitPath] +pathListOpts opts file = maybe [file] pFilePaths $ getOptVal opts pathList reverseModules (MGrammar ms) = MGrammar $ reverse ms diff --git a/src/GF/Infra/ReadFiles.hs b/src/GF/Infra/ReadFiles.hs index 8d835284d..edbed4047 100644 --- a/src/GF/Infra/ReadFiles.hs +++ b/src/GF/Infra/ReadFiles.hs @@ -158,7 +158,7 @@ resModName = ('#':) getImports :: [InitPath] -> FileName -> IOE [(ModuleHeader,InitPath)] getImports ps = get [] where get ds file0 = do - let name = fileBody file0 + let name = justModuleName file0 ---- fileBody file0 (p,s) <- tryRead name let ((typ,mname),imps) = importsOfFile s let namebody = justFileName name |