summaryrefslogtreecommitdiff
path: root/src/GF/Canon/CanonToGFCC.hs
diff options
context:
space:
mode:
authoraarne <aarne@cs.chalmers.se>2006-10-03 12:59:47 +0000
committeraarne <aarne@cs.chalmers.se>2006-10-03 12:59:47 +0000
commit35b9067ed439c64aa639a6be8669378b648f83fb (patch)
treeaea6fdd15fa246887c3fb8389f96f442d0f9f650 /src/GF/Canon/CanonToGFCC.hs
parent1a86f3bb4ccc8f984c06083d162e4ca6be722483 (diff)
more commands in gfcc
Diffstat (limited to 'src/GF/Canon/CanonToGFCC.hs')
-rw-r--r--src/GF/Canon/CanonToGFCC.hs19
1 files changed, 3 insertions, 16 deletions
diff --git a/src/GF/Canon/CanonToGFCC.hs b/src/GF/Canon/CanonToGFCC.hs
index 020dbbdd9..43e0e8f5c 100644
--- a/src/GF/Canon/CanonToGFCC.hs
+++ b/src/GF/Canon/CanonToGFCC.hs
@@ -217,10 +217,9 @@ term2term cgr env@(labels,untyps,typs) tr = case tr of
then R rs'
else R [Ass (L (IC "_")) (mkValCase tr), Ass (L (IC "__")) (R rs')]
P t l -> r2r tr
- T _ cs0 -> checkCases cs0 $
- case expandLinTables cgr tr of -- normalize order of cases
- Ok (T ty cs) -> V ty [t2t t | Cas _ t <- cs]
- _ -> K (KS (A.prt tr +++ prtTrace tr "66668"))
+ T _ cs0 -> case expandLinTables cgr tr of -- normalize order of cases
+ Ok (T ty cs) -> checkCases cs $ V ty [t2t t | Cas _ t <- cs]
+ _ -> K (KS (A.prt tr +++ prtTrace tr "66668"))
V ty ts -> V ty [t2t t | t <- ts]
S t p -> S (t2t t) (t2t p)
_ -> composSafeOp t2t tr
@@ -249,18 +248,6 @@ term2term cgr env@(labels,untyps,typs) tr = case tr of
S p _ -> getLab p
_ -> Bad "getLab"
-{-
-(table{n:ParamX.Number;p:ParamX.Person}
- [{fin=\"am\";inf=[]}
- {fin=\"are\";inf=[]}
- {fin=\"is\";inf=[]}
- {fin=\"are\";inf=[]}
- {fin=\"are\";inf=[]}
- {fin=\"are\";inf=[]}]
- ! (NP@0.a))
-.fin 66665"
--}
-
doVar :: Term -> STM [((CType,[Term]),(Term,Term))] Term
doVar tr = case getLab tr of
Ok (cat, lab) -> do