diff options
| -rw-r--r-- | src/GF/Infra/Modules.hs | 7 | ||||
| -rw-r--r-- | src/GF/UseGrammar/Custom.hs | 10 |
2 files changed, 9 insertions, 8 deletions
diff --git a/src/GF/Infra/Modules.hs b/src/GF/Infra/Modules.hs index 435a1fca9..f8c56d3e6 100644 --- a/src/GF/Infra/Modules.hs +++ b/src/GF/Infra/Modules.hs @@ -5,9 +5,9 @@ -- Stability : (stable) -- Portability : (portable) -- --- > CVS $Date: 2005/11/06 22:00:37 $ +-- > CVS $Date: 2005/11/09 15:14:30 $ -- > CVS $Author: aarne $ --- > CVS $Revision: 1.25 $ +-- > CVS $Revision: 1.26 $ -- -- Datastructures and functions for modules, common to GF and GFC. -- @@ -389,4 +389,5 @@ greatestResource gr = case allResources gr of -- | all concretes for a given abstract allConcretes :: Eq i => MGrammar i f a -> i -> [i] -allConcretes gr a = [i | (i, ModMod m) <- modules gr, mtype m == MTConcrete a] +allConcretes gr a = + [i | (i, ModMod m) <- modules gr, mtype m == MTConcrete a, isCompleteModule m] diff --git a/src/GF/UseGrammar/Custom.hs b/src/GF/UseGrammar/Custom.hs index c13b5c91c..2647f16f4 100644 --- a/src/GF/UseGrammar/Custom.hs +++ b/src/GF/UseGrammar/Custom.hs @@ -5,9 +5,9 @@ -- Stability : (stable) -- Portability : (portable) -- --- > CVS $Date: 2005/11/01 20:09:04 $ --- > CVS $Author: bringert $ --- > CVS $Revision: 1.81 $ +-- > CVS $Date: 2005/11/09 15:14:30 $ +-- > CVS $Author: aarne $ +-- > CVS $Revision: 1.82 $ -- -- A database for customizable GF shell commands. -- @@ -305,8 +305,8 @@ customGrammarPrinter = ,(strCI "cfg-skvatt", Cnv.cfg2skvatt . stateCFG) ,(strCI "simple", Prt.prt . uncurry Cnv.gfc2simple . stateGrammarLangOpts) ,(strCI "mcfg-erasing", Prt.prt . fst . snd . uncurry Cnv.convertGFC . stateGrammarLangOpts) - ,(strCI "mcfg-old", PrtOld.prt . CnvOld.mcfg . statePInfoOld) - ,(strCI "cfg-old", PrtOld.prt . CnvOld.cfg . statePInfoOld) +-- ,(strCI "mcfg-old", PrtOld.prt . CnvOld.mcfg . statePInfoOld) +-- ,(strCI "cfg-old", PrtOld.prt . CnvOld.cfg . statePInfoOld) ] where stateGrammarLangOpts s = (stateOptions s, stateGrammarLang s) |