diff options
| author | kr.angelov <kr.angelov@gmail.com> | 2006-06-01 11:19:47 +0000 |
|---|---|---|
| committer | kr.angelov <kr.angelov@gmail.com> | 2006-06-01 11:19:47 +0000 |
| commit | e51eaed4fde9f2bee962ed43f5b9a8592e76a947 (patch) | |
| tree | 8f1b3bb01373d052ecfa1f883a37ffe2d765977a /src/GF/Compile/ShellState.hs | |
| parent | 496f1fc8767f9d8ce1bb69b6e6460c2b7b7dd4b4 (diff) | |
add the FCFG parser
Diffstat (limited to 'src/GF/Compile/ShellState.hs')
| -rw-r--r-- | src/GF/Compile/ShellState.hs | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/GF/Compile/ShellState.hs b/src/GF/Compile/ShellState.hs index 7f8ae17e7..41eff5fc8 100644 --- a/src/GF/Compile/ShellState.hs +++ b/src/GF/Compile/ShellState.hs @@ -151,7 +151,7 @@ emptyStateGrammar = StGr { cf = emptyCF, mcfg = [], cfg = [], - pInfo = Prs.buildPInfo [] [], + pInfo = Prs.buildPInfo [] [] [], morpho = emptyMorpho, probs = emptyProbs, loptions = noOptions @@ -231,9 +231,9 @@ updateShellState opts ign mcnc sh ((_,sgr,gr),rts) = do let probss = [] ----- - let fromGFC = snd . snd . Cnv.convertGFC opts - (mcfgs, cfgs) = unzip $ map (curry fromGFC cgr) concrs - pInfos = zipWith Prs.buildPInfo mcfgs cfgs + let fromGFC = snd . snd . Cnv.convertGFC opts + (mcfgs, fcfgs, cfgs) = unzip3 $ map (curry fromGFC cgr) concrs + pInfos = zipWith3 Prs.buildPInfo mcfgs fcfgs cfgs let funs = funRulesOf cgr let cats = allCatsOf cgr @@ -362,7 +362,7 @@ stateGrammarOfLangOpt purg st0 l = StGr { cf = maybe emptyCF id (lookup l (cfs st)), mcfg = maybe [] id $ lookup l $ mcfgs st, cfg = maybe [] id $ lookup l $ cfgs st, - pInfo = maybe (Prs.buildPInfo [] []) id $ lookup l $ pInfos st, + pInfo = maybe (Prs.buildPInfo [] [] []) id $ lookup l $ pInfos st, morpho = maybe emptyMorpho id (lookup l (morphos st)), probs = maybe emptyProbs id (lookup l (probss st)), loptions = errVal noOptions $ lookupOptionsCan allCan @@ -404,7 +404,7 @@ stateAbstractGrammar st = StGr { cf = emptyCF, mcfg = [], cfg = [], - pInfo = Prs.buildPInfo [] [], + pInfo = Prs.buildPInfo [] [] [], morpho = emptyMorpho, probs = emptyProbs, loptions = gloptions st ---- |