From d1633b98d01233ad6ddf16105955ea9ea79be336 Mon Sep 17 00:00:00 2001 From: bjorn Date: Thu, 16 Oct 2008 08:27:43 +0000 Subject: Honor --erasing flag from command-line also when compiling existing .gfo to PGF. --- src/GF/Compile/GrammarToGFCC.hs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/GF/Compile') diff --git a/src/GF/Compile/GrammarToGFCC.hs b/src/GF/Compile/GrammarToGFCC.hs index 5b2d14586..51a99e632 100644 --- a/src/GF/Compile/GrammarToGFCC.hs +++ b/src/GF/Compile/GrammarToGFCC.hs @@ -50,15 +50,15 @@ mkCanon2gfcc opts cnc gr = pars = mkParamLincat gr -- Adds parsers for all concretes -addParsers :: D.PGF -> D.PGF -addParsers pgf = pgf { D.concretes = Map.map conv (D.concretes pgf) } +addParsers :: Options -> D.PGF -> D.PGF +addParsers opts pgf = pgf { D.concretes = Map.map conv (D.concretes pgf) } where conv cnc = cnc { D.parser = Just pinfo } where pinfo - | Map.lookup (mkCId "erasing") (D.cflags cnc) == Just "on" = PMCFG.convertConcrete (D.abstract pgf) cnc - | otherwise = FCFG.convertConcrete (D.abstract pgf) cnc - + | flag optErasing (erasingFromCnc `addOptions` opts) = PMCFG.convertConcrete (D.abstract pgf) cnc + | otherwise = FCFG.convertConcrete (D.abstract pgf) cnc + erasingFromCnc = modifyFlags (\o -> o { optErasing = Map.lookup (mkCId "erasing") (D.cflags cnc) == Just "on"}) -- Generate PGF from GFCM. -- this assumes a grammar translated by canon2canon -- cgit v1.2.3