msyds/gf-core
1
0
Fork 0
forked from GitHub/gf-core
Code Pull Requests Activity

utf8 adjustments

Browse Source
This commit is contained in:
aarne
2008-06-26 06:52:01 +00:00
parent 75c08292e3
commit 712717e461
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/GF/Compile/Export.hs
View File

@@ -58,4 +58,5 @@ outputConcr pgf = case cncnames pgf of
cnc:_ -> cnc cnc:_ -> cnc
printPGF :: PGF -> String printPGF :: PGF -> String
printPGF = encodeUTF8 . printTree . fromPGF printPGF = ---- encodeUTF8 . -- out by AR26/6/2008: the PGF may already be UTF8
printTree . fromPGF

9
src/GF/Compile/GrammarToGFCC.hs
View File

@@ -99,15 +99,16 @@ canon2gfcc opts pars cgr@(M.MGrammar ((a,M.ModMod abm):cms)) =
opers = Map.fromAscList [] -- opers will be created as optimization opers = Map.fromAscList [] -- opers will be created as optimization
utf = if moduleFlag optEncoding (moduleOptions (M.flags mo)) == UTF_8 utf = if moduleFlag optEncoding (moduleOptions (M.flags mo)) == UTF_8
then D.convertStringsInTerm decodeUTF8 else id then D.convertStringsInTerm decodeUTF8 else id
umkTerm = utf . mkTerm
lins = Map.fromAscList lins = Map.fromAscList
[(i2i f, utf (mkTerm tr)) | (f,CncFun _ (Yes tr) _) <- js] [(i2i f, umkTerm tr) | (f,CncFun _ (Yes tr) _) <- js]
lincats = Map.fromAscList lincats = Map.fromAscList
[(i2i c, mkCType ty) | (c,CncCat (Yes ty) _ _) <- js] [(i2i c, mkCType ty) | (c,CncCat (Yes ty) _ _) <- js]
lindefs = Map.fromAscList lindefs = Map.fromAscList
[(i2i c, mkTerm tr) | (c,CncCat _ (Yes tr) _) <- js] [(i2i c, umkTerm tr) | (c,CncCat _ (Yes tr) _) <- js]
printnames = Map.union printnames = Map.union
(Map.fromAscList [(i2i f, mkTerm tr) | (f,CncFun _ _ (Yes tr)) <- js]) (Map.fromAscList [(i2i f, umkTerm tr) | (f,CncFun _ _ (Yes tr)) <- js])
(Map.fromAscList [(i2i f, mkTerm tr) | (f,CncCat _ _ (Yes tr)) <- js]) (Map.fromAscList [(i2i f, umkTerm tr) | (f,CncCat _ _ (Yes tr)) <- js])
params = Map.fromAscList params = Map.fromAscList
[(i2i c, pars lang0 c) | (c,CncCat (Yes ty) _ _) <- js] [(i2i c, pars lang0 c) | (c,CncCat (Yes ty) _ _) <- js]
fcfg = Nothing fcfg = Nothing