From 3def45d67899c421a3eabaf0c5238d4469ad10d7 Mon Sep 17 00:00:00 2001
From: Adam Megacz <megacz@cs.berkeley.edu>
Date: Mon, 20 Jun 2011 20:02:38 -0700
Subject: [PATCH 1/1] update Demo.hs

---
 examples/Demo.hs |  147 ++++++++++++++++++++++++++++++++++++++++++++++++------
 1 file changed, 131 insertions(+), 16 deletions(-)

diff --git a/examples/Demo.hs b/examples/Demo.hs
index 0a5e4e4..bb3bf17 100644
--- a/examples/Demo.hs
+++ b/examples/Demo.hs
@@ -1,20 +1,137 @@
-{-# 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 ->
+     ~~mult
+       (~~mult y y)
+       (~~mult y y)
+   ]>
+-}
+
+
+
+
+
 
-demo const mult = <[ \(y::Int) -> ~~mult y ~~(const 12) ]>
 {-
-demo const mult = <[ \y -> ~~(demo' 0) ]>
-  where
-   demo' 0 = const 4
-   demo' n = const 4
+demo const mult =
+  <[ \y ->
+     ~~mult
+       (~~mult (~~mult y y) (~~mult y y))
+       (~~mult (~~mult y y) (~~mult y y))
+   ]>
 -}
--- demo' n = <[ ~~mult ~~(demo' (n-1)) ~~(demo' (n-1)) ]>
 
 
 
 {-
 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 -> ~~(foo 3) ]>
+        where
+          foo 0 = const (12::Int)
+          foo n = <[ let recurs = ~~(foo (n-1))
+                     in  ~~mult recurs recurs
+                   ]>
+
+-}
+
+
+
+
+
+demo const mult =
+ <[ \y ->
+    let   foo  = ~~mult (~~mult foo (~~mult y foo)) y
+    in    foo ]>
+
+
+
+
+
+
+
+
+
+
+
+
+{-
+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) ]>
 -}
 
@@ -38,14 +155,6 @@ demo const mult =
     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) ]>
--}
 
 {-
 demo const mult = demo' 3
@@ -53,4 +162,10 @@ demo const mult = demo' 3
   demo' 0 = const 12
   demo' 1 = const 12
   demo' n = <[ ~~mult ~~(demo' (n-1)) ~~(demo' (n-2)) ]>
--}
\ No newline at end of file
+-}
+
+-- BUG
+--demo const mult = <[ \y -> ~~(demo' 0) ]>
+--  where
+--   demo' 0 = const 4
+--   demo' n = const 4
-- 
1.7.10.4