Skip to content

Commit

Permalink
Merge branch 'master' of git@github.com:luqui/dana
Browse files Browse the repository at this point in the history
  • Loading branch information
luqui committed Apr 29, 2009
2 parents bc5d4dd + eb67313 commit 1e57e3c
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions IXi/Term.hs
Original file line number Diff line number Diff line change
Expand Up @@ -134,12 +134,12 @@ convExpandId = Conversion $ \t -> Just (Lambda (Var 0) :% t)
-- X -> (\x. X) Y
convExpandConst y = Conversion $ \t -> Just (Lambda (quote 0 t) :% y)

-- (\x. A) Z ((\x. B) Z) -> (\x. A x (B x)) Z
-- (\x. A) Z ((\x. B) Z) -> (\x. A B) Z
convExpandProj :: Eq n => Conversion n
convExpandProj = Conversion $ \t ->
case t of
Lambda a :% z :% (Lambda b :% z') | z == z' ->
Just (Lambda (a :% Var 0 :% (b :% Var 0)) :% z)
Just (Lambda (a :% b) :% z)
_ -> Nothing

-- (\x. A) C B -> (\x. A B) C
Expand Down

0 comments on commit 1e57e3c

Please sign in to comment.