diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/GF/Infra/ReadFiles.hs | 3 | ||||
| -rw-r--r-- | src/GF/UseGrammar/Linear.hs | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/GF/Infra/ReadFiles.hs b/src/GF/Infra/ReadFiles.hs index bb0d5e630..fcd7093a5 100644 --- a/src/GF/Infra/ReadFiles.hs +++ b/src/GF/Infra/ReadFiles.hs @@ -96,7 +96,8 @@ selectFormat opts env (p,f) = do (Just tenv,_,_,Just tgf) | laterModTime tenv tgf -> (CSEnvR,Just tenv) (_,Just tenv,_,Just tgf) | laterModTime tenv tgf -> (CSEnv, Just tenv) (_,_,Just tgfc,Just tgf) | laterModTime tgfc tgf -> (CSRead,Just tgfc) - (_,_,_, Nothing) -> (CSRead,Nothing) -- source does not exist + (_,Just tenv,_,Nothing) -> (CSEnv,Just tenv) -- source does not exist + (_,_,_, Nothing) -> (CSRead,Nothing) -- source does not exist _ -> (CSComp,Nothing) return $ (f, (p,stat)) diff --git a/src/GF/UseGrammar/Linear.hs b/src/GF/UseGrammar/Linear.hs index 86c5fad3e..f18091810 100644 --- a/src/GF/UseGrammar/Linear.hs +++ b/src/GF/UseGrammar/Linear.hs @@ -75,7 +75,8 @@ linearizeToRecord gr mk m = lin [] where look = lookupLin gr . redirectIdent m . rtQIdent comp = ccompute gr mkBinds bs bdy = case bdy of - R fs -> R $ [Ass (LV i) (tK (prt t)) | (i,(t,_)) <- zip [0..] bs] ++ fs + R fs -> R $ [Ass (LV i) (tK (prt t)) | (i,(t,_)) <- zip [0..] bs] ++ fs + FV rs -> FV $ map (mkBinds bs) rs recS t = R [Ass (L (identC "s")) t] ---- |