# HG changeset patch
# User wenzelm
# Date 1185212745 -7200
# Node ID 977d14aeb4d5367a1a0ffc782fae21ed70009064
# Parent  66e1f24d655ddadf869ddfa4981c7aa2fb2dd13a
depth flag: plain bool ref;
eliminated transform_failure (to avoid critical section for main transactions);

diff -r 66e1f24d655d -r 977d14aeb4d5 src/Pure/meta_simplifier.ML
--- a/src/Pure/meta_simplifier.ML	Mon Jul 23 19:45:44 2007 +0200
+++ b/src/Pure/meta_simplifier.ML	Mon Jul 23 19:45:45 2007 +0200
@@ -28,7 +28,7 @@
    {rules: rrule Net.net,
     prems: thm list,
     bounds: int * ((string * typ) * string) list,
-    depth: int * bool ref option,
+    depth: int * bool ref,
     context: Proof.context option} *
    {congs: (string * cong) list * string list,
     procs: proc Net.net,
@@ -95,7 +95,6 @@
   exception SIMPLIFIER of string * thm
   val solver: simpset -> solver -> int -> tactic
   val clear_ss: simpset -> simpset
-  exception SIMPROC_FAIL of string * exn
   val simproc_i: theory -> string -> term list
     -> (theory -> simpset -> term -> thm option) -> simproc
   val simproc: theory -> string -> string list
@@ -192,7 +191,7 @@
    {rules: rrule Net.net,
     prems: thm list,
     bounds: int * ((string * typ) * string) list,
-    depth: int * bool ref option,
+    depth: int * bool ref,
     context: Proof.context option} *
    {congs: (string * cong) list * string list,
     procs: proc Net.net,
@@ -259,17 +258,14 @@
 val trace_simp_depth_limit = ref 1;
 
 fun trace_depth (Simpset ({depth = (depth, exceeded), ...}, _)) msg =
-  if depth > !trace_simp_depth_limit then
-    (case exceeded of
-      NONE => ()
-    | SOME r => if !r then () else (tracing "trace_simp_depth_limit exceeded!"; r := true))
+  if depth > ! trace_simp_depth_limit then
+    if ! exceeded then () else (tracing "trace_simp_depth_limit exceeded!"; exceeded := true)
   else
-    (tracing (enclose "[" "]" (string_of_int depth) ^ msg);
-      (case exceeded of SOME r => r := false | _ => ()));
+    (tracing (enclose "[" "]" (string_of_int depth) ^ msg); exceeded := false);
 
 val inc_simp_depth = map_simpset1 (fn (rules, prems, bounds, (depth, exceeded), context) =>
   (rules, prems, bounds,
-    (depth + 1, if depth = !trace_simp_depth_limit then SOME (ref false) else exceeded), context));
+    (depth + 1, if depth = ! trace_simp_depth_limit then ref false else exceeded), context));
 
 fun simp_depth (Simpset ({depth = (depth, _), ...}, _)) = depth;
 
@@ -622,8 +618,6 @@
 
 (* simprocs *)
 
-exception SIMPROC_FAIL of string * exn;
-
 datatype simproc =
   Simproc of
     {name: string,
@@ -774,7 +768,7 @@
 (* empty *)
 
 fun init_ss mk_rews termless subgoal_tac solvers =
-  make_simpset ((Net.empty, [], (0, []), (0, NONE), NONE),
+  make_simpset ((Net.empty, [], (0, []), (0, ref false), NONE),
     (([], []), Net.empty, mk_rews, termless, subgoal_tac, [], solvers));
 
 fun clear_ss (ss as Simpset (_, {mk_rews, termless, subgoal_tac, solvers, ...})) =
@@ -954,8 +948,7 @@
       | proc_rews (Proc {name, proc, lhs, ...} :: ps) =
           if Pattern.matches thyt (Thm.term_of lhs, Thm.term_of t) then
             (debug_term false (fn () => "Trying procedure " ^ quote name ^ " on:") ss thyt eta_t;
-             case transform_failure (curry SIMPROC_FAIL name)
-                 (fn () => proc ss eta_t') () of
+             case proc ss eta_t' of
                NONE => (debug false (fn () => "FAILED") ss; proc_rews ps)
              | SOME raw_thm =>
                  (trace_thm (fn () => "Procedure " ^ quote name ^ " produced rewrite rule:")