Automated merge with ssh://[e-mail]//home/isabelle-repository/repos/isabelle

--- a/src/HOL/MetisExamples/Abstraction.thy	Wed Dec 10 10:28:16 2008 +0100
+++ b/src/HOL/MetisExamples/Abstraction.thy	Wed Dec 10 12:17:02 2008 +0000
@@ -62,9 +62,9 @@
 
 ML{*AtpWrapper.problem_name := "Abstraction__Sigma_Collect"*}
 lemma "(a,b) \<in> (SIGMA x: A. {y. x = f y}) ==> a \<in> A & a = f b"
-(*???metis cannot prove this
-by (metis CollectD SigmaD1 SigmaD2 UN_eq)
-Also, UN_eq is unnecessary*)
+(*???metis says this is satisfiable!
+by (metis CollectD SigmaD1 SigmaD2)
+*)
 by (meson CollectD SigmaD1 SigmaD2)
 
 

--- a/src/HOL/Tools/res_clause.ML	Wed Dec 10 10:28:16 2008 +0100
+++ b/src/HOL/Tools/res_clause.ML	Wed Dec 10 12:17:02 2008 +0000
@@ -279,6 +279,14 @@
 (*Given a list of sorted type variables, return a list of type literals.*)
 fun add_typs Ts = foldl (op union) [] (map sorts_on_typs Ts);
 
+(*The correct treatment of TFrees like 'a in lemmas (axiom clauses) is not clear.
+  * Ignoring them leads to unsound proofs, since we do nothing to ensure that 'a
+    in a lemma has the same sort as 'a in the conjecture.
+  * Deleting such clauses will lead to problems with locales in other use of local results
+    where 'a is fixed. Probably we should delete clauses unless the sorts agree.
+  * Currently we include a class constraint in the clause, exactly as with TVars.
+*)
+
 (** make axiom and conjecture clauses. **)
 
 fun get_tvar_strs [] = []