diff --git a/src/HOL/SMT.thy b/src/HOL/SMT.thy
--- a/src/HOL/SMT.thy
+++ b/src/HOL/SMT.thy
@@ -1,578 +1,578 @@
 (*  Title:      HOL/SMT.thy
     Author:     Sascha Boehme, TU Muenchen
     Author:     Jasmin Blanchette, VU Amsterdam
 *)
 
 section \<open>Bindings to Satisfiability Modulo Theories (SMT) solvers based on SMT-LIB 2\<close>
 
 theory SMT
   imports Divides
   keywords "smt_status" :: diag
 begin
 
 subsection \<open>A skolemization tactic and proof method\<close>
 
 lemma choices:
   "\<And>Q. \<forall>x. \<exists>y ya. Q x y ya \<Longrightarrow> \<exists>f fa. \<forall>x. Q x (f x) (fa x)"
   "\<And>Q. \<forall>x. \<exists>y ya yb. Q x y ya yb \<Longrightarrow> \<exists>f fa fb. \<forall>x. Q x (f x) (fa x) (fb x)"
   "\<And>Q. \<forall>x. \<exists>y ya yb yc. Q x y ya yb yc \<Longrightarrow> \<exists>f fa fb fc. \<forall>x. Q x (f x) (fa x) (fb x) (fc x)"
   "\<And>Q. \<forall>x. \<exists>y ya yb yc yd. Q x y ya yb yc yd \<Longrightarrow>
      \<exists>f fa fb fc fd. \<forall>x. Q x (f x) (fa x) (fb x) (fc x) (fd x)"
   "\<And>Q. \<forall>x. \<exists>y ya yb yc yd ye. Q x y ya yb yc yd ye \<Longrightarrow>
      \<exists>f fa fb fc fd fe. \<forall>x. Q x (f x) (fa x) (fb x) (fc x) (fd x) (fe x)"
   "\<And>Q. \<forall>x. \<exists>y ya yb yc yd ye yf. Q x y ya yb yc yd ye yf \<Longrightarrow>
      \<exists>f fa fb fc fd fe ff. \<forall>x. Q x (f x) (fa x) (fb x) (fc x) (fd x) (fe x) (ff x)"
   "\<And>Q. \<forall>x. \<exists>y ya yb yc yd ye yf yg. Q x y ya yb yc yd ye yf yg \<Longrightarrow>
      \<exists>f fa fb fc fd fe ff fg. \<forall>x. Q x (f x) (fa x) (fb x) (fc x) (fd x) (fe x) (ff x) (fg x)"
   by metis+
 
 lemma bchoices:
   "\<And>Q. \<forall>x \<in> S. \<exists>y ya. Q x y ya \<Longrightarrow> \<exists>f fa. \<forall>x \<in> S. Q x (f x) (fa x)"
   "\<And>Q. \<forall>x \<in> S. \<exists>y ya yb. Q x y ya yb \<Longrightarrow> \<exists>f fa fb. \<forall>x \<in> S. Q x (f x) (fa x) (fb x)"
   "\<And>Q. \<forall>x \<in> S. \<exists>y ya yb yc. Q x y ya yb yc \<Longrightarrow> \<exists>f fa fb fc. \<forall>x \<in> S. Q x (f x) (fa x) (fb x) (fc x)"
   "\<And>Q. \<forall>x \<in> S. \<exists>y ya yb yc yd. Q x y ya yb yc yd \<Longrightarrow>
     \<exists>f fa fb fc fd. \<forall>x \<in> S. Q x (f x) (fa x) (fb x) (fc x) (fd x)"
   "\<And>Q. \<forall>x \<in> S. \<exists>y ya yb yc yd ye. Q x y ya yb yc yd ye \<Longrightarrow>
     \<exists>f fa fb fc fd fe. \<forall>x \<in> S. Q x (f x) (fa x) (fb x) (fc x) (fd x) (fe x)"
   "\<And>Q. \<forall>x \<in> S. \<exists>y ya yb yc yd ye yf. Q x y ya yb yc yd ye yf \<Longrightarrow>
     \<exists>f fa fb fc fd fe ff. \<forall>x \<in> S. Q x (f x) (fa x) (fb x) (fc x) (fd x) (fe x) (ff x)"
   "\<And>Q. \<forall>x \<in> S. \<exists>y ya yb yc yd ye yf yg. Q x y ya yb yc yd ye yf yg \<Longrightarrow>
     \<exists>f fa fb fc fd fe ff fg. \<forall>x \<in> S. Q x (f x) (fa x) (fb x) (fc x) (fd x) (fe x) (ff x) (fg x)"
   by metis+
 
 ML \<open>
 fun moura_tac ctxt =
   Atomize_Elim.atomize_elim_tac ctxt THEN'
   SELECT_GOAL (Clasimp.auto_tac (ctxt addSIs @{thms choice choices bchoice bchoices}) THEN
     ALLGOALS (Metis_Tactic.metis_tac (take 1 ATP_Proof_Reconstruct.partial_type_encs)
         ATP_Proof_Reconstruct.default_metis_lam_trans ctxt [] ORELSE'
       blast_tac ctxt))
 \<close>
 
 method_setup moura = \<open>
   Scan.succeed (SIMPLE_METHOD' o moura_tac)
 \<close> "solve skolemization goals, especially those arising from Z3 proofs"
 
 hide_fact (open) choices bchoices
 
 
 subsection \<open>Triggers for quantifier instantiation\<close>
 
 text \<open>
 Some SMT solvers support patterns as a quantifier instantiation
 heuristics. Patterns may either be positive terms (tagged by "pat")
 triggering quantifier instantiations -- when the solver finds a
 term matching a positive pattern, it instantiates the corresponding
 quantifier accordingly -- or negative terms (tagged by "nopat")
 inhibiting quantifier instantiations. A list of patterns
 of the same kind is called a multipattern, and all patterns in a
 multipattern are considered conjunctively for quantifier instantiation.
 A list of multipatterns is called a trigger, and their multipatterns
 act disjunctively during quantifier instantiation. Each multipattern
 should mention at least all quantified variables of the preceding
 quantifier block.
 \<close>
 
 typedecl 'a symb_list
 
 consts
   Symb_Nil :: "'a symb_list"
   Symb_Cons :: "'a \<Rightarrow> 'a symb_list \<Rightarrow> 'a symb_list"
 
 typedecl pattern
 
 consts
   pat :: "'a \<Rightarrow> pattern"
   nopat :: "'a \<Rightarrow> pattern"
 
 definition trigger :: "pattern symb_list symb_list \<Rightarrow> bool \<Rightarrow> bool" where
   "trigger _ P = P"
 
 
 subsection \<open>Higher-order encoding\<close>
 
 text \<open>
 Application is made explicit for constants occurring with varying
 numbers of arguments. This is achieved by the introduction of the
 following constant.
 \<close>
 
 definition fun_app :: "'a \<Rightarrow> 'a" where "fun_app f = f"
 
 text \<open>
 Some solvers support a theory of arrays which can be used to encode
 higher-order functions. The following set of lemmas specifies the
 properties of such (extensional) arrays.
 \<close>
 
 lemmas array_rules = ext fun_upd_apply fun_upd_same fun_upd_other  fun_upd_upd fun_app_def
 
 
 subsection \<open>Normalization\<close>
 
 lemma case_bool_if[abs_def]: "case_bool x y P = (if P then x else y)"
   by simp
 
 lemmas Ex1_def_raw = Ex1_def[abs_def]
 lemmas Ball_def_raw = Ball_def[abs_def]
 lemmas Bex_def_raw = Bex_def[abs_def]
 lemmas abs_if_raw = abs_if[abs_def]
 lemmas min_def_raw = min_def[abs_def]
 lemmas max_def_raw = max_def[abs_def]
 
 lemma nat_zero_as_int:
   "0 = nat 0"
   by simp
 
 lemma nat_one_as_int:
   "1 = nat 1"
   by simp
 
 lemma nat_numeral_as_int: "numeral = (\<lambda>i. nat (numeral i))" by simp
 lemma nat_less_as_int: "(<) = (\<lambda>a b. int a < int b)" by simp
 lemma nat_leq_as_int: "(\<le>) = (\<lambda>a b. int a \<le> int b)" by simp
 lemma Suc_as_int: "Suc = (\<lambda>a. nat (int a + 1))" by (rule ext) simp
 lemma nat_plus_as_int: "(+) = (\<lambda>a b. nat (int a + int b))" by (rule ext)+ simp
 lemma nat_minus_as_int: "(-) = (\<lambda>a b. nat (int a - int b))" by (rule ext)+ simp
 lemma nat_times_as_int: "(*) = (\<lambda>a b. nat (int a * int b))" by (simp add: nat_mult_distrib)
 lemma nat_div_as_int: "(div) = (\<lambda>a b. nat (int a div int b))" by (simp add: nat_div_distrib)
 lemma nat_mod_as_int: "(mod) = (\<lambda>a b. nat (int a mod int b))" by (simp add: nat_mod_distrib)
 
 lemma int_Suc: "int (Suc n) = int n + 1" by simp
 lemma int_plus: "int (n + m) = int n + int m" by (rule of_nat_add)
 lemma int_minus: "int (n - m) = int (nat (int n - int m))" by auto
 
 lemma nat_int_comparison:
   fixes a b :: nat
   shows "(a = b) = (int a = int b)"
     and "(a < b) = (int a < int b)"
     and "(a \<le> b) = (int a \<le> int b)"
   by simp_all
 
 lemma int_ops:
   fixes a b :: nat
   shows "int 0 = 0"
     and "int 1 = 1"
     and "int (numeral n) = numeral n"
     and "int (Suc a) = int a + 1"
     and "int (a + b) = int a + int b"
     and "int (a - b) = (if int a < int b then 0 else int a - int b)"
     and "int (a * b) = int a * int b"
     and "int (a div b) = int a div int b"
     and "int (a mod b) = int a mod int b"
   by (auto intro: zdiv_int zmod_int)
 
 lemma int_if:
   fixes a b :: nat
   shows "int (if P then a else b) = (if P then int a else int b)"
   by simp
 
 
 subsection \<open>Integer division and modulo for Z3\<close>
 
 text \<open>
 The following Z3-inspired definitions are overspecified for the case where \<open>l = 0\<close>. This
 Schönheitsfehler is corrected in the \<open>div_as_z3div\<close> and \<open>mod_as_z3mod\<close> theorems.
 \<close>
 
 definition z3div :: "int \<Rightarrow> int \<Rightarrow> int" where
   "z3div k l = (if l \<ge> 0 then k div l else - (k div - l))"
 
 definition z3mod :: "int \<Rightarrow> int \<Rightarrow> int" where
   "z3mod k l = k mod (if l \<ge> 0 then l else - l)"
 
 lemma div_as_z3div:
   "\<forall>k l. k div l = (if l = 0 then 0 else if l > 0 then z3div k l else z3div (- k) (- l))"
   by (simp add: z3div_def)
 
 lemma mod_as_z3mod:
   "\<forall>k l. k mod l = (if l = 0 then k else if l > 0 then z3mod k l else - z3mod (- k) (- l))"
   by (simp add: z3mod_def)
 
 
 subsection \<open>Extra theorems for veriT reconstruction\<close>
 
 lemma verit_sko_forall: \<open>(\<forall>x. P x) \<longleftrightarrow> P (SOME x. \<not>P x)\<close>
   using someI[of \<open>\<lambda>x. \<not>P x\<close>]
   by auto
 
 lemma verit_sko_forall': \<open>P (SOME x. \<not>P x) = A \<Longrightarrow> (\<forall>x. P x) = A\<close>
   by (subst verit_sko_forall)
 
 lemma verit_sko_forall_indirect: \<open>x = (SOME x. \<not>P x) \<Longrightarrow> (\<forall>x. P x) \<longleftrightarrow> P x\<close>
   using someI[of \<open>\<lambda>x. \<not>P x\<close>]
   by auto
 
 lemma verit_sko_ex: \<open>(\<exists>x. P x) \<longleftrightarrow> P (SOME x. P x)\<close>
   using someI[of \<open>\<lambda>x. P x\<close>]
   by auto
 
 lemma verit_sko_ex': \<open>P (SOME x. P x) = A \<Longrightarrow> (\<exists>x. P x) = A\<close>
   by (subst verit_sko_ex)
 
 lemma verit_sko_ex_indirect: \<open>x = (SOME x. P x) \<Longrightarrow> (\<exists>x. P x) \<longleftrightarrow> P x\<close>
   using someI[of \<open>\<lambda>x. P x\<close>]
   by auto
 
 lemma verit_Pure_trans:
   \<open>P \<equiv> Q \<Longrightarrow> Q \<Longrightarrow> P\<close>
   by auto
 
 lemma verit_if_cong:
   assumes \<open>b \<equiv> c\<close>
     and \<open>c \<Longrightarrow> x \<equiv> u\<close>
     and \<open>\<not> c \<Longrightarrow> y \<equiv> v\<close>
   shows \<open>(if b then x else y) \<equiv> (if c then u else v)\<close>
   using assms if_cong[of b c x u] by auto
 
 lemma verit_if_weak_cong':
   \<open>b \<equiv> c \<Longrightarrow> (if b then x else y) \<equiv> (if c then x else y)\<close>
   by auto
 
 lemma verit_ite_intro_simp:
   \<open>(if c then (a :: 'a) = (if c then P else Q') else Q) = (if c then a = P else Q)\<close>
   \<open>(if c then R else b = (if c then R' else Q')) =
     (if c then R else b = Q')\<close>
   \<open>(if c then a' = a' else b' = b')\<close>
   by (auto split: if_splits)
 
 lemma verit_or_neg:
    \<open>(A \<Longrightarrow> B) \<Longrightarrow> B \<or> \<not>A\<close>
    \<open>(\<not>A \<Longrightarrow> B) \<Longrightarrow> B \<or> A\<close>
   by auto
 
 lemma verit_subst_bool: \<open>P \<Longrightarrow> f True \<Longrightarrow> f P\<close>
   by auto
 
 lemma verit_and_pos:
   \<open>(a \<Longrightarrow> \<not>b \<or> A) \<Longrightarrow> \<not>(a \<and> b) \<or> A\<close>
   \<open>(a \<Longrightarrow> A) \<Longrightarrow> \<not>a \<or> A\<close>
   \<open>(\<not>a \<Longrightarrow> A) \<Longrightarrow> a \<or> A\<close>
   by blast+
 
 lemma verit_la_generic:
   \<open>(a::int) \<le> x \<or> a = x \<or> a \<ge> x\<close>
   by linarith
 
 lemma verit_tmp_bfun_elim:
   \<open>(if b then P True else P False) = P b\<close>
   by (cases b) auto
 
 lemma verit_eq_true_simplify:
   \<open>(P = True) \<equiv> P\<close>
   by auto
 
 lemma verit_and_neg:
   \<open>B \<or> B' \<Longrightarrow> (A \<and> B) \<or> \<not>A \<or> B'\<close>
   \<open>B \<or> B' \<Longrightarrow> (\<not>A \<and> B) \<or> A \<or> B'\<close>
   by auto
 
 lemma verit_forall_inst:
   \<open>A \<longleftrightarrow> B \<Longrightarrow> \<not>A \<or> B\<close>
   \<open>\<not>A \<longleftrightarrow> B \<Longrightarrow> A \<or> B\<close>
   \<open>A \<longleftrightarrow> B \<Longrightarrow> \<not>B \<or> A\<close>
   \<open>A \<longleftrightarrow> \<not>B \<Longrightarrow> B \<or> A\<close>
   \<open>A \<longrightarrow> B \<Longrightarrow> \<not>A \<or> B\<close>
   \<open>\<not>A \<longrightarrow> B \<Longrightarrow> A \<or> B\<close>
   by blast+
 
 lemma verit_eq_transitive:
   \<open>A = B \<Longrightarrow> B = C \<Longrightarrow> A = C\<close>
   \<open>A = B \<Longrightarrow> C = B \<Longrightarrow> A = C\<close>
   \<open>B = A \<Longrightarrow> B = C \<Longrightarrow> A = C\<close>
   \<open>B = A \<Longrightarrow> C = B \<Longrightarrow> A = C\<close>
   by auto
 
 
 subsection \<open>Setup\<close>
 
 ML_file \<open>Tools/SMT/smt_util.ML\<close>
 ML_file \<open>Tools/SMT/smt_failure.ML\<close>
 ML_file \<open>Tools/SMT/smt_config.ML\<close>
 ML_file \<open>Tools/SMT/smt_builtin.ML\<close>
 ML_file \<open>Tools/SMT/smt_datatypes.ML\<close>
 ML_file \<open>Tools/SMT/smt_normalize.ML\<close>
 ML_file \<open>Tools/SMT/smt_translate.ML\<close>
 ML_file \<open>Tools/SMT/smtlib.ML\<close>
 ML_file \<open>Tools/SMT/smtlib_interface.ML\<close>
 ML_file \<open>Tools/SMT/smtlib_proof.ML\<close>
 ML_file \<open>Tools/SMT/smtlib_isar.ML\<close>
 ML_file \<open>Tools/SMT/z3_proof.ML\<close>
 ML_file \<open>Tools/SMT/z3_isar.ML\<close>
 ML_file \<open>Tools/SMT/smt_solver.ML\<close>
 ML_file \<open>Tools/SMT/cvc4_interface.ML\<close>
 ML_file \<open>Tools/SMT/cvc4_proof_parse.ML\<close>
 ML_file \<open>Tools/SMT/verit_proof.ML\<close>
 ML_file \<open>Tools/SMT/verit_isar.ML\<close>
 ML_file \<open>Tools/SMT/verit_proof_parse.ML\<close>
 ML_file \<open>Tools/SMT/conj_disj_perm.ML\<close>
 ML_file \<open>Tools/SMT/smt_replay_methods.ML\<close>
 ML_file \<open>Tools/SMT/smt_replay.ML\<close>
 ML_file \<open>Tools/SMT/z3_interface.ML\<close>
 ML_file \<open>Tools/SMT/z3_replay_rules.ML\<close>
 ML_file \<open>Tools/SMT/z3_replay_methods.ML\<close>
 ML_file \<open>Tools/SMT/z3_replay.ML\<close>
 ML_file \<open>Tools/SMT/verit_replay_methods.ML\<close>
 ML_file \<open>Tools/SMT/verit_replay.ML\<close>
 ML_file \<open>Tools/SMT/smt_systems.ML\<close>
 
 method_setup smt = \<open>
   Scan.optional Attrib.thms [] >>
     (fn thms => fn ctxt =>
       METHOD (fn facts => HEADGOAL (SMT_Solver.smt_tac ctxt (thms @ facts))))
 \<close> "apply an SMT solver to the current goal"
 
 
 subsection \<open>Configuration\<close>
 
 text \<open>
 The current configuration can be printed by the command
 \<open>smt_status\<close>, which shows the values of most options.
 \<close>
 
 
 subsection \<open>General configuration options\<close>
 
 text \<open>
 The option \<open>smt_solver\<close> can be used to change the target SMT
 solver. The possible values can be obtained from the \<open>smt_status\<close>
 command.
 \<close>
 
 declare [[smt_solver = z3]]
 
 text \<open>
 Since SMT solvers are potentially nonterminating, there is a timeout
 (given in seconds) to restrict their runtime.
 \<close>
 
-declare [[smt_timeout = 20]]
+declare [[smt_timeout = 1000000]]
 
 text \<open>
 SMT solvers apply randomized heuristics. In case a problem is not
 solvable by an SMT solver, changing the following option might help.
 \<close>
 
 declare [[smt_random_seed = 1]]
 
 text \<open>
 In general, the binding to SMT solvers runs as an oracle, i.e, the SMT
 solvers are fully trusted without additional checks. The following
 option can cause the SMT solver to run in proof-producing mode, giving
 a checkable certificate. This is currently only implemented for Z3.
 \<close>
 
 declare [[smt_oracle = false]]
 
 text \<open>
 Each SMT solver provides several commandline options to tweak its
 behaviour. They can be passed to the solver by setting the following
 options.
 \<close>
 
 declare [[cvc3_options = ""]]
 declare [[cvc4_options = "--full-saturate-quant --inst-when=full-last-call --inst-no-entail --term-db-mode=relevant --multi-trigger-linear"]]
 declare [[verit_options = "--index-fresh-sorts"]]
 declare [[z3_options = ""]]
 
 text \<open>
 The SMT method provides an inference mechanism to detect simple triggers
 in quantified formulas, which might increase the number of problems
 solvable by SMT solvers (note: triggers guide quantifier instantiations
 in the SMT solver). To turn it on, set the following option.
 \<close>
 
 declare [[smt_infer_triggers = false]]
 
 text \<open>
 Enable the following option to use built-in support for datatypes,
 codatatypes, and records in CVC4. Currently, this is implemented only
 in oracle mode.
 \<close>
 
 declare [[cvc4_extensions = false]]
 
 text \<open>
 Enable the following option to use built-in support for div/mod, datatypes,
 and records in Z3. Currently, this is implemented only in oracle mode.
 \<close>
 
 declare [[z3_extensions = false]]
 
 
 subsection \<open>Certificates\<close>
 
 text \<open>
 By setting the option \<open>smt_certificates\<close> to the name of a file,
 all following applications of an SMT solver a cached in that file.
 Any further application of the same SMT solver (using the very same
 configuration) re-uses the cached certificate instead of invoking the
 solver. An empty string disables caching certificates.
 
 The filename should be given as an explicit path. It is good
 practice to use the name of the current theory (with ending
 \<open>.certs\<close> instead of \<open>.thy\<close>) as the certificates file.
 Certificate files should be used at most once in a certain theory context,
 to avoid race conditions with other concurrent accesses.
 \<close>
 
 declare [[smt_certificates = ""]]
 
 text \<open>
 The option \<open>smt_read_only_certificates\<close> controls whether only
 stored certificates are should be used or invocation of an SMT solver
 is allowed. When set to \<open>true\<close>, no SMT solver will ever be
 invoked and only the existing certificates found in the configured
 cache are used;  when set to \<open>false\<close> and there is no cached
 certificate for some proposition, then the configured SMT solver is
 invoked.
 \<close>
 
 declare [[smt_read_only_certificates = false]]
 
 
 subsection \<open>Tracing\<close>
 
 text \<open>
 The SMT method, when applied, traces important information. To
 make it entirely silent, set the following option to \<open>false\<close>.
 \<close>
 
 declare [[smt_verbose = true]]
 
 text \<open>
 For tracing the generated problem file given to the SMT solver as
 well as the returned result of the solver, the option
 \<open>smt_trace\<close> should be set to \<open>true\<close>.
 \<close>
 
 declare [[smt_trace = false]]
 
 
 subsection \<open>Schematic rules for Z3 proof reconstruction\<close>
 
 text \<open>
 Several prof rules of Z3 are not very well documented. There are two
 lemma groups which can turn failing Z3 proof reconstruction attempts
 into succeeding ones: the facts in \<open>z3_rule\<close> are tried prior to
 any implemented reconstruction procedure for all uncertain Z3 proof
 rules;  the facts in \<open>z3_simp\<close> are only fed to invocations of
 the simplifier when reconstructing theory-specific proof steps.
 \<close>
 
 lemmas [z3_rule] =
   refl eq_commute conj_commute disj_commute simp_thms nnf_simps
   ring_distribs field_simps times_divide_eq_right times_divide_eq_left
   if_True if_False not_not
   NO_MATCH_def
 
 lemma [z3_rule]:
   "(P \<and> Q) = (\<not> (\<not> P \<or> \<not> Q))"
   "(P \<and> Q) = (\<not> (\<not> Q \<or> \<not> P))"
   "(\<not> P \<and> Q) = (\<not> (P \<or> \<not> Q))"
   "(\<not> P \<and> Q) = (\<not> (\<not> Q \<or> P))"
   "(P \<and> \<not> Q) = (\<not> (\<not> P \<or> Q))"
   "(P \<and> \<not> Q) = (\<not> (Q \<or> \<not> P))"
   "(\<not> P \<and> \<not> Q) = (\<not> (P \<or> Q))"
   "(\<not> P \<and> \<not> Q) = (\<not> (Q \<or> P))"
   by auto
 
 lemma [z3_rule]:
   "(P \<longrightarrow> Q) = (Q \<or> \<not> P)"
   "(\<not> P \<longrightarrow> Q) = (P \<or> Q)"
   "(\<not> P \<longrightarrow> Q) = (Q \<or> P)"
   "(True \<longrightarrow> P) = P"
   "(P \<longrightarrow> True) = True"
   "(False \<longrightarrow> P) = True"
   "(P \<longrightarrow> P) = True"
   "(\<not> (A \<longleftrightarrow> \<not> B)) \<longleftrightarrow> (A \<longleftrightarrow> B)"
   by auto
 
 lemma [z3_rule]:
   "((P = Q) \<longrightarrow> R) = (R \<or> (Q = (\<not> P)))"
   by auto
 
 lemma [z3_rule]:
   "(\<not> True) = False"
   "(\<not> False) = True"
   "(x = x) = True"
   "(P = True) = P"
   "(True = P) = P"
   "(P = False) = (\<not> P)"
   "(False = P) = (\<not> P)"
   "((\<not> P) = P) = False"
   "(P = (\<not> P)) = False"
   "((\<not> P) = (\<not> Q)) = (P = Q)"
   "\<not> (P = (\<not> Q)) = (P = Q)"
   "\<not> ((\<not> P) = Q) = (P = Q)"
   "(P \<noteq> Q) = (Q = (\<not> P))"
   "(P = Q) = ((\<not> P \<or> Q) \<and> (P \<or> \<not> Q))"
   "(P \<noteq> Q) = ((\<not> P \<or> \<not> Q) \<and> (P \<or> Q))"
   by auto
 
 lemma [z3_rule]:
   "(if P then P else \<not> P) = True"
   "(if \<not> P then \<not> P else P) = True"
   "(if P then True else False) = P"
   "(if P then False else True) = (\<not> P)"
   "(if P then Q else True) = ((\<not> P) \<or> Q)"
   "(if P then Q else True) = (Q \<or> (\<not> P))"
   "(if P then Q else \<not> Q) = (P = Q)"
   "(if P then Q else \<not> Q) = (Q = P)"
   "(if P then \<not> Q else Q) = (P = (\<not> Q))"
   "(if P then \<not> Q else Q) = ((\<not> Q) = P)"
   "(if \<not> P then x else y) = (if P then y else x)"
   "(if P then (if Q then x else y) else x) = (if P \<and> (\<not> Q) then y else x)"
   "(if P then (if Q then x else y) else x) = (if (\<not> Q) \<and> P then y else x)"
   "(if P then (if Q then x else y) else y) = (if P \<and> Q then x else y)"
   "(if P then (if Q then x else y) else y) = (if Q \<and> P then x else y)"
   "(if P then x else if P then y else z) = (if P then x else z)"
   "(if P then x else if Q then x else y) = (if P \<or> Q then x else y)"
   "(if P then x else if Q then x else y) = (if Q \<or> P then x else y)"
   "(if P then x = y else x = z) = (x = (if P then y else z))"
   "(if P then x = y else y = z) = (y = (if P then x else z))"
   "(if P then x = y else z = y) = (y = (if P then x else z))"
   by auto
 
 lemma [z3_rule]:
   "0 + (x::int) = x"
   "x + 0 = x"
   "x + x = 2 * x"
   "0 * x = 0"
   "1 * x = x"
   "x + y = y + x"
   by (auto simp add: mult_2)
 
 lemma [z3_rule]:  (* for def-axiom *)
   "P = Q \<or> P \<or> Q"
   "P = Q \<or> \<not> P \<or> \<not> Q"
   "(\<not> P) = Q \<or> \<not> P \<or> Q"
   "(\<not> P) = Q \<or> P \<or> \<not> Q"
   "P = (\<not> Q) \<or> \<not> P \<or> Q"
   "P = (\<not> Q) \<or> P \<or> \<not> Q"
   "P \<noteq> Q \<or> P \<or> \<not> Q"
   "P \<noteq> Q \<or> \<not> P \<or> Q"
   "P \<noteq> (\<not> Q) \<or> P \<or> Q"
   "(\<not> P) \<noteq> Q \<or> P \<or> Q"
   "P \<or> Q \<or> P \<noteq> (\<not> Q)"
   "P \<or> Q \<or> (\<not> P) \<noteq> Q"
   "P \<or> \<not> Q \<or> P \<noteq> Q"
   "\<not> P \<or> Q \<or> P \<noteq> Q"
   "P \<or> y = (if P then x else y)"
   "P \<or> (if P then x else y) = y"
   "\<not> P \<or> x = (if P then x else y)"
   "\<not> P \<or> (if P then x else y) = x"
   "P \<or> R \<or> \<not> (if P then Q else R)"
   "\<not> P \<or> Q \<or> \<not> (if P then Q else R)"
   "\<not> (if P then Q else R) \<or> \<not> P \<or> Q"
   "\<not> (if P then Q else R) \<or> P \<or> R"
   "(if P then Q else R) \<or> \<not> P \<or> \<not> Q"
   "(if P then Q else R) \<or> P \<or> \<not> R"
   "(if P then \<not> Q else R) \<or> \<not> P \<or> Q"
   "(if P then Q else \<not> R) \<or> P \<or> R"
   by auto
 
 hide_type (open) symb_list pattern
 hide_const (open) Symb_Nil Symb_Cons trigger pat nopat fun_app z3div z3mod
 
 end
diff --git a/src/HOL/Tools/SMT/smt_config.ML b/src/HOL/Tools/SMT/smt_config.ML
--- a/src/HOL/Tools/SMT/smt_config.ML
+++ b/src/HOL/Tools/SMT/smt_config.ML
@@ -1,275 +1,275 @@
 (*  Title:      HOL/Tools/SMT/smt_config.ML
     Author:     Sascha Boehme, TU Muenchen
 
 Configuration options and diagnostic tools for SMT.
 *)
 
 signature SMT_CONFIG =
 sig
   (*solver*)
   type solver_info = {
     name: string,
     class: Proof.context -> SMT_Util.class,
     avail: unit -> bool,
     options: Proof.context -> string list }
   val add_solver: solver_info -> Context.generic -> Context.generic
   val set_solver_options: string * string -> Context.generic -> Context.generic
   val is_available: Proof.context -> string -> bool
   val available_solvers_of: Proof.context -> string list
   val select_solver: string -> Context.generic -> Context.generic
   val solver_of: Proof.context -> string
   val solver_class_of: Proof.context -> SMT_Util.class
   val solver_options_of: Proof.context -> string list
 
   (*options*)
   val oracle: bool Config.T
   val timeout: real Config.T
   val reconstruction_step_timeout: real Config.T
   val random_seed: int Config.T
   val read_only_certificates: bool Config.T
   val verbose: bool Config.T
   val trace: bool Config.T
   val statistics: bool Config.T
   val monomorph_limit: int Config.T
   val monomorph_instances: int Config.T
   val explicit_application: int Config.T
   val higher_order: bool Config.T
   val nat_as_int: bool Config.T
   val infer_triggers: bool Config.T
   val debug_files: string Config.T
   val sat_solver: string Config.T
 
   (*tools*)
   val with_time_limit: Proof.context -> real Config.T -> ('a -> 'b) -> 'a -> 'b
   val with_timeout: Proof.context -> ('a -> 'b) -> 'a -> 'b
 
   (*diagnostics*)
   val trace_msg: Proof.context -> ('a -> string) -> 'a -> unit
   val verbose_msg: Proof.context -> ('a -> string) -> 'a -> unit
   val statistics_msg: Proof.context -> ('a -> string) -> 'a -> unit
   val veriT_msg: Proof.context -> (unit -> 'a) -> unit
 
   (*certificates*)
   val select_certificates: string -> Context.generic -> Context.generic
   val certificates_of: Proof.context -> Cache_IO.cache option
 
   (*setup*)
   val print_setup: Proof.context -> unit
 end;
 
 structure SMT_Config: SMT_CONFIG =
 struct
 
 (* solver *)
 
 type solver_info = {
   name: string,
   class: Proof.context -> SMT_Util.class,
   avail: unit -> bool,
   options: Proof.context -> string list}
 
 type data = {
   solvers: (solver_info * string list) Symtab.table,
   solver: string option,
   certs: Cache_IO.cache option}
 
 fun mk_data solvers solver certs: data = {solvers=solvers, solver=solver, certs=certs}
 
 val empty_data = mk_data Symtab.empty NONE NONE
 
 fun solvers_of ({solvers, ...}: data) = solvers
 fun solver_of ({solver, ...}: data) = solver
 fun certs_of ({certs, ...}: data) = certs
 
 fun map_solvers f ({solvers, solver, certs}: data) = mk_data (f solvers) solver certs
 fun map_solver f ({solvers, solver, certs}: data) = mk_data solvers (f solver) certs
 fun put_certs c ({solvers, solver, ...}: data) = mk_data solvers solver c
 
 fun merge_data ({solvers=ss1,solver=s1,certs=c1}: data, {solvers=ss2,solver=s2,certs=c2}: data) =
   mk_data (Symtab.merge (K true) (ss1, ss2)) (merge_options (s1, s2)) (merge_options (c1, c2))
 
 structure Data = Generic_Data
 (
   type T = data
   val empty = empty_data
   val extend = I
   val merge = merge_data
 )
 
 fun set_solver_options (name, options) =
   let val opts = String.tokens (Symbol.is_ascii_blank o str) options
   in Data.map (map_solvers (Symtab.map_entry name (apsnd (K opts)))) end
 
 fun add_solver (info as {name, ...} : solver_info) context =
   if Symtab.defined (solvers_of (Data.get context)) name then
     error ("Solver already registered: " ^ quote name)
   else
     context
     |> Data.map (map_solvers (Symtab.update (name, (info, []))))
     |> Context.map_theory (Attrib.setup (Binding.name (name ^ "_options"))
         (Scan.lift (\<^keyword>\<open>=\<close> |-- Args.name) >>
           (Thm.declaration_attribute o K o set_solver_options o pair name))
         ("additional command line options for SMT solver " ^ quote name))
 
 fun all_solvers_of ctxt = Symtab.keys (solvers_of (Data.get (Context.Proof ctxt)))
 
 fun solver_name_of ctxt = solver_of (Data.get (Context.Proof ctxt))
 
 fun is_available ctxt name =
   (case Symtab.lookup (solvers_of (Data.get (Context.Proof ctxt))) name of
     SOME ({avail, ...}, _) => avail ()
   | NONE => false)
 
 fun available_solvers_of ctxt =
   filter (is_available ctxt) (all_solvers_of ctxt)
 
 fun warn_solver (Context.Proof ctxt) name =
       if Context_Position.is_visible ctxt then
         warning ("The SMT solver " ^ quote name ^ " is not installed")
       else ()
   | warn_solver _ _ = ()
 
 fun select_solver name context =
   let
     val ctxt = Context.proof_of context
     val upd = Data.map (map_solver (K (SOME name)))
   in
     if not (member (op =) (all_solvers_of ctxt) name) then
       error ("Trying to select unknown solver: " ^ quote name)
     else if not (is_available ctxt name) then
       (warn_solver context name; upd context)
     else upd context
   end
 
 fun no_solver_err () = error "No SMT solver selected"
 
 fun solver_of ctxt =
   (case solver_name_of ctxt of
     SOME name => name
   | NONE => no_solver_err ())
 
 fun solver_info_of default select ctxt =
   (case solver_name_of ctxt of
     NONE => default ()
   | SOME name => select (Symtab.lookup (solvers_of (Data.get (Context.Proof ctxt))) name))
 
 fun solver_class_of ctxt =
   let fun class_of ({class, ...}: solver_info, _) = class ctxt
   in solver_info_of no_solver_err (class_of o the) ctxt end
 
 fun solver_options_of ctxt =
   let
     fun all_options NONE = []
       | all_options (SOME ({options, ...} : solver_info, opts)) =
           opts @ options ctxt
   in solver_info_of (K []) all_options ctxt end
 
 val setup_solver =
   Attrib.setup \<^binding>\<open>smt_solver\<close>
     (Scan.lift (\<^keyword>\<open>=\<close> |-- Args.name) >>
       (Thm.declaration_attribute o K o select_solver))
     "SMT solver configuration"
 
 
 (* options *)
 
 val oracle = Attrib.setup_config_bool \<^binding>\<open>smt_oracle\<close> (K true)
-val timeout = Attrib.setup_config_real \<^binding>\<open>smt_timeout\<close> (K 30.0)
+val timeout = Attrib.setup_config_real \<^binding>\<open>smt_timeout\<close> (K 1000000.0)
 val reconstruction_step_timeout = Attrib.setup_config_real \<^binding>\<open>smt_reconstruction_step_timeout\<close> (K 10.0)
 val random_seed = Attrib.setup_config_int \<^binding>\<open>smt_random_seed\<close> (K 1)
 val read_only_certificates = Attrib.setup_config_bool \<^binding>\<open>smt_read_only_certificates\<close> (K false)
 val verbose = Attrib.setup_config_bool \<^binding>\<open>smt_verbose\<close> (K true)
 val trace = Attrib.setup_config_bool \<^binding>\<open>smt_trace\<close> (K false)
 val trace_veriT = Attrib.setup_config_bool \<^binding>\<open>smt_debug_verit\<close> (K false)
 val statistics = Attrib.setup_config_bool \<^binding>\<open>smt_statistics\<close> (K false)
 val monomorph_limit = Attrib.setup_config_int \<^binding>\<open>smt_monomorph_limit\<close> (K 10)
 val monomorph_instances = Attrib.setup_config_int \<^binding>\<open>smt_monomorph_instances\<close> (K 500)
 val explicit_application = Attrib.setup_config_int \<^binding>\<open>smt_explicit_application\<close> (K 1)
 val higher_order = Attrib.setup_config_bool \<^binding>\<open>smt_higher_order\<close> (K false)
 val nat_as_int = Attrib.setup_config_bool \<^binding>\<open>smt_nat_as_int\<close> (K false)
 val infer_triggers = Attrib.setup_config_bool \<^binding>\<open>smt_infer_triggers\<close> (K false)
 val debug_files = Attrib.setup_config_string \<^binding>\<open>smt_debug_files\<close> (K "")
 val sat_solver = Attrib.setup_config_string \<^binding>\<open>smt_sat_solver\<close> (K "cdclite")
 
 
 (* diagnostics *)
 
 fun cond_trace flag f x = if flag then tracing ("SMT: " ^ f x) else ()
 
 fun verbose_msg ctxt = cond_trace (Config.get ctxt verbose)
 fun trace_msg ctxt = cond_trace (Config.get ctxt trace)
 fun statistics_msg ctxt = cond_trace (Config.get ctxt statistics)
 
 fun veriT_msg ctxt (x : unit -> 'a) = if (Config.get ctxt trace_veriT) then ignore(x ()) else ()
 
 
 (* tools *)
 
 fun with_time_limit ctxt timeout_config f x =
   Timeout.apply (seconds (Config.get ctxt timeout_config)) f x
     handle Timeout.TIMEOUT _ => raise SMT_Failure.SMT SMT_Failure.Time_Out
 
 fun with_timeout ctxt = with_time_limit ctxt timeout
 
 
 (* certificates *)
 
 val certificates_of = certs_of o Data.get o Context.Proof
 
 val get_certificates_path = Option.map (Cache_IO.cache_path_of) o certificates_of
 
 fun select_certificates name context = context |> Data.map (put_certs (
   if name = "" then NONE
   else
     Path.explode name
     |> Path.append (Resources.master_directory (Context.theory_of context))
     |> SOME o Cache_IO.unsynchronized_init))
 
 val setup_certificates =
   Attrib.setup \<^binding>\<open>smt_certificates\<close>
     (Scan.lift (\<^keyword>\<open>=\<close> |-- Args.name) >>
       (Thm.declaration_attribute o K o select_certificates))
     "SMT certificates configuration"
 
 
 (* setup *)
 
 val _ = Theory.setup (
   setup_solver #>
   setup_certificates)
 
 fun print_setup ctxt =
   let
     fun string_of_bool b = if b then "true" else "false"
 
     val names = available_solvers_of ctxt
     val ns = if null names then ["(none)"] else sort_strings names
     val n = the_default "(none)" (solver_name_of ctxt)
     val opts = solver_options_of ctxt
 
     val t = string_of_real (Config.get ctxt timeout)
 
     val certs_filename =
       (case get_certificates_path ctxt of
         SOME path => Path.print path
       | NONE => "(disabled)")
   in
     Pretty.writeln (Pretty.big_list "SMT setup:" [
       Pretty.str ("Current SMT solver: " ^ n),
       Pretty.str ("Current SMT solver options: " ^ space_implode " " opts),
       Pretty.str_list "Available SMT solvers: "  "" ns,
       Pretty.str ("Current timeout: " ^ t ^ " seconds"),
       Pretty.str ("With proofs: " ^
         string_of_bool (not (Config.get ctxt oracle))),
       Pretty.str ("Certificates cache: " ^ certs_filename),
       Pretty.str ("Fixed certificates: " ^
         string_of_bool (Config.get ctxt read_only_certificates))])
   end
 
 val _ =
   Outer_Syntax.command \<^command_keyword>\<open>smt_status\<close>
     "show the available SMT solvers, the currently selected SMT solver, \
     \and the values of SMT configuration options"
     (Scan.succeed (Toplevel.keep (print_setup o Toplevel.context_of)))
 
 end;