diff options
| author | aarne <aarne@cs.chalmers.se> | 2007-10-01 13:18:43 +0000 |
|---|---|---|
| committer | aarne <aarne@cs.chalmers.se> | 2007-10-01 13:18:43 +0000 |
| commit | 82754178dbc04bcd1d9474a35564ac1e97627e3a (patch) | |
| tree | 79ae9e8a345205ece6628d56a65b6366cb34f937 /src/GF/Devel | |
| parent | 3b4ee92cbece3aff0243f0dfd0f41121808d8e8c (diff) | |
more tc of gfcc
Diffstat (limited to 'src/GF/Devel')
| -rw-r--r-- | src/GF/Devel/GrammarToGFCC.hs | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/GF/Devel/GrammarToGFCC.hs b/src/GF/Devel/GrammarToGFCC.hs index 2742629d5..9fc48eaea 100644 --- a/src/GF/Devel/GrammarToGFCC.hs +++ b/src/GF/Devel/GrammarToGFCC.hs @@ -65,7 +65,7 @@ mkCType :: Type -> C.Term mkCType t = case t of EInt i -> C.C $ fromInteger i -- record parameter alias - created in gfc preprocessing - RecType [(LIdent "_", i)] -> mkCType i + ----RecType [(LIdent "_", i)] -> mkCType i --- RecType [(LIdent "_", i), (LIdent "__", t)] -> C.RP (mkCType i) (mkCType t) RecType rs -> C.R [mkCType t | (_, t) <- rs] Table pt vt -> C.R $ replicate (getI (mkCType pt)) $ mkCType vt @@ -83,7 +83,7 @@ mkTerm tr = case tr of C.V (read (reverse (takeWhile (/='_') (reverse s)))) ---- from gf parser of gfc EInt i -> C.C $ fromInteger i -- record parameter alias - created in gfc preprocessing - R [(LIdent "_", (_,i))] -> mkTerm i + ----R [(LIdent "_", (_,i))] -> mkTerm i --- R [(LIdent "_", (_,i)), (LIdent "__", (_,t))] -> C.RP (mkTerm i) (mkTerm t) -- ordinary record R rs -> C.R [mkTerm t | (_, (_,t)) <- rs] @@ -273,10 +273,12 @@ term2term cgr env@(labels,untyps,typs) tr = case tr of (l,(_,t)) <- unlock rs] rs' = [(mkLab i, (Nothing, t2t t)) | (i,(l,(_,t))) <- zip [0..] (unlock rs)] - in if (any (isStr . trmAss) rs) - then R rs' + in + ----if (any (isStr . trmAss) rs) + ----then + R rs' --- else mkValCase tr - else R [(LIdent "_", (Nothing, mkValCase tr'))] + ----else R [(LIdent "_", (Nothing, mkValCase tr'))] --- else R [(LIdent "_", (Nothing, mkValCase tr)), (LIdent "__",(Nothing,R rs'))] P t l -> r2r tr PI t l i -> EInt $ toInteger i |