summaryrefslogtreecommitdiff
path: root/src/GF
diff options
context:
space:
mode:
authoraarne <aarne@cs.chalmers.se>2007-09-12 07:53:54 +0000
committeraarne <aarne@cs.chalmers.se>2007-09-12 07:53:54 +0000
commit902b1f3afcf304bdc750fd72ceed15f3c4b29c04 (patch)
tree8961303c971ef59b9248eae4ea789ae9bc4c5c81 /src/GF
parent1d40350b6eb3aa00f75e655344b8fadf29a9dbcb (diff)
bug fix in import reading (had forgotten gfr)
Diffstat (limited to 'src/GF')
-rw-r--r--src/GF/Infra/ReadFiles.hs8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/GF/Infra/ReadFiles.hs b/src/GF/Infra/ReadFiles.hs
index e1e2e06d8..699eb5081 100644
--- a/src/GF/Infra/ReadFiles.hs
+++ b/src/GF/Infra/ReadFiles.hs
@@ -220,8 +220,12 @@ getImports ps = get [] where
tryRead name = do
file <- do
let file_gf = gfFile name
- b <- doesFileExistPath ps file_gf -- try gf file first
- if b then return file_gf else return (gfcFile name) -- gfc next
+ b <- doesFileExistPath ps file_gf -- try gf file first
+ if b then return file_gf else do
+ let file_gfr = gfrFile name
+ bb <- doesFileExistPath ps file_gfr -- gfr file next
+ if bb then return file_gfr else do
+ return (gfcFile name) -- gfc next
readFileIfPath ps $ file