# HG changeset patch
# User Adam Chlipala <adam@chlipala.net>
# Date 1383670732 18000
# Node ID 5f478ecf65e4b5d4dd33b6a316edc883aa401097
# Parent  2e6795cc992fd7eb9ca21c6700ba02bc0c84ec6f
Identify more local definitions as functions that should be lifted to the top level, which has synergistic effects on inlining later

diff -r 2e6795cc992f -r 5f478ecf65e4 src/unnest.sml
--- a/src/unnest.sml	Mon Nov 04 16:00:48 2013 -0500
+++ b/src/unnest.sml	Tue Nov 05 11:58:52 2013 -0500
@@ -171,6 +171,8 @@
 
 fun kind (_, k, st) = (k, st)
 
+val basis = ref 0
+
 fun exp ((ks, ts), e as old, st : state) =
     case e of
         ELet (eds, e, t) =>
@@ -186,6 +188,21 @@
                     liftExpInExp (~by) (length subs) e
                 end
 
+            fun functionInside (t : con) =
+                case #1 t of
+                    TFun _ => true
+                  | CApp ((CModProj (basis', [], "transaction"), _), _) => basis' = !basis
+                  | _ => false
+
+            val eds = map (fn ed =>
+                              case #1 ed of
+                                  EDVal ((PVar (x, _), _), t, e) =>
+                                  if functionInside t then
+                                      (EDValRec [(x, t, E.liftExpInExp 0 e)], #2 ed)
+                                  else
+                                      ed
+                                | _ => ed) eds
+
             val (eds, (ts, maxName, ds, subs, by)) =
                 ListUtil.foldlMapConcat
                 (fn (ed, (ts, maxName, ds, subs, by)) =>
@@ -422,6 +439,7 @@
                     in
                         ([(DStr (x, n, sgn, str), loc)], st)
                     end
+                  | DFfiStr ("Basis", n, _) => (basis := n; default ())
                   | DFfiStr _ => default ()
                   | DConstraint _ => default ()
                   | DExport _ => default ()
diff -r 2e6795cc992f -r 5f478ecf65e4 tests/localfun.ur
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/localfun.ur	Tue Nov 05 11:58:52 2013 -0500
@@ -0,0 +1,191 @@
+fun boom s =
+    let
+        val bonk =
+            debug s;
+            debug s;
+            debug s;
+            debug s;
+            debug s;
+            debug s;
+            debug s;
+            debug s;
+            debug s;
+            debug s;
+            debug s;
+            debug s;
+            debug s;
+            debug s;
+            debug s;
+            debug s;
+            debug s;
+            debug s;
+            debug s;
+            debug s;
+            debug s;
+            debug s;
+            debug s;
+            debug s;
+            debug s;
+            debug s;
+            debug s;
+            debug s;
+            debug s;
+            debug s;
+            debug s;
+            debug s;
+            debug s;
+            debug s;
+            debug s;
+            debug s;
+            debug s;
+            debug s;
+            debug s;
+            debug s;
+            debug s;
+            debug s;
+            debug s;
+            debug s;
+            debug s;
+            debug s;
+            debug s;
+            debug s;
+            debug s;
+            debug s;
+            debug s;
+            debug s;
+            debug s;
+            debug s;
+            debug s;
+            debug s;
+            debug s;
+            debug s;
+            debug s
+
+        val boonk = fn () =>
+            debug s;
+            debug s;
+            debug s;
+            debug s;
+            debug s;
+            debug s;
+            debug s;
+            debug s;
+            debug s;
+            debug s;
+            debug s;
+            debug s;
+            debug s;
+            debug s;
+            debug s;
+            debug s;
+            debug s;
+            debug s;
+            debug s;
+            debug s;
+            debug s;
+            debug s;
+            debug s;
+            debug s;
+            debug s;
+            debug s;
+            debug s;
+            debug s;
+            debug s;
+            debug s;
+            debug s;
+            debug s;
+            debug s;
+            debug s;
+            debug s;
+            debug s;
+            debug s;
+            debug s;
+            debug s;
+            debug s;
+            debug s;
+            debug s;
+            debug s;
+            debug s;
+            debug s;
+            debug s;
+            debug s;
+            debug s;
+            debug s;
+            debug s;
+            debug s;
+            debug s;
+            debug s;
+            debug s;
+            debug s;
+            debug s;
+            debug s;
+            debug s;
+            debug s
+
+        fun booonk () =
+            debug s;
+            debug s;
+            debug s;
+            debug s;
+            debug s;
+            debug s;
+            debug s;
+            debug s;
+            debug s;
+            debug s;
+            debug s;
+            debug s;
+            debug s;
+            debug s;
+            debug s;
+            debug s;
+            debug s;
+            debug s;
+            debug s;
+            debug s;
+            debug s;
+            debug s;
+            debug s;
+            debug s;
+            debug s;
+            debug s;
+            debug s;
+            debug s;
+            debug s;
+            debug s;
+            debug s;
+            debug s;
+            debug s;
+            debug s;
+            debug s;
+            debug s;
+            debug s;
+            debug s;
+            debug s;
+            debug s;
+            debug s;
+            debug s;
+            debug s;
+            debug s;
+            debug s;
+            debug s;
+            debug s;
+            debug s;
+            debug s;
+            debug s;
+            debug s;
+            debug s;
+            debug s;
+            debug s;
+            debug s;
+            debug s;
+            debug s;
+            debug s;
+            debug s
+    in
+        bonk; bonk; boonk (); boonk (); booonk (); booonk ()
+    end
+
+fun main () : transaction page =
+    boom "test";
+    return <xml/>