[MLton-commit] r5666

[Matthew Fluet]

Formatting
----------------------------------------------------------------------

U   mlton/trunk/mlton/ssa/simplify.fun
U   mlton/trunk/mlton/ssa/simplify2.fun

----------------------------------------------------------------------

Modified: mlton/trunk/mlton/ssa/simplify.fun
===================================================================
--- mlton/trunk/mlton/ssa/simplify.fun	2007-06-21 20:12:36 UTC (rev 5665)
+++ mlton/trunk/mlton/ssa/simplify.fun	2007-06-21 21:37:53 UTC (rev 5666)
@@ -39,13 +39,14 @@
    Ref.fluidLet
    (Control.inlineIntoMain, true, fn () =>
     Ref.fluidLet
-    (Control.inline, Control.Leaf {size = SOME size}, fn () =>
-     Inline.inline p))
+    (Control.inline, Control.Leaf {size = SOME size}, 
+     fn () => Inline.inline p))
 fun inlineLeafNoLoop size p =
    Ref.fluidLet
-   (Control.inline, 
-    Control.LeafNoLoop {size = SOME size}, 
-    fn () => Inline.inline p)
+   (Control.inlineIntoMain, true, fn () =>
+    Ref.fluidLet
+    (Control.inline, Control.LeafNoLoop {size = SOME size}, 
+     fn () => Inline.inline p))
 
 type pass = {name: string,
              doit: Program.t -> Program.t}

Modified: mlton/trunk/mlton/ssa/simplify2.fun
===================================================================
--- mlton/trunk/mlton/ssa/simplify2.fun	2007-06-21 20:12:36 UTC (rev 5665)
+++ mlton/trunk/mlton/ssa/simplify2.fun	2007-06-21 21:37:53 UTC (rev 5666)
@@ -36,19 +36,21 @@
 (*
 fun inlineNonRecursive (product, small) p =
    Ref.fluidLet
-   (Control.inline,
-    Control.NonRecursive {product = product, small = small},
+   (Control.inline, 
+    Control.NonRecursive {product = product, small = small}, 
     fn () => Inline.inline p)
 fun inlineLeaf size p =
    Ref.fluidLet
-   (Control.inline,
-    Control.Leaf {size = SOME size},
-    fn () => Inline.inline p)
+   (Control.inlineIntoMain, true, fn () =>
+    Ref.fluidLet
+    (Control.inline, Control.Leaf {size = SOME size}, 
+     fn () => Inline.inline p))
 fun inlineLeafNoLoop size p =
    Ref.fluidLet
-   (Control.inline,
-    Control.LeafNoLoop {size = SOME size},
-    fn () => Inline.inline p)
+   (Control.inlineIntoMain, true, fn () =>
+    Ref.fluidLet
+    (Control.inline, Control.LeafNoLoop {size = SOME size}, 
+     fn () => Inline.inline p))
 *)
 
 type pass = {name: string,