diff options
| author | peb <unknown> | 2005-05-17 12:38:46 +0000 |
|---|---|---|
| committer | peb <unknown> | 2005-05-17 12:38:46 +0000 |
| commit | 31044ec728d3a9a56a660fdd32d880d13dc9ffbf (patch) | |
| tree | 5e6d3cd1b9b5e950d5247f04d12d9e4553a0992c | |
| parent | b12608fb0947122fe65d9736eabf59266ad08252 (diff) | |
"Committed_by_peb"
| -rw-r--r-- | src/GF/Conversion/GFC.hs | 17 | ||||
| -rw-r--r-- | src/GF/Shell/ShellCommands.hs | 8 |
2 files changed, 12 insertions, 13 deletions
diff --git a/src/GF/Conversion/GFC.hs b/src/GF/Conversion/GFC.hs index a2c2c9c91..a0f611286 100644 --- a/src/GF/Conversion/GFC.hs +++ b/src/GF/Conversion/GFC.hs @@ -4,9 +4,9 @@ -- Stability : (stable) -- Portability : (portable) -- --- > CVS $Date: 2005/05/17 11:20:25 $ +-- > CVS $Date: 2005/05/17 13:38:46 $ -- > CVS $Author: peb $ --- > CVS $Revision: 1.10 $ +-- > CVS $Revision: 1.11 $ -- -- All conversions from GFC ----------------------------------------------------------------------------- @@ -46,10 +46,12 @@ gfc2mcfg2cfg opts = \g -> let e = g2e g in trace2 "Options" (show opts) (e2m e, Just cat -> flip removeErasing [identC cat] Nothing -> flip removeErasing [] g2e = case getOptVal opts gfcConversion of - Just "strict" -> simple2mcfg_strict . gfc2simple - Just "finite" -> simple2mcfg_nondet . gfc2finite - Just "finite-strict" -> simple2mcfg_strict . gfc2finite - _ -> simple2mcfg_nondet . gfc2simple + Just "strict" -> simple2mcfg_strict . gfc2simple + Just "finite" -> simple2mcfg_nondet . simple2finite . gfc2simple + Just "singletons" -> simple2mcfg_nondet . removeSingletons . gfc2simple + Just "finite-singletons" -> simple2mcfg_nondet . removeSingletons . simple2finite . gfc2simple + Just "finite-strict" -> simple2mcfg_strict . simple2finite . gfc2simple + _ -> simple2mcfg_nondet . gfc2simple gfc2mcfg :: Options -> (CanonGrammar, Ident) -> MGrammar gfc2mcfg opts = fst . gfc2mcfg2cfg opts @@ -69,9 +71,6 @@ simple2finite = S2Fin.convertGrammar removeSingletons :: SGrammar -> SGrammar removeSingletons = RemSing.convertGrammar -gfc2finite :: (CanonGrammar, Ident) -> SGrammar -gfc2finite = removeSingletons . simple2finite . gfc2simple - simple2mcfg_nondet :: SGrammar -> EGrammar simple2mcfg_nondet = S2M.convertGrammarNondet diff --git a/src/GF/Shell/ShellCommands.hs b/src/GF/Shell/ShellCommands.hs index 6144de0f8..401c04dbc 100644 --- a/src/GF/Shell/ShellCommands.hs +++ b/src/GF/Shell/ShellCommands.hs @@ -5,9 +5,9 @@ -- Stability : (stable) -- Portability : (portable) -- --- > CVS $Date: 2005/05/17 12:37:17 $ --- > CVS $Author: aarne $ --- > CVS $Revision: 1.35 $ +-- > CVS $Date: 2005/05/17 13:38:46 $ +-- > CVS $Author: peb $ +-- > CVS $Revision: 1.36 $ -- -- The datatype of shell commands and the list of their options. ----------------------------------------------------------------------------- @@ -138,7 +138,7 @@ testValidFlag st co f x = case f of "filter" -> testInc customStringCommand "length" -> testN "optimize"-> testIn $ words "parametrize values all share none" - "conversion" -> testIn $ words "strict nondet finite finite-strict" + "conversion" -> testIn $ words "strict nondet finite singletons finite-strict finite-singletons" _ -> return () where testInc ci = |