diff options
| author | peb <unknown> | 2005-04-16 04:40:48 +0000 |
|---|---|---|
| committer | peb <unknown> | 2005-04-16 04:40:48 +0000 |
| commit | 9e510f5245ac8ee1a7524fbbf49447daaef846d3 (patch) | |
| tree | 1a4f923fa1a4247146d7d0b4caf56021fc0f70a6 /src/GF/Compile | |
| parent | 9d112935dc072c399ae86be4fa9cc273b479928e (diff) | |
"Committed_by_peb"
Diffstat (limited to 'src/GF/Compile')
| -rw-r--r-- | src/GF/Compile/ShellState.hs | 24 |
1 files changed, 6 insertions, 18 deletions
diff --git a/src/GF/Compile/ShellState.hs b/src/GF/Compile/ShellState.hs index 6e6f00176..ce2a8d378 100644 --- a/src/GF/Compile/ShellState.hs +++ b/src/GF/Compile/ShellState.hs @@ -5,9 +5,9 @@ -- Stability : (stable) -- Portability : (portable) -- --- > CVS $Date: 2005/04/14 11:42:05 $ +-- > CVS $Date: 2005/04/16 05:40:50 $ -- > CVS $Author: peb $ --- > CVS $Revision: 1.42 $ +-- > CVS $Revision: 1.43 $ -- -- (Description of the module) ----------------------------------------------------------------------------- @@ -189,21 +189,9 @@ updateShellState opts mcnc sh ((_,sgr,gr),rts) = do let pinfosOld = map (CnvOld.pInfo opts cgr) concrs -- peb 18/6 (OBSOLETE) - let g2s = Cnv.gfc2simple - fin = Cnv.removeSingletons . Cnv.simple2finite - s2mN = Cnv.simple2mcfg_nondet - s2mS = Cnv.simple2mcfg_strict - -- ____ kan man ha flera '-conversion=X -conversion=Y'? - (simpleCnv, mcfgCnv) = case getOptVal opts gfcConversion of - Just "strict" -> (g2s, s2mS) - Just "finite" -> (fin . g2s, s2mN) - Just "finite-strict" -> (fin . g2s, s2mS) - _ -> (g2s, s2mN) - cfgCnv = Cnv.mcfg2cfg - - let simples = map (curry simpleCnv cgr) concrs - mcfgs = map mcfgCnv simples - cfgs = map cfgCnv mcfgs + let fromGFC = Cnv.gfc2mcfg2cfg opts + (mcfgs, cfgs) = unzip $ map (curry fromGFC cgr) concrs + pInfos = zipWith Prs.buildPInfo mcfgs cfgs let funs = funRulesOf cgr let cats = allCatsOf cgr @@ -225,7 +213,7 @@ updateShellState opts mcnc sh ((_,sgr,gr),rts) = do pInfosOld = zip concrs pinfosOld, -- peb 8/6 (OBSOLETE) mcfgs = zip concrs mcfgs, cfgs = zip concrs cfgs, - pInfos = zip concrs $ zipWith Prs.buildPInfo mcfgs cfgs, + pInfos = zip concrs pInfos, morphos = zip concrs (map (mkMorpho cgr) concrs), gloptions = gloptions sh, --- opts, -- this would be command-line options readFiles = [ft | ft@(f,_) <- readFiles sh, notInrts f] ++ rts, |