# HG changeset patch
# User blanchet
# Date 1272034551 -7200
# Node ID 66af0a49de3914c3fb189fec6129e76bcf8bd46b
# Parent  a8c4b3b3cba5330e2ae45c4c9752bb34d95f5a30
move some sledgehammer stuff out of "atp_manager.ML"

diff -r a8c4b3b3cba5 -r 66af0a49de39 src/HOL/Mirabelle/Tools/mirabelle_sledgehammer.ML
--- a/src/HOL/Mirabelle/Tools/mirabelle_sledgehammer.ML	Fri Apr 23 16:21:47 2010 +0200
+++ b/src/HOL/Mirabelle/Tools/mirabelle_sledgehammer.ML	Fri Apr 23 16:55:51 2010 +0200
@@ -475,7 +475,7 @@
 
 fun invoke args =
   let
-    val _ = ATP_Manager.full_types := AList.defined (op =) args full_typesK
+    val _ = Sledgehammer_Isar.full_types := AList.defined (op =) args full_typesK
   in Mirabelle.register (init, sledgehammer_action args, done) end
 
 end
diff -r a8c4b3b3cba5 -r 66af0a49de39 src/HOL/Tools/ATP_Manager/atp_manager.ML
--- a/src/HOL/Tools/ATP_Manager/atp_manager.ML	Fri Apr 23 16:21:47 2010 +0200
+++ b/src/HOL/Tools/ATP_Manager/atp_manager.ML	Fri Apr 23 16:55:51 2010 +0200
@@ -55,9 +55,9 @@
   val add_prover: string * prover -> theory -> theory
   val get_prover: theory -> string -> prover option
   val available_atps: theory -> unit
-  val sledgehammer:
-    params -> int -> relevance_override -> (string -> minimize_command)
-    -> Proof.state -> unit
+  val start_prover_thread:
+    params -> Time.time -> Time.time -> int -> relevance_override
+    -> (string -> minimize_command) -> Proof.state -> string -> unit
 end;
 
 structure ATP_Manager : ATP_MANAGER =
@@ -331,8 +331,8 @@
 
 (* start prover thread *)
 
-fun start_prover (params as {timeout, ...}) birth_time death_time i
-                 relevance_override minimize_command proof_state name =
+fun start_prover_thread (params as {timeout, ...}) birth_time death_time i
+                        relevance_override minimize_command proof_state name =
   (case get_prover (Proof.theory_of proof_state) name of
     NONE => error ("Unknown ATP: " ^ quote name ^ ".")
   | SOME prover =>
@@ -358,20 +358,4 @@
           in () end);
       in () end);
 
-
-(* Sledgehammer the given subgoal *)
-
-fun sledgehammer {atps = [], ...} _ _ _ _ = error "No ATP is set."
-  | sledgehammer (params as {atps, timeout, ...}) i relevance_override
-                 minimize_command proof_state =
-    let
-      val birth_time = Time.now ()
-      val death_time = Time.+ (birth_time, timeout)
-      val _ = kill_atps ()  (* Race w.r.t. other invocations of Sledgehammer *)
-      val _ = priority "Sledgehammering..."
-      val _ = List.app (start_prover params birth_time death_time i
-                                     relevance_override minimize_command
-                                     proof_state) atps
-    in () end
-
 end;
diff -r a8c4b3b3cba5 -r 66af0a49de39 src/HOL/Tools/Sledgehammer/sledgehammer_isar.ML
--- a/src/HOL/Tools/Sledgehammer/sledgehammer_isar.ML	Fri Apr 23 16:21:47 2010 +0200
+++ b/src/HOL/Tools/Sledgehammer/sledgehammer_isar.ML	Fri Apr 23 16:55:51 2010 +0200
@@ -53,13 +53,13 @@
 val _ =
   ProofGeneralPgip.add_preference Preferences.category_proof
       (Preferences.int_pref timeout
-          "Sledgehammer: Time limit"
+          "Sledgehammer: Time Limit"
           "ATPs will be interrupted after this time (in seconds)")
 
 val _ =
   ProofGeneralPgip.add_preference Preferences.category_proof
       (Preferences.bool_pref full_types
-          "Sledgehammer: Full types" "ATPs will use full type information")
+          "Sledgehammer: Full Types" "ATPs will use full type information")
 
 type raw_param = string * string list
 
@@ -196,6 +196,21 @@
 fun get_params thy = extract_params thy (default_raw_params thy)
 fun default_params thy = get_params thy o map (apsnd single)
 
+(* Sledgehammer the given subgoal *)
+
+fun run {atps = [], ...} _ _ _ _ = error "No ATP is set."
+  | run (params as {atps, timeout, ...}) i relevance_override minimize_command
+        proof_state =
+    let
+      val birth_time = Time.now ()
+      val death_time = Time.+ (birth_time, timeout)
+      val _ = kill_atps ()  (* race w.r.t. other invocations of Sledgehammer *)
+      val _ = priority "Sledgehammering..."
+      val _ = List.app (start_prover_thread params birth_time death_time i
+                                            relevance_override minimize_command
+                                            proof_state) atps
+    in () end
+
 fun minimize override_params old_style_args i fact_refs state =
   let
     val thy = Proof.theory_of state
@@ -232,6 +247,9 @@
     priority (#2 (minimize_theorems params prover atp i state name_thms_pairs))
   end
 
+val sledgehammerN = "sledgehammer"
+val sledgehammer_paramsN = "sledgehammer_params"
+
 val runN = "run"
 val minimizeN = "minimize"
 val messagesN = "messages"
@@ -252,7 +270,7 @@
          | value => " = " ^ value)
 
 fun minimize_command override_params i atp_name facts =
-  "sledgehammer minimize [atp = " ^ atp_name ^
+  sledgehammerN ^ " " ^ minimizeN ^ " [atp = " ^ atp_name ^
   (override_params |> filter is_raw_param_relevant_for_minimize
                    |> implode o map (prefix ", " o string_for_raw_param)) ^
   "] (" ^ space_implode " " facts ^ ")" ^
@@ -265,8 +283,8 @@
   in
     if subcommand = runN then
       let val i = the_default 1 opt_i in
-        sledgehammer (get_params thy override_params) i relevance_override
-                     (minimize_command override_params i) state
+        run (get_params thy override_params) i relevance_override
+            (minimize_command override_params i) state
       end
     else if subcommand = minimizeN then
       minimize (map (apfst minimizize_raw_param_name) override_params) []
@@ -355,11 +373,11 @@
         Toplevel.keep (minimize [] args 1 fact_refs o Toplevel.proof_of)))
 
 val _ =
-  OuterSyntax.improper_command "sledgehammer"
+  OuterSyntax.improper_command sledgehammerN
     "search for first-order proof using automatic theorem provers" K.diag
     parse_sledgehammer_command
 val _ =
-  OuterSyntax.command "sledgehammer_params"
+  OuterSyntax.command sledgehammer_paramsN
     "set and display the default parameters for Sledgehammer" K.thy_decl
     parse_sledgehammer_params_command