From 6c5ce5fd9b3405ef1a796ef9b500f74cba77de6f Mon Sep 17 00:00:00 2001
From: peb <unknown>
Date: Thu, 23 Jun 2005 12:23:01 +0000
Subject: [PATCH] "Committed_by_peb"

---
 src/GF/Canon/CMacros.hs          | 9 ++++++---
 src/GF/Conversion/GFCtoSimple.hs | 9 ++++++---
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/GF/Canon/CMacros.hs b/src/GF/Canon/CMacros.hs
index 69ef2e8ee..77f4b0027 100644
--- a/src/GF/Canon/CMacros.hs
+++ b/src/GF/Canon/CMacros.hs
@@ -5,9 +5,9 @@
 -- Stability   : (stable)
 -- Portability : (portable)
 --
--- > CVS $Date: 2005/06/17 14:15:17 $ 
--- > CVS $Author: bringert $
--- > CVS $Revision: 1.25 $
+-- > CVS $Date: 2005/06/23 13:23:01 $ 
+-- > CVS $Author: peb $
+-- > CVS $Revision: 1.26 $
 --
 -- Macros for building and analysing terms in GFC concrete syntax.
 --
@@ -290,4 +290,7 @@ composOp co trm =
       do
       as' <- mapM co as
       return (FV as')
+  -- peb tried to do this, but then there were errors in GF.Canon.Look.ccompute:
+  -- V x as -> do as' <- mapM co as
+  -- 	       return (V x as')
   _ -> return trm -- covers Arg, I, LI, K, E
diff --git a/src/GF/Conversion/GFCtoSimple.hs b/src/GF/Conversion/GFCtoSimple.hs
index 86a4204f0..bd895155d 100644
--- a/src/GF/Conversion/GFCtoSimple.hs
+++ b/src/GF/Conversion/GFCtoSimple.hs
@@ -4,9 +4,9 @@
 -- Stability   : (stable)
 -- Portability : (portable)
 --
--- > CVS $Date: 2005/06/23 09:43:40 $ 
+-- > CVS $Date: 2005/06/23 13:23:01 $ 
 -- > CVS $Author: peb $
--- > CVS $Revision: 1.10 $
+-- > CVS $Revision: 1.11 $
 --
 -- Converting GFC to SimpleGFC
 --
@@ -94,7 +94,10 @@ convertConcrete gram (Abs decl args name) = Cnc ltyp largs term
 	  ltyp : largs = map (convertCType gram . lookupCType gram) (decl : args)
 
 expandTerm :: Env -> A.Term -> A.Term
-expandTerm gram term = err error id $ expandLinTables (fst gram) term
+expandTerm gram term = tracePrt "expanded term" prt $
+		       err error id $ expandLinTables (fst gram) $
+		       tracePrt "initial term" prt $ 
+		       term
 
 convertCType :: Env -> A.CType -> SLinType
 convertCType gram (A.RecType rec) = RecT [ (lbl, convertCType gram ctype) | A.Lbg lbl ctype <- rec ]