From 27602f4f8291f4d6a8b4b7109caf321d16cb6c99 Mon Sep 17 00:00:00 2001 From: aarne Date: Mon, 17 Dec 2007 18:12:46 +0000 Subject: took back smart type of Int ; Digits type in resource and some adjustments of Det syntax (not yet for romance and russian) --- src/GF/GFCC/Raw/ConvertGFCC.hs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/GF/GFCC/Raw/ConvertGFCC.hs') diff --git a/src/GF/GFCC/Raw/ConvertGFCC.hs b/src/GF/GFCC/Raw/ConvertGFCC.hs index fbed72e69..3bfed9c83 100644 --- a/src/GF/GFCC/Raw/ConvertGFCC.hs +++ b/src/GF/GFCC/Raw/ConvertGFCC.hs @@ -73,7 +73,7 @@ toExp e = case e of App fun [App (CId "B") xs, App (CId "X") exps] -> DTr [x | AId x <- xs] (AC fun) (lmap toExp exps) App (CId "Eq") eqs -> - EEq [Equ (lmap toExp ps) (toExp v) | App (CId "Case") (v:ps) <- eqs] + EEq [Equ (lmap toExp ps) (toExp v) | App (CId "E") (v:ps) <- eqs] AMet -> DTr [] (AM 0) [] AInt i -> DTr [] (AI i) [] AFlt i -> DTr [] (AF i) [] @@ -147,7 +147,7 @@ fromExp e = case e of DTr [] (AI i) [] -> AInt (toInteger i) DTr [] (AM _) [] -> AMet ---- EEq eqs -> - App (CId "Eq") [App (CId "Case") (lmap fromExp (v:ps)) | Equ ps v <- eqs] + App (CId "Eq") [App (CId "E") (lmap fromExp (v:ps)) | Equ ps v <- eqs] _ -> error $ "exp " ++ show e fromTerm :: Term -> RExp -- cgit v1.2.3