MonoShake

6 files changed, 159 insertions, 1 deletions

diff --git a/src/compiler.sig b/src/compiler.sig
index 7ef7f260..dfe4e930 100644
--- a/src/compiler.sig
+++ b/src/compiler.sig
@@ -50,6 +50,7 @@ signature COMPILER = sig
     val mono_opt' : job -> Mono.file option
     val untangle : job -> Mono.file option
     val mono_reduce : job -> Mono.file option
+    val mono_shake : job -> Mono.file option
     val mono_opt : job -> Mono.file option
     val cjrize : job -> Cjr.file option
 
@@ -65,6 +66,7 @@ signature COMPILER = sig
     val testMono_opt' : job -> unit
     val testUntangle : job -> unit
     val testMono_reduce : job -> unit
+    val testMono_shake : job -> unit
     val testMono_opt : job -> unit
     val testCjrize : job -> unit
 
diff --git a/src/compiler.sml b/src/compiler.sml
index fb4c8f02..86ca9416 100644
--- a/src/compiler.sml
+++ b/src/compiler.sml
@@ -259,13 +259,22 @@ fun mono_reduce job =
         else
             SOME (MonoReduce.reduce file)
 
-fun mono_opt job =
+fun mono_shake job =
     case mono_reduce job of
         NONE => NONE
       | SOME file =>
         if ErrorMsg.anyErrors () then
             NONE
         else
+            SOME (MonoShake.shake file)
+
+fun mono_opt job =
+    case mono_shake job of
+        NONE => NONE
+      | SOME file =>
+        if ErrorMsg.anyErrors () then
+            NONE
+        else
             SOME (MonoOpt.optimize file)
 
 fun cjrize job =
@@ -384,6 +393,15 @@ fun testMono_reduce job =
     handle MonoEnv.UnboundNamed n =>
            print ("Unbound named " ^ Int.toString n ^ "\n")
 
+fun testMono_shake job =
+    (case mono_shake job of
+         NONE => print "Failed\n"
+       | SOME file =>
+         (Print.print (MonoPrint.p_file MonoEnv.empty file);
+          print "\n"))
+    handle MonoEnv.UnboundNamed n =>
+           print ("Unbound named " ^ Int.toString n ^ "\n")
+
 fun testMono_opt job =
     (case mono_opt job of
          NONE => print "Failed\n"
diff --git a/src/mono_shake.sig b/src/mono_shake.sig
new file mode 100644
index 00000000..813bc528
--- /dev/null
+++ b/src/mono_shake.sig
@@ -0,0 +1,34 @@
+(* Copyright (c) 2008, Adam Chlipala
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * - Redistributions of source code must retain the above copyright notice,
+ *   this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright notice,
+ *   this list of conditions and the following disclaimer in the documentation
+ *   and/or other materials provided with the distribution.
+ * - The names of contributors may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *)
+
+(* Remove unused definitions from a file *)
+
+signature MONO_SHAKE = sig
+
+    val shake : Mono.file -> Mono.file
+
+end
diff --git a/src/mono_shake.sml b/src/mono_shake.sml
new file mode 100644
index 00000000..b5b45a0e
--- /dev/null
+++ b/src/mono_shake.sml
@@ -0,0 +1,88 @@
+(* Copyright (c) 2008, Adam Chlipala
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * - Redistributions of source code must retain the above copyright notice,
+ *   this list of conditions and the following disclaimer.
+ * - Redistributions in binary form must reproduce the above copyright notice,
+ *   this list of conditions and the following disclaimer in the documentation
+ *   and/or other materials provided with the distribution.
+ * - The names of contributors may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *)
+
+(* Remove unused definitions from a file *)
+
+structure MonoShake :> MONO_SHAKE = struct
+
+open Mono
+
+structure U = MonoUtil
+
+structure IS = IntBinarySet
+structure IM = IntBinaryMap
+
+type free = {
+     con : IS.set,
+     exp : IS.set
+}
+
+fun shake file =
+    let
+        val page_es = List.foldl
+                          (fn ((DExport (_, n, _), _), page_es) => n :: page_es
+                            | (_, page_es) => page_es) [] file
+
+        val (cdef, edef) = foldl (fn ((DVal (_, n, t, e, _), _), (cdef, edef)) => (cdef, IM.insert (edef, n, (t, e)))
+                                   | ((DValRec vis, _), (cdef, edef)) =>
+                                     (cdef, foldl (fn ((_, n, t, e, _), edef) => IM.insert (edef, n, (t, e))) edef vis)
+                                   | ((DExport _, _), acc) => acc)
+                                 (IM.empty, IM.empty) file
+
+        fun typ (_, s) = s
+
+        fun exp (e, s) =
+            case e of
+                ENamed n =>
+                if IS.member (#exp s, n) then
+                    s
+                else
+                    let
+                        val s' = {exp = IS.add (#exp s, n),
+                                  con = #con s}
+                    in
+                        case IM.find (edef, n) of
+                            NONE => s'
+                          | SOME (t, e) => shakeExp s' e
+                    end
+              | _ => s
+
+        and shakeExp s = U.Exp.fold {typ = typ, exp = exp} s
+
+        val s = {con = IS.empty, exp = IS.addList (IS.empty, page_es)}
+
+        val s = foldl (fn (n, s) =>
+                          case IM.find (edef, n) of
+                              NONE => raise Fail "Shake: Couldn't find 'val'"
+                            | SOME (t, e) => shakeExp s e) s page_es
+    in
+        List.filter (fn (DVal (_, n, _, _, _), _) => IS.member (#exp s, n)
+                      | (DValRec vis, _) => List.exists (fn (_, n, _, _, _) => IS.member (#exp s, n)) vis
+                      | (DExport _, _) => true) file
+    end
+
+end
diff --git a/src/sources b/src/sources
index 96559959..23379bf4 100644
--- a/src/sources
+++ b/src/sources
@@ -101,6 +101,9 @@ untangle.sml
 mono_reduce.sig
 mono_reduce.sml
 
+mono_shake.sig
+mono_shake.sml
+
 cjr.sml
 
 cjr_env.sig
diff --git a/tests/rec3.lac b/tests/rec3.lac
new file mode 100644
index 00000000..eaa07fe2
--- /dev/null
+++ b/tests/rec3.lac
@@ -0,0 +1,13 @@
+val rec main = fn () => <html><body>
+        <a link={aux ()}>See another page</a>
+</body></html>
+
+and aux = fn () => <html><body>
+        <h1>The Main Event</h1>
+
+        {auxer ()}
+</body></html>
+
+and auxer = fn () => <body>
+        <a link={main ()}>Back to square one</a>
+</body>