# HG changeset patch
# User wenzelm
# Date 1130257137 -7200
# Node ID 0450847646c316347ee4ff3ee3f033387a4be468
# Parent  d5d576b723719b2f04dd1d407717d9db9bf444c0
prove_raw: cterms, explicit asms;
prove: Pattern.matches beta_norm;

diff -r d5d576b72371 -r 0450847646c3 src/Pure/goal.ML
--- a/src/Pure/goal.ML	Tue Oct 25 18:18:49 2005 +0200
+++ b/src/Pure/goal.ML	Tue Oct 25 18:18:57 2005 +0200
@@ -17,8 +17,8 @@
   val init: cterm -> thm
   val conclude: thm -> thm
   val finish: thm -> thm
-  val prove_raw: theory -> term -> tactic -> thm
   val norm_hhf_rule: thm -> thm
+  val prove_raw: cterm list -> cterm -> (thm list -> tactic) -> thm
   val prove: theory -> string list -> term list -> term -> (thm list -> tactic) -> thm
   val prove_multi: theory -> string list -> term list -> term list ->
     (thm list -> tactic) -> thm list
@@ -65,15 +65,7 @@
       ("\n" ^ string_of_int n ^ " unsolved goal(s)!"), 0, [th]));
 
 
-(* prove_raw -- minimal checks, no normalization *)
-
-fun prove_raw thy goal tac =
-  (case SINGLE tac (init (Thm.cterm_of thy goal)) of
-    SOME th => finish th
-  | NONE => raise ERROR_MESSAGE "Tactic failed.");
-
-
-(* tactical proving *)
+(* prove_raw -- minimal result checks, no normalization *)
 
 val norm_hhf_plain =  (* FIXME remove *)
   (not o Drule.is_norm_hhf o Thm.prop_of) ?
@@ -84,6 +76,14 @@
   #> Thm.adjust_maxidx_thm
   #> Drule.gen_all;
 
+fun prove_raw casms cprop tac =
+  (case SINGLE (tac (map (norm_hhf_rule o Thm.assume) casms)) (init cprop) of
+    SOME th => Drule.implies_intr_list casms (finish th)
+  | NONE => raise ERROR_MESSAGE "Tactic failed.");
+
+
+(* tactical proving *)
+
 local
 
 fun gen_prove finish_thm thy xs asms props tac =
@@ -114,7 +114,7 @@
     val raw_result = finish goal' handle THM (msg, _, _) => err msg;
 
     val prop' = Thm.prop_of raw_result;
-    val _ = conditional (not (Pattern.matches thy (prop, prop'))) (fn () =>
+    val _ = conditional (not (Pattern.matches thy (Envir.beta_norm prop, prop'))) (fn () =>
       err ("Proved a different theorem: " ^ Sign.string_of_term thy prop'));
   in
     Drule.conj_elim_precise (length props) raw_result