diff options
Diffstat (limited to 'src/GF/Compile/ShellState.hs')
| -rw-r--r-- | src/GF/Compile/ShellState.hs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/GF/Compile/ShellState.hs b/src/GF/Compile/ShellState.hs index e2e5486ca..0e24da601 100644 --- a/src/GF/Compile/ShellState.hs +++ b/src/GF/Compile/ShellState.hs @@ -19,6 +19,7 @@ import GF.Canon.GFC import GF.Canon.AbsGFC import GF.GFCC.CId --import GF.GFCC.DataGFCC(mkGFCC) +import GF.GFCC.Macros (lookFCFG) import GF.Canon.CanonToGFCC import GF.Grammar.Macros import GF.Grammar.MMacros @@ -263,9 +264,8 @@ updateShellState opts ign mcnc sh ((_,sgr,gr,eenv),rts) = do let fromGFC = snd . snd . Cnv.convertGFC opts (mcfgs, cfgs) = unzip $ map (curry fromGFC cgr) concrs - fcfgs0 = [(IC id,g) | (CId id,g) <- - FCnv.convertGrammar (canon2gfcc opts cgr)] ---- UTF8 - fcfgs = [(c,g) | c <- concrs, Just g <- [lookup c fcfgs0]] + gfcc = canon2gfcc opts cgr ---- UTF8 + fcfgs = [(c,g) | c@(IC cn) <- concrs, Just g <- [lookFCFG gfcc (CId cn)]] pInfos = zipWith3 Prs.buildPInfo mcfgs (map snd fcfgs) cfgs let funs = funRulesOf cgr |