diff options
| author | krangelov <kr.angelov@gmail.com> | 2019-04-12 11:04:40 +0200 |
|---|---|---|
| committer | krangelov <kr.angelov@gmail.com> | 2019-04-12 11:04:40 +0200 |
| commit | c628e11c01c3c8c642c540a94ea927be42d6d2f3 (patch) | |
| tree | 095510ed7267679607bc86622014be1d2f867a69 | |
| parent | 61e7df4d1ce17602e79ec9ea7ea7f1a5f013c480 (diff) | |
respect the probs option also when merging PGFs
| -rw-r--r-- | src/compiler/GF/Compiler.hs | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/compiler/GF/Compiler.hs b/src/compiler/GF/Compiler.hs index 4003285b8..66d08f715 100644 --- a/src/compiler/GF/Compiler.hs +++ b/src/compiler/GF/Compiler.hs @@ -102,7 +102,9 @@ linkGrammars opts (t_src,~cnc_grs@(~(cnc,gr):_)) = if t_pgf >= Just t_src then putIfVerb opts $ pgfFile ++ " is up-to-date." else do pgfs <- mapM (link opts) cnc_grs - let pgf = foldl1 unionPGF pgfs + let pgf0 = foldl1 unionPGF pgfs + probs <- maybe (return . defaultProbabilities) readProbabilitiesFromFile (flag optProbsFile opts) pgf0 + let pgf = setProbabilities probs pgf0 writePGF opts pgf writeOutputs opts pgf @@ -137,7 +139,9 @@ unionPGFFiles opts fs = doIt = do pgfs <- mapM readPGFVerbose fs let pgf0 = foldl1 unionPGF pgfs - pgf = if flag optOptimizePGF opts then optimizePGF pgf0 else pgf0 + pgf1 = if flag optOptimizePGF opts then optimizePGF pgf0 else pgf0 + probs <- liftIO (maybe (return . defaultProbabilities) readProbabilitiesFromFile (flag optProbsFile opts) pgf1) + let pgf = setProbabilities probs pgf1 pgfFile = outputPath opts (grammarName opts pgf <.> "pgf") if pgfFile `elem` fs then putStrLnE $ "Refusing to overwrite " ++ pgfFile |