diff options
| author | krasimir <krasimir@chalmers.se> | 2009-09-20 11:43:41 +0000 |
|---|---|---|
| committer | krasimir <krasimir@chalmers.se> | 2009-09-20 11:43:41 +0000 |
| commit | b1a51f46f5d137ab4d65a4381b349af3291a944d (patch) | |
| tree | ce1df7a103ba74a9c8a7eedbf2260bde37736166 /src/PGF/Linearize.hs | |
| parent | d09371280d5b28d85acce7b7d899c21bc4e11b32 (diff) | |
change the data types and the syntax in PGF to match the new syntax for implict arguments
Diffstat (limited to 'src/PGF/Linearize.hs')
| -rw-r--r-- | src/PGF/Linearize.hs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/PGF/Linearize.hs b/src/PGF/Linearize.hs index 418ed9d5a..f733c8cb1 100644 --- a/src/PGF/Linearize.hs +++ b/src/PGF/Linearize.hs @@ -59,8 +59,8 @@ linTree :: PGF -> CId -> Expr -> Term linTree pgf lang = lin . expr2tree where lin (Abs xs e ) = case lin e of - R ts -> R $ ts ++ (Data.List.map (kks . showCId) xs) - TM s -> R $ (TM s) : (Data.List.map (kks . showCId) xs) + R ts -> R $ ts ++ (Data.List.map (kks . showCId . snd) xs) + TM s -> R $ (TM s) : (Data.List.map (kks . showCId . snd) xs) lin (Fun fun es) = let argVariants = mapM (liftVariants . lin) es in variants [compute pgf lang args $ look fun | args <- argVariants] lin (Lit (LStr s)) = R [kks (show s)] -- quoted @@ -130,8 +130,8 @@ linTreeMark :: PGF -> CId -> Expr -> Term linTreeMark pgf lang = lin [] . expr2tree where lin p (Abs xs e ) = case lin p e of - R ts -> R $ ts ++ (Data.List.map (kks . showCId) xs) - TM s -> R $ (TM s) : (Data.List.map (kks . showCId) xs) + R ts -> R $ ts ++ (Data.List.map (kks . showCId . snd) xs) + TM s -> R $ (TM s) : (Data.List.map (kks . showCId . snd) xs) lin p (Fun fun es) = let argVariants = mapM (\ (i,e) -> liftVariants $ lin (sub p i) e) (zip [0..] es) in variants [mark p $ compute pgf lang args $ look fun | args <- argVariants] |