diff -r aa6c470a962a -r 5d5e123443b3 src/HOL/Tools/Function/scnp_reconstruct.ML --- a/src/HOL/Tools/Function/scnp_reconstruct.ML Thu Oct 15 21:08:03 2009 +0200 +++ b/src/HOL/Tools/Function/scnp_reconstruct.ML Thu Oct 15 21:28:39 2009 +0200 @@ -39,7 +39,7 @@ struct val PROFILE = FundefCommon.PROFILE -fun TRACE x = if ! FundefCommon.profile then Output.tracing x else () +fun TRACE x = if ! FundefCommon.profile then tracing x else () open ScnpSolve @@ -316,17 +316,17 @@ fun index xs = (1 upto length xs) ~~ xs fun outp s t f xs = map (fn (x, y) => s ^ Int.toString x ^ t ^ f y ^ "\n") xs val ims = index (map index ms) - val _ = Output.tracing (concat (outp "fn #" ":\n" (concat o outp "\tmeasure #" ": " (Syntax.string_of_term ctxt)) ims)) + val _ = tracing (concat (outp "fn #" ":\n" (concat o outp "\tmeasure #" ": " (Syntax.string_of_term ctxt)) ims)) fun print_call (k, c) = let val (_, p, _, q, _, _) = dest_call D c - val _ = Output.tracing ("call table for call #" ^ Int.toString k ^ ": fn " ^ + val _ = tracing ("call table for call #" ^ Int.toString k ^ ": fn " ^ Int.toString (p + 1) ^ " ~> fn " ^ Int.toString (q + 1)) val caller_ms = nth ms p val callee_ms = nth ms q val entries = map (fn x => map (pair x) (callee_ms)) (caller_ms) fun print_ln (i : int, l) = concat (Int.toString i :: " " :: map (enclose " " " " o print_cell o (uncurry (get_descent D c))) l) - val _ = Output.tracing (concat (Int.toString (p + 1) ^ "|" ^ Int.toString (q + 1) ^ + val _ = tracing (concat (Int.toString (p + 1) ^ "|" ^ Int.toString (q + 1) ^ " " :: map (enclose " " " " o Int.toString) (1 upto length callee_ms)) ^ "\n" ^ cat_lines (map print_ln ((1 upto (length entries)) ~~ entries))) in @@ -335,7 +335,7 @@ fun list_call (k, c) = let val (_, p, _, q, _, _) = dest_call D c - val _ = Output.tracing ("call #" ^ (Int.toString k) ^ ": fn " ^ + val _ = tracing ("call #" ^ (Int.toString k) ^ ": fn " ^ Int.toString (p + 1) ^ " ~> fn " ^ Int.toString (q + 1) ^ "\n" ^ (Syntax.string_of_term ctxt c)) in true end