diff options
| author | aarne <aarne@cs.chalmers.se> | 2007-12-14 07:31:53 +0000 |
|---|---|---|
| committer | aarne <aarne@cs.chalmers.se> | 2007-12-14 07:31:53 +0000 |
| commit | 745f6ac83f207709127bbec22c3484ad06ec6907 (patch) | |
| tree | f5ae6b4df981f6c40289fca0a9cf0d10b7b77de0 /src/GF/Compile/ShellState.hs | |
| parent | 9e0dd0a41a9d386d4cc9ae6bab6fa2e1862e829f (diff) | |
restored CanonToGFCC as a wrapper of GFCC generation
Diffstat (limited to 'src/GF/Compile/ShellState.hs')
| -rw-r--r-- | src/GF/Compile/ShellState.hs | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/GF/Compile/ShellState.hs b/src/GF/Compile/ShellState.hs index bbf443b35..ebb318608 100644 --- a/src/GF/Compile/ShellState.hs +++ b/src/GF/Compile/ShellState.hs @@ -19,7 +19,7 @@ import GF.Canon.GFC import GF.Canon.AbsGFC import GF.GFCC.Raw.AbsGFCCRaw(CId(CId)) --import GF.GFCC.DataGFCC(mkGFCC) -import GF.Canon.CanonToGFCC as C2GFCC +import GF.Canon.CanonToGFCC import GF.Grammar.Macros import GF.Grammar.MMacros @@ -264,12 +264,10 @@ 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 (C2GFCC.mkCanon2gfccNoUTF8 cgr)] + FCnv.convertGrammar (canon2gfcc opts cgr)] ---- UTF8 fcfgs = [(c,g) | c <- concrs, Just g <- [lookup c fcfgs0]] pInfos = zipWith3 Prs.buildPInfo mcfgs (map snd fcfgs) cfgs - - let funs = funRulesOf cgr let cats = allCatsOf cgr let csi = [(c,(co, |