X-Git-Url: http://git.megacz.com/?p=coq-hetmet.git;a=blobdiff_plain;f=examples%2FDemo.hs;h=579bf4d2045d3c96cadce209cabb07b5f67d17e6;hp=0a5e4e48077be405bb2d2498fa96bb46e95418d3;hb=ec996e8cb550676d89d187061db7d018af9ec88d;hpb=68f5bca870525f0740a4c5cb1fdbc7c7ce270306

diff --git a/examples/Demo.hs b/examples/Demo.hs
index 0a5e4e4..579bf4d 100644
--- a/examples/Demo.hs
+++ b/examples/Demo.hs
@@ -1,50 +1,160 @@
-{-# OPTIONS_GHC -XModalTypes -fflatten -funsafe-skolemize -dcore-lint -XScopedTypeVariables #-}
+{-# OPTIONS_GHC -XModalTypes -fflatten -funsafe-skolemize -dcore-lint -XScopedTypeVariables -fsimpleopt-before-flatten #-}
 module Demo (demo) where
 
 
-demo const mult = <[ \(y::Int) -> ~~mult y ~~(const 12) ]>
+demo const mult =
+ <{ \y ->
+    let   foo  = ~~mult (~~mult foo (~~mult y foo)) (~~mult y ~~(const 3))
+    in    foo }>
+
+
+{-
+demo const mult =
+  <{ \y ->
+     ~~mult
+       (~~(const 1))
+       (~~mult y y)
+   }>
+-}
+
+
+
+
+
+
+{-
+demo const mult =
+  <{ \y ->
+     ~~mult
+       (~~mult (~~mult y y) (~~mult y y))
+       (~~mult (~~mult y y) (~~mult y y))
+   }>
+-}
+
+
+
+{-
+demo const mult =
+    <{ \y -> ~~(foo 4) }>
+        where
+          foo 0 = const (12::Int)
+          foo n = <{ let bar = ~~(foo (n-1))
+                     in ~~mult bar bar
+                   }>
+
+-}
+
+
+
 {-
-demo const mult = <[ \y -> ~~(demo' 0) ]>
-  where
-   demo' 0 = const 4
-   demo' n = const 4
+demo const mult =
+    <{ \y -> ~~(foo 3) }>
+        where
+          foo 0 = const (12::Int)
+          foo n = <{ let recurs = ~~(foo (n-1))
+                     in  ~~mult recurs recurs
+                   }>
+
 -}
--- demo' n = <[ ~~mult ~~(demo' (n-1)) ~~(demo' (n-1)) ]>
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+{-
+demo const mult =
+    <{ \y -> ~~(foo 2 <{y}>) }>
+        where
+          foo 0 y = const (12::Int)
+          foo n y = <{ let recurs = ~~(foo (n-1) y)
+                       in  ~~mult recurs recurs
+                     }>
+-}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+-- demo const mult = <{ \(y::Int) -> ~~mult y ~~(const 12) }>
+-- demo' n = <{ ~~mult ~~(demo' (n-1)) ~~(demo' (n-1)) }>
+-- golden
+{-
+demo const mult =
+ <{ \y ->
+    let   twelve  = ~~mult twelve y
+    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
+         (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  ]>
--}
-{-
-demo const mult =
- <[ let     twelve = ~~(const (12::Int))
-    in let  twelvea = twelve
-            four    = ~~(const (4::Int))
-            twelveb = twelve
-         in  ~~mult (~~mult twelvea four) (~~mult twelveb twelveb) ]>
+         in  ~~mult four twelve  }>
 -}
 
 {-
@@ -52,5 +162,11 @@ demo const mult = demo' 3
  where
   demo' 0 = const 12
   demo' 1 = const 12
-  demo' n = <[ ~~mult ~~(demo' (n-1)) ~~(demo' (n-2)) ]>
--}
\ No newline at end of file
+  demo' n = <{ ~~mult ~~(demo' (n-1)) ~~(demo' (n-2)) }>
+-}
+
+-- BUG
+--demo const mult = <{ \y -> ~~(demo' 0) }>
+--  where
+--   demo' 0 = const 4
+--   demo' n = const 4