# HG changeset patch
# User paulson
# Date 1111068723 -3600
# Node ID ab90e95ae02efa78663300f2df660643839b9d26
# Parent  431b281078b354fb6b0696f5896bd22c24d59790
meson now checks that problems are first-order

diff -r 431b281078b3 -r ab90e95ae02e src/HOL/MicroJava/BV/Product.thy
--- a/src/HOL/MicroJava/BV/Product.thy	Thu Mar 17 12:19:50 2005 +0100
+++ b/src/HOL/MicroJava/BV/Product.thy	Thu Mar 17 15:12:03 2005 +0100
@@ -44,7 +44,7 @@
   "order(Product.le rA rB) = (order rA & order rB)"
 apply (unfold order_def)
 apply simp
-apply meson
+apply blast
 done 
 
 
diff -r 431b281078b3 -r ab90e95ae02e src/HOL/Tools/meson.ML
--- a/src/HOL/Tools/meson.ML	Thu Mar 17 12:19:50 2005 +0100
+++ b/src/HOL/Tools/meson.ML	Thu Mar 17 15:12:03 2005 +0100
@@ -202,11 +202,28 @@
   | has_bool (Type(_, Ts)) = exists has_bool Ts
   | has_bool _ = false;
   
+(*Is the string the name of a connective? It doesn't matter if this list is
+  incomplete, since when actually called, the only connectives likely to
+  remain are & | Not.*)  
+fun is_conn c = c mem_string
+    ["Trueprop", "op &", "op |", "op -->", "op =", "Not", 
+     "All", "Ex", "Ball", "Bex"];
+
+(*True if the term contains a function where the type of any argument contains
+  bool.*)
+val has_bool_arg_const = 
+    exists_Const
+      (fn (c,T) => not(is_conn c) andalso exists (has_bool) (binder_types T));
+  
 (*Raises an exception if any Vars in the theorem mention type bool. That would mean
-  they are higher-order, and in addition, they could cause make_horn to loop!*)
+  they are higher-order, and in addition, they could cause make_horn to loop!
+  Functions taking Boolean arguments are also rejected.*)
 fun check_no_bool th =
-  if exists (has_bool o fastype_of) (term_vars (#prop (rep_thm th)))
-  then raise THM ("check_no_bool", 0, [th]) else th;
+  let val {prop,...} = rep_thm th
+  in if exists (has_bool o fastype_of) (term_vars prop) orelse
+        has_bool_arg_const prop
+  then raise THM ("check_no_bool", 0, [th]) else th
+  end;
 
 (*Create a meta-level Horn clause*)
 fun make_horn crules th = make_horn crules (tryres(th,crules))
@@ -271,10 +288,6 @@
     (assume_tac i APPEND resolve_tac horns i) THEN check_tac THEN
     TRYALL eq_assume_tac;
 
-
-
-
-
 (*Sums the sizes of the subgoals, ignoring hypotheses (ancestors)*)
 fun addconcl(prem,sz) = size_of_term(Logic.strip_assums_concl prem) + sz