diff options
| author | aarne <aarne@cs.chalmers.se> | 2008-06-26 16:35:45 +0000 |
|---|---|---|
| committer | aarne <aarne@cs.chalmers.se> | 2008-06-26 16:35:45 +0000 |
| commit | ed708ffda6d1a60be801c4563274c8b9218aa9de (patch) | |
| tree | bf33e6f48fecfacbfa08f146bd00c8d9147401a6 /src/GF/Compile | |
| parent | f7622321de4e3fe7acee646a0fb8a817576621c3 (diff) | |
uniform encoding: gfo and pgf in UTF8, internal in unicode
Diffstat (limited to 'src/GF/Compile')
| -rw-r--r-- | src/GF/Compile/Export.hs | 2 | ||||
| -rw-r--r-- | src/GF/Compile/GrammarToGFCC.hs | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/src/GF/Compile/Export.hs b/src/GF/Compile/Export.hs index 23b8198f8..21ecb3d15 100644 --- a/src/GF/Compile/Export.hs +++ b/src/GF/Compile/Export.hs @@ -58,5 +58,5 @@ outputConcr pgf = case cncnames pgf of cnc:_ -> cnc printPGF :: PGF -> String -printPGF = ---- encodeUTF8 . -- out by AR26/6/2008: the PGF may already be UTF8 +printPGF = -- encodeUTF8 . -- fromPGF does UTF8 encoding printTree . fromPGF diff --git a/src/GF/Compile/GrammarToGFCC.hs b/src/GF/Compile/GrammarToGFCC.hs index e13c8edf2..2b4156bec 100644 --- a/src/GF/Compile/GrammarToGFCC.hs +++ b/src/GF/Compile/GrammarToGFCC.hs @@ -97,8 +97,10 @@ canon2gfcc opts pars cgr@(M.MGrammar ((a,M.ModMod abm):cms)) = js = tree2list (M.jments mo) flags = Map.fromList [(mkCId f,x) | (f,x) <- moduleOptionsGFO (M.flags mo)] opers = Map.fromAscList [] -- opers will be created as optimization - utf = if moduleFlag optEncoding (moduleOptions (M.flags mo)) == UTF_8 - then D.convertStringsInTerm decodeUTF8 else id + utf = id -- trace (show lang0 +++ show flags) $ + -- if moduleFlag optEncoding (moduleOptions (M.flags mo)) == UTF_8 + -- then id else id + ---- then (trace "decode" D.convertStringsInTerm decodeUTF8) else id umkTerm = utf . mkTerm lins = Map.fromAscList [(i2i f, umkTerm tr) | (f,CncFun _ (Yes tr) _) <- js] |