summaryrefslogtreecommitdiff
path: root/src/GF/Devel/Grammar/Lookup.hs
diff options
context:
space:
mode:
authoraarne <aarne@cs.chalmers.se>2008-02-22 15:17:50 +0000
committeraarne <aarne@cs.chalmers.se>2008-02-22 15:17:50 +0000
commit2faba9011978f29f56bbc27287720a08b08b7adb (patch)
treefaf7919dc7068cb3f91efa033e851eccf17bff89 /src/GF/Devel/Grammar/Lookup.hs
parent9e6064709f621c1489f18ee94612226014646a9a (diff)
started a directory of grammars testing testgf3 features
Diffstat (limited to 'src/GF/Devel/Grammar/Lookup.hs')
-rw-r--r--src/GF/Devel/Grammar/Lookup.hs12
1 files changed, 4 insertions, 8 deletions
diff --git a/src/GF/Devel/Grammar/Lookup.hs b/src/GF/Devel/Grammar/Lookup.hs
index 0d2b343cb..0a8452dcb 100644
--- a/src/GF/Devel/Grammar/Lookup.hs
+++ b/src/GF/Devel/Grammar/Lookup.hs
@@ -61,20 +61,16 @@ lookupOverload gr m c = do
lookupParams :: GF -> Ident -> Ident -> Err [(Ident,Context)]
lookupParams gf m c = do
- ty <- lookupJField jtype gf m c
- return [(k,contextOfType t) | (k,t) <- contextOfType ty]
+ EParam _ ty <- lookupJField jdef gf m c
+ return ty
lookupParamConstructor :: GF -> Ident -> Ident -> Err Type
lookupParamConstructor = lookupJField jtype
lookupParamValues :: GF -> Ident -> Ident -> Err [Term]
lookupParamValues gf m c = do
- d <- lookupJField jdef gf m c
- case d of
- ---- V _ ts -> return ts
- _ -> do
- ps <- lookupParams gf m c
- liftM concat $ mapM mkPar ps
+ ps <- lookupParams gf m c
+ liftM concat $ mapM mkPar ps
where
mkPar (f,co) = do
vs <- liftM combinations $ mapM (\ (_,ty) -> allParamValues gf ty) co