improvements to examples/

[coq-hetmet.git] / examples / Demo.hs

diff --git a/examples/Demo.hs b/examples/Demo.hs
index bb3bf17..fb8666f 100644 (file)
--- a/examples/Demo.hs
+++ b/examples/Demo.hs
@@ -1,14 +1,33 @@
 {-# OPTIONS_GHC -XModalTypes -fflatten -funsafe-skolemize -dcore-lint -XScopedTypeVariables -fsimpleopt-before-flatten #-}
-module Demo (demo) where
+module Demo ({-sample1,sample2,-}sample5,sample6) where
+
+sample5 :: forall c . (Int -> <{Int}>@c) ->  <{Int -> Int -> Int}>@c -> <{Int -> Int}>@c
+sample5 const <[ (*) ]> =
+ <{ \y ->
+    let   foo  = (~~(const 3) * foo) * y
+    in    foo }>
+
+sample6 :: forall c . (Int -> <{Int}>@c) -> <{Int -> Int -> Int}>@c -> <{Int -> Int}>@c
+sample6 const <{ (*) }> = pow 6
+   where
+     --pow :: Int -> <{ Int -> Int }>@a
+     pow 0 = <{ \x -> ~~(const 1) }>
+     pow 1 = <{ \x -> x }>
+     pow n = <{ \x -> x * ~~(pow (n - 1)) x }>
+
+demo2 ::
+    forall c . 
+         (Int -> <{Int}>@c) -> 
+        <{Int -> Int -> Int}>@c ->
+        <{Int -> Int}>@c
 
-{-
-demo const mult =
-  <[ \y ->
+demo2 const mult =
+  <{ \y ->
      ~~mult
+       (~~(const 1))
        (~~mult y y)
-       (~~mult y y)
-   ]>
--}
+   }>
+
 
 
 
@@ -17,23 +36,23 @@ demo const mult =
 
 {-
 demo const mult =
-  <[ \y ->
+  <{ \y ->
      ~~mult
        (~~mult (~~mult y y) (~~mult y y))
        (~~mult (~~mult y y) (~~mult y y))
-   ]>
+   }>
 -}
 
 
 
 {-
 demo const mult =
-    <[ \y -> ~~(foo 4) ]>
+    <{ \y -> ~~(foo 4) }>
         where
           foo 0 = const (12::Int)
-          foo n = <[ let bar = ~~(foo (n-1))
+          foo n = <{ let bar = ~~(foo (n-1))
                      in ~~mult bar bar
-                   ]>
+                   }>
 
 -}
 
@@ -41,12 +60,12 @@ demo const mult =
 
 {-
 demo const mult =
-    <[ \y -> ~~(foo 3) ]>
+    <{ \y -> ~~(foo 3) }>
         where
           foo 0 = const (12::Int)
-          foo n = <[ let recurs = ~~(foo (n-1))
+          foo n = <{ let recurs = ~~(foo (n-1))
                      in  ~~mult recurs recurs
-                   ]>
+                   }>
 
 -}
 
@@ -54,12 +73,6 @@ demo const mult =
 
 
 
-demo const mult =
- <[ \y ->
-    let   foo  = ~~mult (~~mult foo (~~mult y foo)) y
-    in    foo ]>
-
-
 
 
 
@@ -72,12 +85,12 @@ demo const mult =
 
 {-
 demo const mult =
-    <[ \y -> ~~(foo 2 <[y]>) ]>
+    <{ \y -> ~~(foo 2 <{y}>) }>
         where
           foo 0 y = const (12::Int)
-          foo n y = <[ let recurs = ~~(foo (n-1) y)
+          foo n y = <{ let recurs = ~~(foo (n-1) y)
                        in  ~~mult recurs recurs
-                     ]>
+                     }>
 -}
 
 
@@ -120,40 +133,35 @@ demo const mult =
 
 
 
--- demo const mult = <[ \(y::Int) -> ~~mult y ~~(const 12) ]>
--- demo' n = <[ ~~mult ~~(demo' (n-1)) ~~(demo' (n-1)) ]>
+-- demo const mult = <{ \(y::Int) -> ~~mult y ~~(const 12) }>
+-- demo' n = <{ ~~mult ~~(demo' (n-1)) ~~(demo' (n-1)) }>
 -- golden
 {-
 demo const mult =
- <[ \y ->
+ <{ \y ->
     let   twelve  = ~~mult twelve y
-    in    twelve ]>
+    in    twelve }>
 -}
 
 {-
 demo const mult =
-   <[ \y -> let y = ~~(const 4) in ~~mult (~~mult y y) (~~mult y y) ]>
+   <{ \y -> let y = ~~(const 4) in ~~mult (~~mult y y) (~~mult y y) }>
 -}
 
 {-
 demo const mult =
-   <[ \(y::Int) ->
+   <{ \(y::Int) ->
       let four   = ~~mult four ~~(const  4)
 --          twelve = {- {- ~~mult four -}  ~~(const 12) -} four
       in  four
-    ]>
+    }>
 -}
-demo ::
-    forall c . 
-         (Int -> <[Int]>@c) -> 
-        <[Int -> Int -> Int]>@c ->
-        <[Int -> Int]>@c
 
 {-
 demo const mult =
- <[ let     twelve = ~~(const (12::Int))
+ <{ let     twelve = ~~(const (12::Int))
     in let  four    = ~~(const (4::Int))
-         in  ~~mult four twelve  ]>
+         in  ~~mult four twelve  }>
 -}
 
 {-
@@ -161,11 +169,11 @@ demo const mult = demo' 3
  where
   demo' 0 = const 12
   demo' 1 = const 12
-  demo' n = <[ ~~mult ~~(demo' (n-1)) ~~(demo' (n-2)) ]>
+  demo' n = <{ ~~mult ~~(demo' (n-1)) ~~(demo' (n-2)) }>
 -}
 
 -- BUG
---demo const mult = <[ \y -> ~~(demo' 0) ]>
+--demo const mult = <{ \y -> ~~(demo' 0) }>
 --  where
 --   demo' 0 = const 4
 --   demo' n = const 4