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

Fixed generated Haskell modules to use only the PGF module.

Browse Source
This commit is contained in:
bjorn
2008-06-02 15:47:56 +00:00
parent 174bff70e0
commit b54c5ddb7c
1 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src-3.0/GF/Compile/GFCCtoHaskell.hs
View File

@@ -48,8 +48,7 @@ haskPreamble name =
[ [
"module " ++ name ++ " where", "module " ++ name ++ " where",
"", "",
"import PGF.CId", "import PGF",
"import PGF.Data",
"----------------------------------------------------", "----------------------------------------------------",
"-- automatic translation from GF to Haskell", "-- automatic translation from GF to Haskell",
"----------------------------------------------------", "----------------------------------------------------",
@@ -58,11 +57,11 @@ haskPreamble name =
" gf :: a -> Exp", " gf :: a -> Exp",
" fg :: Exp -> a", " fg :: Exp -> a",
"", "",
predefInst "GString" "String" "DTr [] (AS s) []", predefInst "GString" "String" "EStr s",
"", "",
predefInst "GInt" "Integer" "DTr [] (AI s) []", predefInst "GInt" "Integer" "EInt s",
"", "",
predefInst "GFloat" "Double" "DTr [] (AF s) []", predefInst "GFloat" "Double" "EFloat s",
"", "",
"----------------------------------------------------", "----------------------------------------------------",
"-- below this line machine-generated", "-- below this line machine-generated",
@@ -144,7 +143,7 @@ hInstance m (cat,rules)
(if length xx == 0 then gId f else prParenth (gId f +++ foldr1 (+++) xx')) +++ (if length xx == 0 then gId f else prParenth (gId f +++ foldr1 (+++) xx')) +++
"=" +++ mkRHS f xx' "=" +++ mkRHS f xx'
mkVars n = ["x" ++ show i | i <- [1..n]] mkVars n = ["x" ++ show i | i <- [1..n]]
mkRHS f vars = "DTr [] (AC (CId \"" ++ f ++ "\"))" +++ mkRHS f vars = "EApp (mkCId \"" ++ f ++ "\")" +++
"[" ++ prTList ", " ["gf" +++ x | x <- vars] ++ "]" "[" ++ prTList ", " ["gf" +++ x | x <- vars] ++ "]"
@@ -157,9 +156,9 @@ fInstance m (cat,rules) =
" _ -> error (\"no" +++ cat ++ " \" ++ show t)" " _ -> error (\"no" +++ cat ++ " \" ++ show t)"
where where
mkInst f xx = mkInst f xx =
" DTr [] (AC (CId \"" ++ f ++ "\")) " ++ " EApp i " ++
"[" ++ prTList "," xx' ++ "]" +++ "[" ++ prTList "," xx' ++ "]" +++
"->" +++ mkRHS f xx' "| i == mkCId \"" ++ f ++ "\" ->" +++ mkRHS f xx'
where xx' = ["x" ++ show i | (_,i) <- zip xx [1..]] where xx' = ["x" ++ show i | (_,i) <- zip xx [1..]]
mkRHS f vars mkRHS f vars
| isListCat (cat,rules) = | isListCat (cat,rules) =