From 3addf256bcfaaa7748b0159a3dd6f6ce8fcd8b7c Mon Sep 17 00:00:00 2001
From: aarne <aarne@cs.chalmers.se>
Date: Thu, 31 Jan 2008 20:56:42 +0000
Subject: GFCC: TM with argument; fixed labels from bindings in gfc

---
 src/GF/GFCC/Macros.hs | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

(limited to 'src/GF/GFCC/Macros.hs')

diff --git a/src/GF/GFCC/Macros.hs b/src/GF/GFCC/Macros.hs
index d38ccb2e5..b9acd9fc5 100644
--- a/src/GF/GFCC/Macros.hs
+++ b/src/GF/GFCC/Macros.hs
@@ -12,19 +12,19 @@ import Data.List
 
 lookLin :: GFCC -> CId -> CId -> Term
 lookLin gfcc lang fun = 
-  lookMap TM fun $ lins $ lookMap (error "no lang") lang $ concretes gfcc
+  lookMap tm0 fun $ lins $ lookMap (error "no lang") lang $ concretes gfcc
 
 lookOper :: GFCC -> CId -> CId -> Term
 lookOper gfcc lang fun = 
-  lookMap TM fun $ opers $ lookMap (error "no lang") lang $ concretes gfcc
+  lookMap tm0 fun $ opers $ lookMap (error "no lang") lang $ concretes gfcc
 
 lookLincat :: GFCC -> CId -> CId -> Term
 lookLincat gfcc lang fun = 
-  lookMap TM fun $ lincats $ lookMap (error "no lang") lang $ concretes gfcc
+  lookMap tm0 fun $ lincats $ lookMap (error "no lang") lang $ concretes gfcc
 
 lookParamLincat :: GFCC -> CId -> CId -> Term
 lookParamLincat gfcc lang fun = 
-  lookMap TM fun $ paramlincats $ lookMap (error "no lang") lang $ concretes gfcc
+  lookMap tm0 fun $ paramlincats $ lookMap (error "no lang") lang $ concretes gfcc
 
 lookType :: GFCC -> CId -> Type
 lookType gfcc f = 
@@ -94,7 +94,10 @@ primNotion :: Exp
 primNotion = EEq []
 
 term0 :: CId -> Term
-term0 _ = TM
+term0 = TM . prCId
+
+tm0 :: Term
+tm0 = TM "?"
 
 kks :: String -> Term
 kks = K . KS
-- 
cgit v1.2.3