[MLton-commit] r6717

[Matthew Fluet]

Prefer S/XML.Program.layouts
----------------------------------------------------------------------

U   mlton/trunk/mlton/xml/sxml-simplify.fun
U   mlton/trunk/mlton/xml/xml-simplify.fun

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

Modified: mlton/trunk/mlton/xml/sxml-simplify.fun
===================================================================
--- mlton/trunk/mlton/xml/sxml-simplify.fun	2008-08-19 22:10:16 UTC (rev 6716)
+++ mlton/trunk/mlton/xml/sxml-simplify.fun	2008-08-19 22:10:22 UTC (rev 6717)
@@ -179,7 +179,7 @@
                let open Control
                in maybeSaveToFile
                   ({name = name, suffix = "pre.sxml"},
-                   Control.No, p, Control.Layout Program.layout)
+                   Control.No, p, Control.Layouts Program.layouts)
                end
             val p =
                Control.passTypeCheck
@@ -187,7 +187,7 @@
                 suffix = "post.sxml",
                 style = Control.No,
                 thunk = fn () => doit p,
-                display = Control.Layout Program.layout,
+                display = Control.Layouts Program.layouts,
                 typeCheck = typeCheck}
             val _ = stats p
          in

Modified: mlton/trunk/mlton/xml/xml-simplify.fun
===================================================================
--- mlton/trunk/mlton/xml/xml-simplify.fun	2008-08-19 22:10:16 UTC (rev 6716)
+++ mlton/trunk/mlton/xml/xml-simplify.fun	2008-08-19 22:10:22 UTC (rev 6717)
@@ -1,4 +1,4 @@
-(* Copyright (C) 1999-2006 Henry Cejtin, Matthew Fluet, Suresh
+(* Copyright (C) 1999-2006, 2008 Henry Cejtin, Matthew Fluet, Suresh
  *    Jagannathan, and Stephen Weeks.
  * Copyright (C) 1997-2000 NEC Research Institute.
  *
@@ -90,7 +90,7 @@
                let open Control
                in maybeSaveToFile
                   ({name = name, suffix = "pre.xml"},
-                   Control.No, p, Control.Layout Program.layout)
+                   Control.No, p, Control.Layouts Program.layouts)
                end
             val p =
                Control.passTypeCheck
@@ -98,7 +98,7 @@
                 suffix = "post.xml",
                 style = Control.No,
                 thunk = fn () => doit p,
-                display = Control.Layout Program.layout,
+                display = Control.Layouts Program.layouts,
                 typeCheck = typeCheck}
             val _ = stats p
          in