# HG changeset patch # User Adam Chlipala # Date 1216314736 14400 # Node ID 18299126a343909ce7fb0e2f0c800f5d7a8e6933 # Parent 55d8cfa4d0240abde65ce9a21a97b3a90dd234cc MonoShake diff -r 55d8cfa4d024 -r 18299126a343 src/compiler.sig --- a/src/compiler.sig Thu Jul 17 12:59:52 2008 -0400 +++ b/src/compiler.sig Thu Jul 17 13:12:16 2008 -0400 @@ -50,6 +50,7 @@ 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 @@ 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 -r 55d8cfa4d024 -r 18299126a343 src/compiler.sml --- a/src/compiler.sml Thu Jul 17 12:59:52 2008 -0400 +++ b/src/compiler.sml Thu Jul 17 13:12:16 2008 -0400 @@ -259,8 +259,17 @@ else SOME (MonoReduce.reduce file) +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_reduce job of + case mono_shake job of NONE => NONE | SOME file => if ErrorMsg.anyErrors () then @@ -384,6 +393,15 @@ 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 -r 55d8cfa4d024 -r 18299126a343 src/mono_shake.sig --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/mono_shake.sig Thu Jul 17 13:12:16 2008 -0400 @@ -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 -r 55d8cfa4d024 -r 18299126a343 src/mono_shake.sml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/mono_shake.sml Thu Jul 17 13:12:16 2008 -0400 @@ -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 -r 55d8cfa4d024 -r 18299126a343 src/sources --- a/src/sources Thu Jul 17 12:59:52 2008 -0400 +++ b/src/sources Thu Jul 17 13:12:16 2008 -0400 @@ -101,6 +101,9 @@ mono_reduce.sig mono_reduce.sml +mono_shake.sig +mono_shake.sml + cjr.sml cjr_env.sig diff -r 55d8cfa4d024 -r 18299126a343 tests/rec3.lac --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/rec3.lac Thu Jul 17 13:12:16 2008 -0400 @@ -0,0 +1,13 @@ +val rec main = fn () => + See another page + + +and aux = fn () => +

The Main Event

+ + {auxer ()} + + +and auxer = fn () => + Back to square one +