src/Provers/classical.ML
author wenzelm
Fri, 07 Mar 1997 11:48:46 +0100
changeset 2754 59bd96046ad6
parent 2689 6d3d893453de
child 2813 cc4c816dafdc
permissions -rw-r--r--
moved settings comment to build;
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
0
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
     1
(*  Title: 	Provers/classical
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
     2
    ID:         $Id$
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
     3
    Author: 	Lawrence C Paulson, Cambridge University Computer Laboratory
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
     4
    Copyright   1992  University of Cambridge
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
     5
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
     6
Theorem prover for classical reasoning, including predicate calculus, set
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
     7
theory, etc.
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
     8
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
     9
Rules must be classified as intr, elim, safe, hazardous.
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
    10
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
    11
A rule is unsafe unless it can be applied blindly without harmful results.
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
    12
For a rule to be safe, its premises and conclusion should be logically
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
    13
equivalent.  There should be no variables in the premises that are not in
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
    14
the conclusion.
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
    15
*)
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
    16
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
    17
signature CLASSICAL_DATA =
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
    18
  sig
681
9b02474744ca Provers/classical: now takes theorem "classical" as argument, proves "swap"
lcp
parents: 469
diff changeset
    19
  val mp	: thm    	(* [| P-->Q;  P |] ==> Q *)
9b02474744ca Provers/classical: now takes theorem "classical" as argument, proves "swap"
lcp
parents: 469
diff changeset
    20
  val not_elim	: thm		(* [| ~P;  P |] ==> R *)
9b02474744ca Provers/classical: now takes theorem "classical" as argument, proves "swap"
lcp
parents: 469
diff changeset
    21
  val classical	: thm		(* (~P ==> P) ==> P *)
9b02474744ca Provers/classical: now takes theorem "classical" as argument, proves "swap"
lcp
parents: 469
diff changeset
    22
  val sizef 	: thm -> int	(* size function for BEST_FIRST *)
0
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
    23
  val hyp_subst_tacs: (int -> tactic) list
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
    24
  end;
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
    25
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
    26
(*Higher precedence than := facilitates use of references*)
1800
3d9d2ef0cd3b Now implements delrules
paulson
parents: 1724
diff changeset
    27
infix 4 addSIs addSEs addSDs addIs addEs addDs delrules
2630
7a962f6829ca moved THEN_MAYBE to Pure/tctical.ML
oheimb
parents: 2173
diff changeset
    28
        setSWrapper compSWrapper setWrapper compWrapper 
7a962f6829ca moved THEN_MAYBE to Pure/tctical.ML
oheimb
parents: 2173
diff changeset
    29
	addSbefore addSaltern addbefore addaltern;
0
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
    30
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
    31
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
    32
signature CLASSICAL =
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
    33
  sig
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
    34
  type claset
1073
b3f190995bc9 Recoded addSIs, etc., so that nets are built incrementally
lcp
parents: 1010
diff changeset
    35
  type netpair
681
9b02474744ca Provers/classical: now takes theorem "classical" as argument, proves "swap"
lcp
parents: 469
diff changeset
    36
  val empty_cs		: claset
1711
c06d01f75764 Provides merge_cs to support default clasets
paulson
parents: 1587
diff changeset
    37
  val merge_cs		: claset * claset -> claset
681
9b02474744ca Provers/classical: now takes theorem "classical" as argument, proves "swap"
lcp
parents: 469
diff changeset
    38
  val addDs 		: claset * thm list -> claset
9b02474744ca Provers/classical: now takes theorem "classical" as argument, proves "swap"
lcp
parents: 469
diff changeset
    39
  val addEs 		: claset * thm list -> claset
9b02474744ca Provers/classical: now takes theorem "classical" as argument, proves "swap"
lcp
parents: 469
diff changeset
    40
  val addIs 		: claset * thm list -> claset
9b02474744ca Provers/classical: now takes theorem "classical" as argument, proves "swap"
lcp
parents: 469
diff changeset
    41
  val addSDs		: claset * thm list -> claset
9b02474744ca Provers/classical: now takes theorem "classical" as argument, proves "swap"
lcp
parents: 469
diff changeset
    42
  val addSEs		: claset * thm list -> claset
9b02474744ca Provers/classical: now takes theorem "classical" as argument, proves "swap"
lcp
parents: 469
diff changeset
    43
  val addSIs		: claset * thm list -> claset
1800
3d9d2ef0cd3b Now implements delrules
paulson
parents: 1724
diff changeset
    44
  val delrules		: claset * thm list -> claset
2630
7a962f6829ca moved THEN_MAYBE to Pure/tctical.ML
oheimb
parents: 2173
diff changeset
    45
  val setSWrapper 	: claset * ((int -> tactic) -> (int -> tactic)) ->claset
7a962f6829ca moved THEN_MAYBE to Pure/tctical.ML
oheimb
parents: 2173
diff changeset
    46
  val compSWrapper 	: claset * ((int -> tactic) -> (int -> tactic)) ->claset
7a962f6829ca moved THEN_MAYBE to Pure/tctical.ML
oheimb
parents: 2173
diff changeset
    47
  val setWrapper 	: claset * ((int -> tactic) -> (int -> tactic)) ->claset
7a962f6829ca moved THEN_MAYBE to Pure/tctical.ML
oheimb
parents: 2173
diff changeset
    48
  val compWrapper 	: claset * ((int -> tactic) -> (int -> tactic)) ->claset
7a962f6829ca moved THEN_MAYBE to Pure/tctical.ML
oheimb
parents: 2173
diff changeset
    49
  val addSbefore 	: claset * (int -> tactic) -> claset
7a962f6829ca moved THEN_MAYBE to Pure/tctical.ML
oheimb
parents: 2173
diff changeset
    50
  val addSaltern 	: claset * (int -> tactic) -> claset
7a962f6829ca moved THEN_MAYBE to Pure/tctical.ML
oheimb
parents: 2173
diff changeset
    51
  val addbefore 	: claset * (int -> tactic) -> claset
7a962f6829ca moved THEN_MAYBE to Pure/tctical.ML
oheimb
parents: 2173
diff changeset
    52
  val addaltern	 	: claset * (int -> tactic) -> claset
982
4fe0b642b7d5 Addition of wrappers for integration with the simplifier.
lcp
parents: 747
diff changeset
    53
681
9b02474744ca Provers/classical: now takes theorem "classical" as argument, proves "swap"
lcp
parents: 469
diff changeset
    54
  val print_cs		: claset -> unit
1073
b3f190995bc9 Recoded addSIs, etc., so that nets are built incrementally
lcp
parents: 1010
diff changeset
    55
  val rep_claset	: 
b3f190995bc9 Recoded addSIs, etc., so that nets are built incrementally
lcp
parents: 1010
diff changeset
    56
      claset -> {safeIs: thm list, safeEs: thm list, 
b3f190995bc9 Recoded addSIs, etc., so that nets are built incrementally
lcp
parents: 1010
diff changeset
    57
		 hazIs: thm list, hazEs: thm list,
2630
7a962f6829ca moved THEN_MAYBE to Pure/tctical.ML
oheimb
parents: 2173
diff changeset
    58
		 uwrapper: (int -> tactic) -> (int -> tactic),
7a962f6829ca moved THEN_MAYBE to Pure/tctical.ML
oheimb
parents: 2173
diff changeset
    59
		 swrapper: (int -> tactic) -> (int -> tactic),
1073
b3f190995bc9 Recoded addSIs, etc., so that nets are built incrementally
lcp
parents: 1010
diff changeset
    60
		 safe0_netpair: netpair, safep_netpair: netpair,
b3f190995bc9 Recoded addSIs, etc., so that nets are built incrementally
lcp
parents: 1010
diff changeset
    61
		 haz_netpair: netpair, dup_netpair: netpair}
2630
7a962f6829ca moved THEN_MAYBE to Pure/tctical.ML
oheimb
parents: 2173
diff changeset
    62
  val getWrapper	: claset -> (int -> tactic) -> (int -> tactic)
7a962f6829ca moved THEN_MAYBE to Pure/tctical.ML
oheimb
parents: 2173
diff changeset
    63
  val getSWrapper	: claset -> (int -> tactic) -> (int -> tactic)
982
4fe0b642b7d5 Addition of wrappers for integration with the simplifier.
lcp
parents: 747
diff changeset
    64
1587
e7d8a4957bac Now provides astar versions (thanks to Norbert Voelker)
paulson
parents: 1524
diff changeset
    65
  val fast_tac 		: claset -> int -> tactic
e7d8a4957bac Now provides astar versions (thanks to Norbert Voelker)
paulson
parents: 1524
diff changeset
    66
  val slow_tac 		: claset -> int -> tactic
e7d8a4957bac Now provides astar versions (thanks to Norbert Voelker)
paulson
parents: 1524
diff changeset
    67
  val weight_ASTAR	: int ref
e7d8a4957bac Now provides astar versions (thanks to Norbert Voelker)
paulson
parents: 1524
diff changeset
    68
  val astar_tac		: claset -> int -> tactic
e7d8a4957bac Now provides astar versions (thanks to Norbert Voelker)
paulson
parents: 1524
diff changeset
    69
  val slow_astar_tac 	: claset -> int -> tactic
681
9b02474744ca Provers/classical: now takes theorem "classical" as argument, proves "swap"
lcp
parents: 469
diff changeset
    70
  val best_tac 		: claset -> int -> tactic
1587
e7d8a4957bac Now provides astar versions (thanks to Norbert Voelker)
paulson
parents: 1524
diff changeset
    71
  val slow_best_tac 	: claset -> int -> tactic
681
9b02474744ca Provers/classical: now takes theorem "classical" as argument, proves "swap"
lcp
parents: 469
diff changeset
    72
  val depth_tac		: claset -> int -> int -> tactic
1938
4e29ea45520d Now deepen_tac can take advantage of wrappers --
paulson
parents: 1927
diff changeset
    73
  val DEEPEN  	        : (int -> int -> tactic) -> int -> int -> tactic
681
9b02474744ca Provers/classical: now takes theorem "classical" as argument, proves "swap"
lcp
parents: 469
diff changeset
    74
  val deepen_tac	: claset -> int -> int -> tactic
1587
e7d8a4957bac Now provides astar versions (thanks to Norbert Voelker)
paulson
parents: 1524
diff changeset
    75
e7d8a4957bac Now provides astar versions (thanks to Norbert Voelker)
paulson
parents: 1524
diff changeset
    76
  val contr_tac 	: int -> tactic
681
9b02474744ca Provers/classical: now takes theorem "classical" as argument, proves "swap"
lcp
parents: 469
diff changeset
    77
  val dup_elim		: thm -> thm
9b02474744ca Provers/classical: now takes theorem "classical" as argument, proves "swap"
lcp
parents: 469
diff changeset
    78
  val dup_intr		: thm -> thm
9b02474744ca Provers/classical: now takes theorem "classical" as argument, proves "swap"
lcp
parents: 469
diff changeset
    79
  val dup_step_tac	: claset -> int -> tactic
9b02474744ca Provers/classical: now takes theorem "classical" as argument, proves "swap"
lcp
parents: 469
diff changeset
    80
  val eq_mp_tac		: int -> tactic
9b02474744ca Provers/classical: now takes theorem "classical" as argument, proves "swap"
lcp
parents: 469
diff changeset
    81
  val haz_step_tac 	: claset -> int -> tactic
9b02474744ca Provers/classical: now takes theorem "classical" as argument, proves "swap"
lcp
parents: 469
diff changeset
    82
  val joinrules 	: thm list * thm list -> (bool * thm) list
9b02474744ca Provers/classical: now takes theorem "classical" as argument, proves "swap"
lcp
parents: 469
diff changeset
    83
  val mp_tac		: int -> tactic
9b02474744ca Provers/classical: now takes theorem "classical" as argument, proves "swap"
lcp
parents: 469
diff changeset
    84
  val safe_tac 		: claset -> tactic
9b02474744ca Provers/classical: now takes theorem "classical" as argument, proves "swap"
lcp
parents: 469
diff changeset
    85
  val safe_step_tac 	: claset -> int -> tactic
9b02474744ca Provers/classical: now takes theorem "classical" as argument, proves "swap"
lcp
parents: 469
diff changeset
    86
  val step_tac 		: claset -> int -> tactic
2630
7a962f6829ca moved THEN_MAYBE to Pure/tctical.ML
oheimb
parents: 2173
diff changeset
    87
  val slow_step_tac	: claset -> int -> tactic
681
9b02474744ca Provers/classical: now takes theorem "classical" as argument, proves "swap"
lcp
parents: 469
diff changeset
    88
  val swap		: thm                 (* ~P ==> (~Q ==> P) ==> Q *)
9b02474744ca Provers/classical: now takes theorem "classical" as argument, proves "swap"
lcp
parents: 469
diff changeset
    89
  val swapify 		: thm list -> thm list
9b02474744ca Provers/classical: now takes theorem "classical" as argument, proves "swap"
lcp
parents: 469
diff changeset
    90
  val swap_res_tac 	: thm list -> int -> tactic
9b02474744ca Provers/classical: now takes theorem "classical" as argument, proves "swap"
lcp
parents: 469
diff changeset
    91
  val inst_step_tac 	: claset -> int -> tactic
747
bdc066781063 deepen_tac: modified due to outcome of experiments. Its
lcp
parents: 681
diff changeset
    92
  val inst0_step_tac 	: claset -> int -> tactic
bdc066781063 deepen_tac: modified due to outcome of experiments. Its
lcp
parents: 681
diff changeset
    93
  val instp_step_tac 	: claset -> int -> tactic
1724
bb02e6976258 Added functions for default claset.
berghofe
parents: 1711
diff changeset
    94
bb02e6976258 Added functions for default claset.
berghofe
parents: 1711
diff changeset
    95
  val claset : claset ref
bb02e6976258 Added functions for default claset.
berghofe
parents: 1711
diff changeset
    96
  val AddDs 		: thm list -> unit
bb02e6976258 Added functions for default claset.
berghofe
parents: 1711
diff changeset
    97
  val AddEs 		: thm list -> unit
bb02e6976258 Added functions for default claset.
berghofe
parents: 1711
diff changeset
    98
  val AddIs 		: thm list -> unit
bb02e6976258 Added functions for default claset.
berghofe
parents: 1711
diff changeset
    99
  val AddSDs		: thm list -> unit
bb02e6976258 Added functions for default claset.
berghofe
parents: 1711
diff changeset
   100
  val AddSEs		: thm list -> unit
bb02e6976258 Added functions for default claset.
berghofe
parents: 1711
diff changeset
   101
  val AddSIs		: thm list -> unit
1807
3ff66483a8d4 Now exports Delrules
paulson
parents: 1800
diff changeset
   102
  val Delrules		: thm list -> unit
1814
89f8d4a88cca Addition of Safe_step_tac
paulson
parents: 1807
diff changeset
   103
  val Safe_step_tac	: int -> tactic
1800
3d9d2ef0cd3b Now implements delrules
paulson
parents: 1724
diff changeset
   104
  val Step_tac 		: int -> tactic
1724
bb02e6976258 Added functions for default claset.
berghofe
parents: 1711
diff changeset
   105
  val Fast_tac 		: int -> tactic
1800
3d9d2ef0cd3b Now implements delrules
paulson
parents: 1724
diff changeset
   106
  val Best_tac 		: int -> tactic
2066
b9063086ef56 Introduction of Slow_tac and Slow_best_tac
paulson
parents: 1938
diff changeset
   107
  val Slow_tac 		: int -> tactic
b9063086ef56 Introduction of Slow_tac and Slow_best_tac
paulson
parents: 1938
diff changeset
   108
  val Slow_best_tac     : int -> tactic
1800
3d9d2ef0cd3b Now implements delrules
paulson
parents: 1724
diff changeset
   109
  val Deepen_tac	: int -> int -> tactic
1724
bb02e6976258 Added functions for default claset.
berghofe
parents: 1711
diff changeset
   110
0
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   111
  end;
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   112
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   113
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   114
functor ClassicalFun(Data: CLASSICAL_DATA): CLASSICAL = 
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   115
struct
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   116
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   117
local open Data in
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   118
1800
3d9d2ef0cd3b Now implements delrules
paulson
parents: 1724
diff changeset
   119
(*** Useful tactics for classical reasoning ***)
0
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   120
1524
524879632d88 imp_elim and swap are now stored in thm database
paulson
parents: 1231
diff changeset
   121
val imp_elim = (*cannot use bind_thm within a structure!*)
524879632d88 imp_elim and swap are now stored in thm database
paulson
parents: 1231
diff changeset
   122
  store_thm ("imp_elim", make_elim mp);
0
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   123
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   124
(*Solve goal that assumes both P and ~P. *)
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   125
val contr_tac = eresolve_tac [not_elim]  THEN'  assume_tac;
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   126
681
9b02474744ca Provers/classical: now takes theorem "classical" as argument, proves "swap"
lcp
parents: 469
diff changeset
   127
(*Finds P-->Q and P in the assumptions, replaces implication by Q.
9b02474744ca Provers/classical: now takes theorem "classical" as argument, proves "swap"
lcp
parents: 469
diff changeset
   128
  Could do the same thing for P<->Q and P... *)
9b02474744ca Provers/classical: now takes theorem "classical" as argument, proves "swap"
lcp
parents: 469
diff changeset
   129
fun mp_tac i = eresolve_tac [not_elim, imp_elim] i  THEN  assume_tac i;
0
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   130
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   131
(*Like mp_tac but instantiates no variables*)
681
9b02474744ca Provers/classical: now takes theorem "classical" as argument, proves "swap"
lcp
parents: 469
diff changeset
   132
fun eq_mp_tac i = ematch_tac [not_elim, imp_elim] i  THEN  eq_assume_tac i;
9b02474744ca Provers/classical: now takes theorem "classical" as argument, proves "swap"
lcp
parents: 469
diff changeset
   133
1524
524879632d88 imp_elim and swap are now stored in thm database
paulson
parents: 1231
diff changeset
   134
val swap =
524879632d88 imp_elim and swap are now stored in thm database
paulson
parents: 1231
diff changeset
   135
  store_thm ("swap", rule_by_tactic (etac thin_rl 1) (not_elim RS classical));
0
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   136
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   137
(*Creates rules to eliminate ~A, from rules to introduce A*)
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   138
fun swapify intrs = intrs RLN (2, [swap]);
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   139
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   140
(*Uses introduction rules in the normal way, or on negated assumptions,
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   141
  trying rules in order. *)
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   142
fun swap_res_tac rls = 
54
3dea30013b58 classical/swap_res_tac: recoded to allow backtracking
lcp
parents: 0
diff changeset
   143
    let fun addrl (rl,brls) = (false, rl) :: (true, rl RSN (2,swap)) :: brls
3dea30013b58 classical/swap_res_tac: recoded to allow backtracking
lcp
parents: 0
diff changeset
   144
    in  assume_tac 	ORELSE' 
3dea30013b58 classical/swap_res_tac: recoded to allow backtracking
lcp
parents: 0
diff changeset
   145
	contr_tac 	ORELSE' 
3dea30013b58 classical/swap_res_tac: recoded to allow backtracking
lcp
parents: 0
diff changeset
   146
        biresolve_tac (foldr addrl (rls,[]))
0
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   147
    end;
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   148
681
9b02474744ca Provers/classical: now takes theorem "classical" as argument, proves "swap"
lcp
parents: 469
diff changeset
   149
(*Duplication of hazardous rules, for complete provers*)
2689
6d3d893453de dup_intr & dup_elim no longer call standard -- this
paulson
parents: 2630
diff changeset
   150
fun dup_intr th = zero_var_indexes (th RS classical);
681
9b02474744ca Provers/classical: now takes theorem "classical" as argument, proves "swap"
lcp
parents: 469
diff changeset
   151
9b02474744ca Provers/classical: now takes theorem "classical" as argument, proves "swap"
lcp
parents: 469
diff changeset
   152
fun dup_elim th = th RSN (2, revcut_rl) |> assumption 2 |> Sequence.hd |> 
9b02474744ca Provers/classical: now takes theorem "classical" as argument, proves "swap"
lcp
parents: 469
diff changeset
   153
                  rule_by_tactic (TRYALL (etac revcut_rl));
0
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   154
1073
b3f190995bc9 Recoded addSIs, etc., so that nets are built incrementally
lcp
parents: 1010
diff changeset
   155
1800
3d9d2ef0cd3b Now implements delrules
paulson
parents: 1724
diff changeset
   156
(**** Classical rule sets ****)
0
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   157
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   158
type netpair = (int*(bool*thm)) Net.net * (int*(bool*thm)) Net.net;
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   159
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   160
datatype claset =
982
4fe0b642b7d5 Addition of wrappers for integration with the simplifier.
lcp
parents: 747
diff changeset
   161
  CS of {safeIs		: thm list,		(*safe introduction rules*)
4fe0b642b7d5 Addition of wrappers for integration with the simplifier.
lcp
parents: 747
diff changeset
   162
	 safeEs		: thm list,		(*safe elimination rules*)
4fe0b642b7d5 Addition of wrappers for integration with the simplifier.
lcp
parents: 747
diff changeset
   163
	 hazIs		: thm list,		(*unsafe introduction rules*)
4fe0b642b7d5 Addition of wrappers for integration with the simplifier.
lcp
parents: 747
diff changeset
   164
	 hazEs		: thm list,		(*unsafe elimination rules*)
2630
7a962f6829ca moved THEN_MAYBE to Pure/tctical.ML
oheimb
parents: 2173
diff changeset
   165
	 uwrapper	: (int -> tactic) ->
7a962f6829ca moved THEN_MAYBE to Pure/tctical.ML
oheimb
parents: 2173
diff changeset
   166
			  (int -> tactic),	(*for transforming step_tac*)
7a962f6829ca moved THEN_MAYBE to Pure/tctical.ML
oheimb
parents: 2173
diff changeset
   167
	 swrapper	: (int -> tactic) ->
7a962f6829ca moved THEN_MAYBE to Pure/tctical.ML
oheimb
parents: 2173
diff changeset
   168
			  (int -> tactic),	(*for transform. safe_step_tac*)
982
4fe0b642b7d5 Addition of wrappers for integration with the simplifier.
lcp
parents: 747
diff changeset
   169
	 safe0_netpair	: netpair,		(*nets for trivial cases*)
4fe0b642b7d5 Addition of wrappers for integration with the simplifier.
lcp
parents: 747
diff changeset
   170
	 safep_netpair	: netpair,		(*nets for >0 subgoals*)
4fe0b642b7d5 Addition of wrappers for integration with the simplifier.
lcp
parents: 747
diff changeset
   171
	 haz_netpair  	: netpair,		(*nets for unsafe rules*)
4fe0b642b7d5 Addition of wrappers for integration with the simplifier.
lcp
parents: 747
diff changeset
   172
	 dup_netpair	: netpair};		(*nets for duplication*)
0
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   173
1073
b3f190995bc9 Recoded addSIs, etc., so that nets are built incrementally
lcp
parents: 1010
diff changeset
   174
(*Desired invariants are
681
9b02474744ca Provers/classical: now takes theorem "classical" as argument, proves "swap"
lcp
parents: 469
diff changeset
   175
	safe0_netpair = build safe0_brls,
9b02474744ca Provers/classical: now takes theorem "classical" as argument, proves "swap"
lcp
parents: 469
diff changeset
   176
	safep_netpair = build safep_brls,
9b02474744ca Provers/classical: now takes theorem "classical" as argument, proves "swap"
lcp
parents: 469
diff changeset
   177
	haz_netpair = build (joinrules(hazIs, hazEs)),
9b02474744ca Provers/classical: now takes theorem "classical" as argument, proves "swap"
lcp
parents: 469
diff changeset
   178
	dup_netpair = build (joinrules(map dup_intr hazIs, 
9b02474744ca Provers/classical: now takes theorem "classical" as argument, proves "swap"
lcp
parents: 469
diff changeset
   179
				       map dup_elim hazEs))}
1073
b3f190995bc9 Recoded addSIs, etc., so that nets are built incrementally
lcp
parents: 1010
diff changeset
   180
b3f190995bc9 Recoded addSIs, etc., so that nets are built incrementally
lcp
parents: 1010
diff changeset
   181
where build = build_netpair(Net.empty,Net.empty), 
b3f190995bc9 Recoded addSIs, etc., so that nets are built incrementally
lcp
parents: 1010
diff changeset
   182
      safe0_brls contains all brules that solve the subgoal, and
b3f190995bc9 Recoded addSIs, etc., so that nets are built incrementally
lcp
parents: 1010
diff changeset
   183
      safep_brls contains all brules that generate 1 or more new subgoals.
1800
3d9d2ef0cd3b Now implements delrules
paulson
parents: 1724
diff changeset
   184
The theorem lists are largely comments, though they are used in merge_cs.
1073
b3f190995bc9 Recoded addSIs, etc., so that nets are built incrementally
lcp
parents: 1010
diff changeset
   185
Nets must be built incrementally, to save space and time.
b3f190995bc9 Recoded addSIs, etc., so that nets are built incrementally
lcp
parents: 1010
diff changeset
   186
*)
0
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   187
1073
b3f190995bc9 Recoded addSIs, etc., so that nets are built incrementally
lcp
parents: 1010
diff changeset
   188
val empty_cs = 
b3f190995bc9 Recoded addSIs, etc., so that nets are built incrementally
lcp
parents: 1010
diff changeset
   189
  CS{safeIs	= [],
b3f190995bc9 Recoded addSIs, etc., so that nets are built incrementally
lcp
parents: 1010
diff changeset
   190
     safeEs	= [],
b3f190995bc9 Recoded addSIs, etc., so that nets are built incrementally
lcp
parents: 1010
diff changeset
   191
     hazIs	= [],
b3f190995bc9 Recoded addSIs, etc., so that nets are built incrementally
lcp
parents: 1010
diff changeset
   192
     hazEs	= [],
2630
7a962f6829ca moved THEN_MAYBE to Pure/tctical.ML
oheimb
parents: 2173
diff changeset
   193
     uwrapper   = I,
7a962f6829ca moved THEN_MAYBE to Pure/tctical.ML
oheimb
parents: 2173
diff changeset
   194
     swrapper   = I,
1073
b3f190995bc9 Recoded addSIs, etc., so that nets are built incrementally
lcp
parents: 1010
diff changeset
   195
     safe0_netpair = (Net.empty,Net.empty),
b3f190995bc9 Recoded addSIs, etc., so that nets are built incrementally
lcp
parents: 1010
diff changeset
   196
     safep_netpair = (Net.empty,Net.empty),
b3f190995bc9 Recoded addSIs, etc., so that nets are built incrementally
lcp
parents: 1010
diff changeset
   197
     haz_netpair   = (Net.empty,Net.empty),
b3f190995bc9 Recoded addSIs, etc., so that nets are built incrementally
lcp
parents: 1010
diff changeset
   198
     dup_netpair   = (Net.empty,Net.empty)};
0
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   199
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   200
fun print_cs (CS{safeIs,safeEs,hazIs,hazEs,...}) =
1073
b3f190995bc9 Recoded addSIs, etc., so that nets are built incrementally
lcp
parents: 1010
diff changeset
   201
 (writeln"Introduction rules";  	prths hazIs;
b3f190995bc9 Recoded addSIs, etc., so that nets are built incrementally
lcp
parents: 1010
diff changeset
   202
  writeln"Safe introduction rules";  	prths safeIs;
b3f190995bc9 Recoded addSIs, etc., so that nets are built incrementally
lcp
parents: 1010
diff changeset
   203
  writeln"Elimination rules";  		prths hazEs;
b3f190995bc9 Recoded addSIs, etc., so that nets are built incrementally
lcp
parents: 1010
diff changeset
   204
  writeln"Safe elimination rules";  	prths safeEs;
0
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   205
  ());
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   206
1073
b3f190995bc9 Recoded addSIs, etc., so that nets are built incrementally
lcp
parents: 1010
diff changeset
   207
fun rep_claset (CS args) = args;
b3f190995bc9 Recoded addSIs, etc., so that nets are built incrementally
lcp
parents: 1010
diff changeset
   208
2630
7a962f6829ca moved THEN_MAYBE to Pure/tctical.ML
oheimb
parents: 2173
diff changeset
   209
fun getWrapper  (CS{uwrapper,...}) = uwrapper;
7a962f6829ca moved THEN_MAYBE to Pure/tctical.ML
oheimb
parents: 2173
diff changeset
   210
7a962f6829ca moved THEN_MAYBE to Pure/tctical.ML
oheimb
parents: 2173
diff changeset
   211
fun getSWrapper (CS{swrapper,...}) = swrapper;
1073
b3f190995bc9 Recoded addSIs, etc., so that nets are built incrementally
lcp
parents: 1010
diff changeset
   212
b3f190995bc9 Recoded addSIs, etc., so that nets are built incrementally
lcp
parents: 1010
diff changeset
   213
1800
3d9d2ef0cd3b Now implements delrules
paulson
parents: 1724
diff changeset
   214
(*** Adding (un)safe introduction or elimination rules.
1073
b3f190995bc9 Recoded addSIs, etc., so that nets are built incrementally
lcp
parents: 1010
diff changeset
   215
b3f190995bc9 Recoded addSIs, etc., so that nets are built incrementally
lcp
parents: 1010
diff changeset
   216
    In case of overlap, new rules are tried BEFORE old ones!!
1800
3d9d2ef0cd3b Now implements delrules
paulson
parents: 1724
diff changeset
   217
***)
0
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   218
1073
b3f190995bc9 Recoded addSIs, etc., so that nets are built incrementally
lcp
parents: 1010
diff changeset
   219
(*For use with biresolve_tac.  Combines intr rules with swap to handle negated
b3f190995bc9 Recoded addSIs, etc., so that nets are built incrementally
lcp
parents: 1010
diff changeset
   220
  assumptions.  Pairs elim rules with true. *)
b3f190995bc9 Recoded addSIs, etc., so that nets are built incrementally
lcp
parents: 1010
diff changeset
   221
fun joinrules (intrs,elims) =  
b3f190995bc9 Recoded addSIs, etc., so that nets are built incrementally
lcp
parents: 1010
diff changeset
   222
    (map (pair true) (elims @ swapify intrs)  @
b3f190995bc9 Recoded addSIs, etc., so that nets are built incrementally
lcp
parents: 1010
diff changeset
   223
     map (pair false) intrs);
b3f190995bc9 Recoded addSIs, etc., so that nets are built incrementally
lcp
parents: 1010
diff changeset
   224
b3f190995bc9 Recoded addSIs, etc., so that nets are built incrementally
lcp
parents: 1010
diff changeset
   225
(*Priority: prefer rules with fewest subgoals, 
1231
91d2c1bb5803 clarified comment
paulson
parents: 1073
diff changeset
   226
  then rules added most recently (preferring the head of the list).*)
1073
b3f190995bc9 Recoded addSIs, etc., so that nets are built incrementally
lcp
parents: 1010
diff changeset
   227
fun tag_brls k [] = []
b3f190995bc9 Recoded addSIs, etc., so that nets are built incrementally
lcp
parents: 1010
diff changeset
   228
  | tag_brls k (brl::brls) =
b3f190995bc9 Recoded addSIs, etc., so that nets are built incrementally
lcp
parents: 1010
diff changeset
   229
      (1000000*subgoals_of_brl brl + k, brl) :: 
b3f190995bc9 Recoded addSIs, etc., so that nets are built incrementally
lcp
parents: 1010
diff changeset
   230
      tag_brls (k+1) brls;
b3f190995bc9 Recoded addSIs, etc., so that nets are built incrementally
lcp
parents: 1010
diff changeset
   231
1800
3d9d2ef0cd3b Now implements delrules
paulson
parents: 1724
diff changeset
   232
fun insert_tagged_list kbrls netpr = foldr insert_tagged_brl (kbrls, netpr);
1073
b3f190995bc9 Recoded addSIs, etc., so that nets are built incrementally
lcp
parents: 1010
diff changeset
   233
b3f190995bc9 Recoded addSIs, etc., so that nets are built incrementally
lcp
parents: 1010
diff changeset
   234
(*Insert into netpair that already has nI intr rules and nE elim rules.
b3f190995bc9 Recoded addSIs, etc., so that nets are built incrementally
lcp
parents: 1010
diff changeset
   235
  Count the intr rules double (to account for swapify).  Negate to give the
b3f190995bc9 Recoded addSIs, etc., so that nets are built incrementally
lcp
parents: 1010
diff changeset
   236
  new insertions the lowest priority.*)
b3f190995bc9 Recoded addSIs, etc., so that nets are built incrementally
lcp
parents: 1010
diff changeset
   237
fun insert (nI,nE) = insert_tagged_list o (tag_brls (~(2*nI+nE))) o joinrules;
b3f190995bc9 Recoded addSIs, etc., so that nets are built incrementally
lcp
parents: 1010
diff changeset
   238
1800
3d9d2ef0cd3b Now implements delrules
paulson
parents: 1724
diff changeset
   239
fun delete_tagged_list brls netpr = foldr delete_tagged_brl (brls, netpr);
1073
b3f190995bc9 Recoded addSIs, etc., so that nets are built incrementally
lcp
parents: 1010
diff changeset
   240
1800
3d9d2ef0cd3b Now implements delrules
paulson
parents: 1724
diff changeset
   241
val delete = delete_tagged_list o joinrules;
3d9d2ef0cd3b Now implements delrules
paulson
parents: 1724
diff changeset
   242
1927
6f97cb16e453 New classical reasoner: warns of, and ignores, redundant rules.
paulson
parents: 1814
diff changeset
   243
(*Warn if the rule is already present ELSEWHERE in the claset.  The addition
6f97cb16e453 New classical reasoner: warns of, and ignores, redundant rules.
paulson
parents: 1814
diff changeset
   244
  is still allowed.*)
6f97cb16e453 New classical reasoner: warns of, and ignores, redundant rules.
paulson
parents: 1814
diff changeset
   245
fun warn_dup th (CS{safeIs, safeEs, hazIs, hazEs, ...}) = 
6f97cb16e453 New classical reasoner: warns of, and ignores, redundant rules.
paulson
parents: 1814
diff changeset
   246
       if gen_mem eq_thm (th, safeIs) then 
6f97cb16e453 New classical reasoner: warns of, and ignores, redundant rules.
paulson
parents: 1814
diff changeset
   247
	 warning ("rule already in claset as Safe Intr\n" ^ string_of_thm th)
6f97cb16e453 New classical reasoner: warns of, and ignores, redundant rules.
paulson
parents: 1814
diff changeset
   248
  else if gen_mem eq_thm (th, safeEs) then
6f97cb16e453 New classical reasoner: warns of, and ignores, redundant rules.
paulson
parents: 1814
diff changeset
   249
         warning ("rule already in claset as Safe Elim\n" ^ string_of_thm th)
6f97cb16e453 New classical reasoner: warns of, and ignores, redundant rules.
paulson
parents: 1814
diff changeset
   250
  else if gen_mem eq_thm (th, hazIs) then 
6f97cb16e453 New classical reasoner: warns of, and ignores, redundant rules.
paulson
parents: 1814
diff changeset
   251
         warning ("rule already in claset as unsafe Intr\n" ^ string_of_thm th)
6f97cb16e453 New classical reasoner: warns of, and ignores, redundant rules.
paulson
parents: 1814
diff changeset
   252
  else if gen_mem eq_thm (th, hazEs) then 
6f97cb16e453 New classical reasoner: warns of, and ignores, redundant rules.
paulson
parents: 1814
diff changeset
   253
         warning ("rule already in claset as unsafe Elim\n" ^ string_of_thm th)
6f97cb16e453 New classical reasoner: warns of, and ignores, redundant rules.
paulson
parents: 1814
diff changeset
   254
  else ();
6f97cb16e453 New classical reasoner: warns of, and ignores, redundant rules.
paulson
parents: 1814
diff changeset
   255
1800
3d9d2ef0cd3b Now implements delrules
paulson
parents: 1724
diff changeset
   256
(*** Safe rules ***)
982
4fe0b642b7d5 Addition of wrappers for integration with the simplifier.
lcp
parents: 747
diff changeset
   257
2630
7a962f6829ca moved THEN_MAYBE to Pure/tctical.ML
oheimb
parents: 2173
diff changeset
   258
fun addSI (cs as CS{safeIs, safeEs, hazIs, hazEs, uwrapper, swrapper, 
1927
6f97cb16e453 New classical reasoner: warns of, and ignores, redundant rules.
paulson
parents: 1814
diff changeset
   259
	      safe0_netpair, safep_netpair, haz_netpair, dup_netpair},
6f97cb16e453 New classical reasoner: warns of, and ignores, redundant rules.
paulson
parents: 1814
diff changeset
   260
	   th)  =
6f97cb16e453 New classical reasoner: warns of, and ignores, redundant rules.
paulson
parents: 1814
diff changeset
   261
  if gen_mem eq_thm (th, safeIs) then 
6f97cb16e453 New classical reasoner: warns of, and ignores, redundant rules.
paulson
parents: 1814
diff changeset
   262
	 (warning ("ignoring duplicate Safe Intr\n" ^ string_of_thm th);
6f97cb16e453 New classical reasoner: warns of, and ignores, redundant rules.
paulson
parents: 1814
diff changeset
   263
	  cs)
6f97cb16e453 New classical reasoner: warns of, and ignores, redundant rules.
paulson
parents: 1814
diff changeset
   264
  else
1073
b3f190995bc9 Recoded addSIs, etc., so that nets are built incrementally
lcp
parents: 1010
diff changeset
   265
  let val (safe0_rls, safep_rls) = (*0 subgoals vs 1 or more*)
1927
6f97cb16e453 New classical reasoner: warns of, and ignores, redundant rules.
paulson
parents: 1814
diff changeset
   266
          partition (fn rl => nprems_of rl=0) [th]
6f97cb16e453 New classical reasoner: warns of, and ignores, redundant rules.
paulson
parents: 1814
diff changeset
   267
      val nI = length safeIs + 1
1073
b3f190995bc9 Recoded addSIs, etc., so that nets are built incrementally
lcp
parents: 1010
diff changeset
   268
      and nE = length safeEs
1927
6f97cb16e453 New classical reasoner: warns of, and ignores, redundant rules.
paulson
parents: 1814
diff changeset
   269
  in warn_dup th cs;
6f97cb16e453 New classical reasoner: warns of, and ignores, redundant rules.
paulson
parents: 1814
diff changeset
   270
     CS{safeIs	= th::safeIs,
1073
b3f190995bc9 Recoded addSIs, etc., so that nets are built incrementally
lcp
parents: 1010
diff changeset
   271
        safe0_netpair = insert (nI,nE) (safe0_rls, []) safe0_netpair,
b3f190995bc9 Recoded addSIs, etc., so that nets are built incrementally
lcp
parents: 1010
diff changeset
   272
	safep_netpair = insert (nI,nE) (safep_rls, []) safep_netpair,
b3f190995bc9 Recoded addSIs, etc., so that nets are built incrementally
lcp
parents: 1010
diff changeset
   273
	safeEs	= safeEs,
b3f190995bc9 Recoded addSIs, etc., so that nets are built incrementally
lcp
parents: 1010
diff changeset
   274
	hazIs	= hazIs,
b3f190995bc9 Recoded addSIs, etc., so that nets are built incrementally
lcp
parents: 1010
diff changeset
   275
	hazEs	= hazEs,
2630
7a962f6829ca moved THEN_MAYBE to Pure/tctical.ML
oheimb
parents: 2173
diff changeset
   276
	uwrapper     = uwrapper,
7a962f6829ca moved THEN_MAYBE to Pure/tctical.ML
oheimb
parents: 2173
diff changeset
   277
	swrapper     = swrapper,
7a962f6829ca moved THEN_MAYBE to Pure/tctical.ML
oheimb
parents: 2173
diff changeset
   278
	haz_netpair  = haz_netpair,
7a962f6829ca moved THEN_MAYBE to Pure/tctical.ML
oheimb
parents: 2173
diff changeset
   279
	dup_netpair  = dup_netpair}
1073
b3f190995bc9 Recoded addSIs, etc., so that nets are built incrementally
lcp
parents: 1010
diff changeset
   280
  end;
b3f190995bc9 Recoded addSIs, etc., so that nets are built incrementally
lcp
parents: 1010
diff changeset
   281
2630
7a962f6829ca moved THEN_MAYBE to Pure/tctical.ML
oheimb
parents: 2173
diff changeset
   282
fun addSE (cs as CS{safeIs, safeEs, hazIs, hazEs, uwrapper, swrapper, 
1927
6f97cb16e453 New classical reasoner: warns of, and ignores, redundant rules.
paulson
parents: 1814
diff changeset
   283
		    safe0_netpair, safep_netpair, haz_netpair, dup_netpair},
6f97cb16e453 New classical reasoner: warns of, and ignores, redundant rules.
paulson
parents: 1814
diff changeset
   284
	   th)  =
6f97cb16e453 New classical reasoner: warns of, and ignores, redundant rules.
paulson
parents: 1814
diff changeset
   285
  if gen_mem eq_thm (th, safeEs) then 
6f97cb16e453 New classical reasoner: warns of, and ignores, redundant rules.
paulson
parents: 1814
diff changeset
   286
	 (warning ("ignoring duplicate Safe Elim\n" ^ string_of_thm th);
6f97cb16e453 New classical reasoner: warns of, and ignores, redundant rules.
paulson
parents: 1814
diff changeset
   287
	  cs)
6f97cb16e453 New classical reasoner: warns of, and ignores, redundant rules.
paulson
parents: 1814
diff changeset
   288
  else
1073
b3f190995bc9 Recoded addSIs, etc., so that nets are built incrementally
lcp
parents: 1010
diff changeset
   289
  let val (safe0_rls, safep_rls) = (*0 subgoals vs 1 or more*)
1927
6f97cb16e453 New classical reasoner: warns of, and ignores, redundant rules.
paulson
parents: 1814
diff changeset
   290
          partition (fn rl => nprems_of rl=1) [th]
1073
b3f190995bc9 Recoded addSIs, etc., so that nets are built incrementally
lcp
parents: 1010
diff changeset
   291
      val nI = length safeIs
1927
6f97cb16e453 New classical reasoner: warns of, and ignores, redundant rules.
paulson
parents: 1814
diff changeset
   292
      and nE = length safeEs + 1
6f97cb16e453 New classical reasoner: warns of, and ignores, redundant rules.
paulson
parents: 1814
diff changeset
   293
  in warn_dup th cs;
6f97cb16e453 New classical reasoner: warns of, and ignores, redundant rules.
paulson
parents: 1814
diff changeset
   294
     CS{safeEs	= th::safeEs,
1073
b3f190995bc9 Recoded addSIs, etc., so that nets are built incrementally
lcp
parents: 1010
diff changeset
   295
        safe0_netpair = insert (nI,nE) ([], safe0_rls) safe0_netpair,
b3f190995bc9 Recoded addSIs, etc., so that nets are built incrementally
lcp
parents: 1010
diff changeset
   296
	safep_netpair = insert (nI,nE) ([], safep_rls) safep_netpair,
b3f190995bc9 Recoded addSIs, etc., so that nets are built incrementally
lcp
parents: 1010
diff changeset
   297
	safeIs	= safeIs,
b3f190995bc9 Recoded addSIs, etc., so that nets are built incrementally
lcp
parents: 1010
diff changeset
   298
	hazIs	= hazIs,
b3f190995bc9 Recoded addSIs, etc., so that nets are built incrementally
lcp
parents: 1010
diff changeset
   299
	hazEs	= hazEs,
2630
7a962f6829ca moved THEN_MAYBE to Pure/tctical.ML
oheimb
parents: 2173
diff changeset
   300
	uwrapper     = uwrapper,
7a962f6829ca moved THEN_MAYBE to Pure/tctical.ML
oheimb
parents: 2173
diff changeset
   301
	swrapper     = swrapper,
7a962f6829ca moved THEN_MAYBE to Pure/tctical.ML
oheimb
parents: 2173
diff changeset
   302
	haz_netpair  = haz_netpair,
7a962f6829ca moved THEN_MAYBE to Pure/tctical.ML
oheimb
parents: 2173
diff changeset
   303
	dup_netpair  = dup_netpair}
1073
b3f190995bc9 Recoded addSIs, etc., so that nets are built incrementally
lcp
parents: 1010
diff changeset
   304
  end;
0
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   305
1927
6f97cb16e453 New classical reasoner: warns of, and ignores, redundant rules.
paulson
parents: 1814
diff changeset
   306
fun rev_foldl f (e, l) = foldl f (e, rev l);
6f97cb16e453 New classical reasoner: warns of, and ignores, redundant rules.
paulson
parents: 1814
diff changeset
   307
6f97cb16e453 New classical reasoner: warns of, and ignores, redundant rules.
paulson
parents: 1814
diff changeset
   308
val op addSIs = rev_foldl addSI;
6f97cb16e453 New classical reasoner: warns of, and ignores, redundant rules.
paulson
parents: 1814
diff changeset
   309
val op addSEs = rev_foldl addSE;
6f97cb16e453 New classical reasoner: warns of, and ignores, redundant rules.
paulson
parents: 1814
diff changeset
   310
0
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   311
fun cs addSDs ths = cs addSEs (map make_elim ths);
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   312
1073
b3f190995bc9 Recoded addSIs, etc., so that nets are built incrementally
lcp
parents: 1010
diff changeset
   313
1800
3d9d2ef0cd3b Now implements delrules
paulson
parents: 1724
diff changeset
   314
(*** Hazardous (unsafe) rules ***)
0
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   315
2630
7a962f6829ca moved THEN_MAYBE to Pure/tctical.ML
oheimb
parents: 2173
diff changeset
   316
fun addI (cs as CS{safeIs, safeEs, hazIs, hazEs, uwrapper, swrapper, 
1927
6f97cb16e453 New classical reasoner: warns of, and ignores, redundant rules.
paulson
parents: 1814
diff changeset
   317
		   safe0_netpair, safep_netpair, haz_netpair, dup_netpair},
6f97cb16e453 New classical reasoner: warns of, and ignores, redundant rules.
paulson
parents: 1814
diff changeset
   318
	  th)=
6f97cb16e453 New classical reasoner: warns of, and ignores, redundant rules.
paulson
parents: 1814
diff changeset
   319
  if gen_mem eq_thm (th, hazIs) then 
6f97cb16e453 New classical reasoner: warns of, and ignores, redundant rules.
paulson
parents: 1814
diff changeset
   320
	 (warning ("ignoring duplicate unsafe Intr\n" ^ string_of_thm th);
6f97cb16e453 New classical reasoner: warns of, and ignores, redundant rules.
paulson
parents: 1814
diff changeset
   321
	  cs)
6f97cb16e453 New classical reasoner: warns of, and ignores, redundant rules.
paulson
parents: 1814
diff changeset
   322
  else
6f97cb16e453 New classical reasoner: warns of, and ignores, redundant rules.
paulson
parents: 1814
diff changeset
   323
  let val nI = length hazIs + 1
1073
b3f190995bc9 Recoded addSIs, etc., so that nets are built incrementally
lcp
parents: 1010
diff changeset
   324
      and nE = length hazEs
1927
6f97cb16e453 New classical reasoner: warns of, and ignores, redundant rules.
paulson
parents: 1814
diff changeset
   325
  in warn_dup th cs;
6f97cb16e453 New classical reasoner: warns of, and ignores, redundant rules.
paulson
parents: 1814
diff changeset
   326
     CS{hazIs	= th::hazIs,
6f97cb16e453 New classical reasoner: warns of, and ignores, redundant rules.
paulson
parents: 1814
diff changeset
   327
	haz_netpair = insert (nI,nE) ([th], []) haz_netpair,
6f97cb16e453 New classical reasoner: warns of, and ignores, redundant rules.
paulson
parents: 1814
diff changeset
   328
	dup_netpair = insert (nI,nE) (map dup_intr [th], []) dup_netpair,
1073
b3f190995bc9 Recoded addSIs, etc., so that nets are built incrementally
lcp
parents: 1010
diff changeset
   329
	safeIs 	= safeIs, 
b3f190995bc9 Recoded addSIs, etc., so that nets are built incrementally
lcp
parents: 1010
diff changeset
   330
	safeEs	= safeEs,
b3f190995bc9 Recoded addSIs, etc., so that nets are built incrementally
lcp
parents: 1010
diff changeset
   331
	hazEs	= hazEs,
2630
7a962f6829ca moved THEN_MAYBE to Pure/tctical.ML
oheimb
parents: 2173
diff changeset
   332
	uwrapper      = uwrapper,
7a962f6829ca moved THEN_MAYBE to Pure/tctical.ML
oheimb
parents: 2173
diff changeset
   333
	swrapper      = swrapper,
1073
b3f190995bc9 Recoded addSIs, etc., so that nets are built incrementally
lcp
parents: 1010
diff changeset
   334
	safe0_netpair = safe0_netpair,
b3f190995bc9 Recoded addSIs, etc., so that nets are built incrementally
lcp
parents: 1010
diff changeset
   335
	safep_netpair = safep_netpair}
b3f190995bc9 Recoded addSIs, etc., so that nets are built incrementally
lcp
parents: 1010
diff changeset
   336
  end;
b3f190995bc9 Recoded addSIs, etc., so that nets are built incrementally
lcp
parents: 1010
diff changeset
   337
2630
7a962f6829ca moved THEN_MAYBE to Pure/tctical.ML
oheimb
parents: 2173
diff changeset
   338
fun addE (cs as CS{safeIs, safeEs, hazIs, hazEs, uwrapper, swrapper, 
1927
6f97cb16e453 New classical reasoner: warns of, and ignores, redundant rules.
paulson
parents: 1814
diff changeset
   339
		   safe0_netpair, safep_netpair, haz_netpair, dup_netpair},
6f97cb16e453 New classical reasoner: warns of, and ignores, redundant rules.
paulson
parents: 1814
diff changeset
   340
	  th) =
6f97cb16e453 New classical reasoner: warns of, and ignores, redundant rules.
paulson
parents: 1814
diff changeset
   341
  if gen_mem eq_thm (th, hazEs) then 
6f97cb16e453 New classical reasoner: warns of, and ignores, redundant rules.
paulson
parents: 1814
diff changeset
   342
	 (warning ("ignoring duplicate unsafe Elim\n" ^ string_of_thm th);
6f97cb16e453 New classical reasoner: warns of, and ignores, redundant rules.
paulson
parents: 1814
diff changeset
   343
	  cs)
6f97cb16e453 New classical reasoner: warns of, and ignores, redundant rules.
paulson
parents: 1814
diff changeset
   344
  else
1073
b3f190995bc9 Recoded addSIs, etc., so that nets are built incrementally
lcp
parents: 1010
diff changeset
   345
  let val nI = length hazIs 
1927
6f97cb16e453 New classical reasoner: warns of, and ignores, redundant rules.
paulson
parents: 1814
diff changeset
   346
      and nE = length hazEs + 1
6f97cb16e453 New classical reasoner: warns of, and ignores, redundant rules.
paulson
parents: 1814
diff changeset
   347
  in warn_dup th cs;
6f97cb16e453 New classical reasoner: warns of, and ignores, redundant rules.
paulson
parents: 1814
diff changeset
   348
     CS{hazEs	= th::hazEs,
6f97cb16e453 New classical reasoner: warns of, and ignores, redundant rules.
paulson
parents: 1814
diff changeset
   349
	haz_netpair = insert (nI,nE) ([], [th]) haz_netpair,
6f97cb16e453 New classical reasoner: warns of, and ignores, redundant rules.
paulson
parents: 1814
diff changeset
   350
	dup_netpair = insert (nI,nE) ([], map dup_elim [th]) dup_netpair,
1073
b3f190995bc9 Recoded addSIs, etc., so that nets are built incrementally
lcp
parents: 1010
diff changeset
   351
	safeIs	= safeIs, 
b3f190995bc9 Recoded addSIs, etc., so that nets are built incrementally
lcp
parents: 1010
diff changeset
   352
	safeEs	= safeEs,
b3f190995bc9 Recoded addSIs, etc., so that nets are built incrementally
lcp
parents: 1010
diff changeset
   353
	hazIs	= hazIs,
2630
7a962f6829ca moved THEN_MAYBE to Pure/tctical.ML
oheimb
parents: 2173
diff changeset
   354
	uwrapper      = uwrapper,
7a962f6829ca moved THEN_MAYBE to Pure/tctical.ML
oheimb
parents: 2173
diff changeset
   355
	swrapper      = swrapper,
1073
b3f190995bc9 Recoded addSIs, etc., so that nets are built incrementally
lcp
parents: 1010
diff changeset
   356
	safe0_netpair = safe0_netpair,
b3f190995bc9 Recoded addSIs, etc., so that nets are built incrementally
lcp
parents: 1010
diff changeset
   357
	safep_netpair = safep_netpair}
b3f190995bc9 Recoded addSIs, etc., so that nets are built incrementally
lcp
parents: 1010
diff changeset
   358
  end;
0
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   359
1927
6f97cb16e453 New classical reasoner: warns of, and ignores, redundant rules.
paulson
parents: 1814
diff changeset
   360
val op addIs = rev_foldl addI;
6f97cb16e453 New classical reasoner: warns of, and ignores, redundant rules.
paulson
parents: 1814
diff changeset
   361
val op addEs = rev_foldl addE;
6f97cb16e453 New classical reasoner: warns of, and ignores, redundant rules.
paulson
parents: 1814
diff changeset
   362
0
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   363
fun cs addDs ths = cs addEs (map make_elim ths);
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   364
1073
b3f190995bc9 Recoded addSIs, etc., so that nets are built incrementally
lcp
parents: 1010
diff changeset
   365
1800
3d9d2ef0cd3b Now implements delrules
paulson
parents: 1724
diff changeset
   366
(*** Deletion of rules 
3d9d2ef0cd3b Now implements delrules
paulson
parents: 1724
diff changeset
   367
     Working out what to delete, requires repeating much of the code used
3d9d2ef0cd3b Now implements delrules
paulson
parents: 1724
diff changeset
   368
	to insert.
1927
6f97cb16e453 New classical reasoner: warns of, and ignores, redundant rules.
paulson
parents: 1814
diff changeset
   369
     Separate functions delSI, etc., are not exported; instead delrules
1800
3d9d2ef0cd3b Now implements delrules
paulson
parents: 1724
diff changeset
   370
        searches in all the lists and chooses the relevant delXX function.
3d9d2ef0cd3b Now implements delrules
paulson
parents: 1724
diff changeset
   371
***)
3d9d2ef0cd3b Now implements delrules
paulson
parents: 1724
diff changeset
   372
2630
7a962f6829ca moved THEN_MAYBE to Pure/tctical.ML
oheimb
parents: 2173
diff changeset
   373
fun delSI (CS{safeIs, safeEs, hazIs, hazEs, uwrapper, swrapper, 
1800
3d9d2ef0cd3b Now implements delrules
paulson
parents: 1724
diff changeset
   374
               safe0_netpair, safep_netpair, haz_netpair, dup_netpair},
3d9d2ef0cd3b Now implements delrules
paulson
parents: 1724
diff changeset
   375
            th) =
3d9d2ef0cd3b Now implements delrules
paulson
parents: 1724
diff changeset
   376
  let val (safe0_rls, safep_rls) = partition (fn rl => nprems_of rl=0) [th]
3d9d2ef0cd3b Now implements delrules
paulson
parents: 1724
diff changeset
   377
  in CS{safeIs	= gen_rem eq_thm (safeIs,th),
3d9d2ef0cd3b Now implements delrules
paulson
parents: 1724
diff changeset
   378
        safe0_netpair = delete (safe0_rls, []) safe0_netpair,
3d9d2ef0cd3b Now implements delrules
paulson
parents: 1724
diff changeset
   379
	safep_netpair = delete (safep_rls, []) safep_netpair,
3d9d2ef0cd3b Now implements delrules
paulson
parents: 1724
diff changeset
   380
	safeEs	= safeEs,
3d9d2ef0cd3b Now implements delrules
paulson
parents: 1724
diff changeset
   381
	hazIs	= hazIs,
3d9d2ef0cd3b Now implements delrules
paulson
parents: 1724
diff changeset
   382
	hazEs	= hazEs,
2630
7a962f6829ca moved THEN_MAYBE to Pure/tctical.ML
oheimb
parents: 2173
diff changeset
   383
	uwrapper     = uwrapper,
7a962f6829ca moved THEN_MAYBE to Pure/tctical.ML
oheimb
parents: 2173
diff changeset
   384
	swrapper     = swrapper,
7a962f6829ca moved THEN_MAYBE to Pure/tctical.ML
oheimb
parents: 2173
diff changeset
   385
	haz_netpair  = haz_netpair,
7a962f6829ca moved THEN_MAYBE to Pure/tctical.ML
oheimb
parents: 2173
diff changeset
   386
	dup_netpair  = dup_netpair}
1800
3d9d2ef0cd3b Now implements delrules
paulson
parents: 1724
diff changeset
   387
  end;
3d9d2ef0cd3b Now implements delrules
paulson
parents: 1724
diff changeset
   388
2630
7a962f6829ca moved THEN_MAYBE to Pure/tctical.ML
oheimb
parents: 2173
diff changeset
   389
fun delSE (CS{safeIs, safeEs, hazIs, hazEs, uwrapper, swrapper, 
1800
3d9d2ef0cd3b Now implements delrules
paulson
parents: 1724
diff changeset
   390
	       safe0_netpair, safep_netpair, haz_netpair, dup_netpair},
3d9d2ef0cd3b Now implements delrules
paulson
parents: 1724
diff changeset
   391
            th) =
3d9d2ef0cd3b Now implements delrules
paulson
parents: 1724
diff changeset
   392
  let val (safe0_rls, safep_rls) = partition (fn rl => nprems_of rl=1) [th]
3d9d2ef0cd3b Now implements delrules
paulson
parents: 1724
diff changeset
   393
  in CS{safeEs	= gen_rem eq_thm (safeEs,th),
3d9d2ef0cd3b Now implements delrules
paulson
parents: 1724
diff changeset
   394
        safe0_netpair = delete ([], safe0_rls) safe0_netpair,
3d9d2ef0cd3b Now implements delrules
paulson
parents: 1724
diff changeset
   395
	safep_netpair = delete ([], safep_rls) safep_netpair,
3d9d2ef0cd3b Now implements delrules
paulson
parents: 1724
diff changeset
   396
	safeIs	= safeIs,
3d9d2ef0cd3b Now implements delrules
paulson
parents: 1724
diff changeset
   397
	hazIs	= hazIs,
3d9d2ef0cd3b Now implements delrules
paulson
parents: 1724
diff changeset
   398
	hazEs	= hazEs,
2630
7a962f6829ca moved THEN_MAYBE to Pure/tctical.ML
oheimb
parents: 2173
diff changeset
   399
	uwrapper     = uwrapper,
7a962f6829ca moved THEN_MAYBE to Pure/tctical.ML
oheimb
parents: 2173
diff changeset
   400
	swrapper     = swrapper,
7a962f6829ca moved THEN_MAYBE to Pure/tctical.ML
oheimb
parents: 2173
diff changeset
   401
	haz_netpair  = haz_netpair,
7a962f6829ca moved THEN_MAYBE to Pure/tctical.ML
oheimb
parents: 2173
diff changeset
   402
	dup_netpair  = dup_netpair}
1800
3d9d2ef0cd3b Now implements delrules
paulson
parents: 1724
diff changeset
   403
  end;
3d9d2ef0cd3b Now implements delrules
paulson
parents: 1724
diff changeset
   404
3d9d2ef0cd3b Now implements delrules
paulson
parents: 1724
diff changeset
   405
2630
7a962f6829ca moved THEN_MAYBE to Pure/tctical.ML
oheimb
parents: 2173
diff changeset
   406
fun delI (CS{safeIs, safeEs, hazIs, hazEs, uwrapper, swrapper, 
1800
3d9d2ef0cd3b Now implements delrules
paulson
parents: 1724
diff changeset
   407
	      safe0_netpair, safep_netpair, haz_netpair, dup_netpair},
3d9d2ef0cd3b Now implements delrules
paulson
parents: 1724
diff changeset
   408
	   th) =
3d9d2ef0cd3b Now implements delrules
paulson
parents: 1724
diff changeset
   409
     CS{hazIs	= gen_rem eq_thm (hazIs,th),
3d9d2ef0cd3b Now implements delrules
paulson
parents: 1724
diff changeset
   410
	haz_netpair = delete ([th], []) haz_netpair,
3d9d2ef0cd3b Now implements delrules
paulson
parents: 1724
diff changeset
   411
	dup_netpair = delete ([dup_intr th], []) dup_netpair,
3d9d2ef0cd3b Now implements delrules
paulson
parents: 1724
diff changeset
   412
	safeIs 	= safeIs, 
3d9d2ef0cd3b Now implements delrules
paulson
parents: 1724
diff changeset
   413
	safeEs	= safeEs,
3d9d2ef0cd3b Now implements delrules
paulson
parents: 1724
diff changeset
   414
	hazEs	= hazEs,
2630
7a962f6829ca moved THEN_MAYBE to Pure/tctical.ML
oheimb
parents: 2173
diff changeset
   415
	uwrapper      = uwrapper,
7a962f6829ca moved THEN_MAYBE to Pure/tctical.ML
oheimb
parents: 2173
diff changeset
   416
	swrapper      = swrapper,
1800
3d9d2ef0cd3b Now implements delrules
paulson
parents: 1724
diff changeset
   417
	safe0_netpair = safe0_netpair,
3d9d2ef0cd3b Now implements delrules
paulson
parents: 1724
diff changeset
   418
	safep_netpair = safep_netpair};
3d9d2ef0cd3b Now implements delrules
paulson
parents: 1724
diff changeset
   419
2630
7a962f6829ca moved THEN_MAYBE to Pure/tctical.ML
oheimb
parents: 2173
diff changeset
   420
fun delE (CS{safeIs, safeEs, hazIs, hazEs, uwrapper, swrapper, 
1800
3d9d2ef0cd3b Now implements delrules
paulson
parents: 1724
diff changeset
   421
	      safe0_netpair, safep_netpair, haz_netpair, dup_netpair},
3d9d2ef0cd3b Now implements delrules
paulson
parents: 1724
diff changeset
   422
	   th) =
3d9d2ef0cd3b Now implements delrules
paulson
parents: 1724
diff changeset
   423
     CS{hazEs	= gen_rem eq_thm (hazEs,th),
3d9d2ef0cd3b Now implements delrules
paulson
parents: 1724
diff changeset
   424
	haz_netpair = delete ([], [th]) haz_netpair,
3d9d2ef0cd3b Now implements delrules
paulson
parents: 1724
diff changeset
   425
	dup_netpair = delete ([], [dup_elim th]) dup_netpair,
3d9d2ef0cd3b Now implements delrules
paulson
parents: 1724
diff changeset
   426
	safeIs	= safeIs, 
3d9d2ef0cd3b Now implements delrules
paulson
parents: 1724
diff changeset
   427
	safeEs	= safeEs,
3d9d2ef0cd3b Now implements delrules
paulson
parents: 1724
diff changeset
   428
	hazIs	= hazIs,
2630
7a962f6829ca moved THEN_MAYBE to Pure/tctical.ML
oheimb
parents: 2173
diff changeset
   429
	uwrapper      = uwrapper,
7a962f6829ca moved THEN_MAYBE to Pure/tctical.ML
oheimb
parents: 2173
diff changeset
   430
	swrapper      = swrapper,
1800
3d9d2ef0cd3b Now implements delrules
paulson
parents: 1724
diff changeset
   431
	safe0_netpair = safe0_netpair,
3d9d2ef0cd3b Now implements delrules
paulson
parents: 1724
diff changeset
   432
	safep_netpair = safep_netpair};
3d9d2ef0cd3b Now implements delrules
paulson
parents: 1724
diff changeset
   433
3d9d2ef0cd3b Now implements delrules
paulson
parents: 1724
diff changeset
   434
fun delrule (cs as CS{safeIs, safeEs, hazIs, hazEs, ...}, th) =
1927
6f97cb16e453 New classical reasoner: warns of, and ignores, redundant rules.
paulson
parents: 1814
diff changeset
   435
       if gen_mem eq_thm (th, safeIs) then delSI(cs,th)
6f97cb16e453 New classical reasoner: warns of, and ignores, redundant rules.
paulson
parents: 1814
diff changeset
   436
  else if gen_mem eq_thm (th, safeEs) then delSE(cs,th)
6f97cb16e453 New classical reasoner: warns of, and ignores, redundant rules.
paulson
parents: 1814
diff changeset
   437
  else if gen_mem eq_thm (th, hazIs) then delI(cs,th)
6f97cb16e453 New classical reasoner: warns of, and ignores, redundant rules.
paulson
parents: 1814
diff changeset
   438
  else if gen_mem eq_thm (th, hazEs) then delE(cs,th)
1800
3d9d2ef0cd3b Now implements delrules
paulson
parents: 1724
diff changeset
   439
  else (warning ("rule not in claset\n" ^ (string_of_thm th)); 
3d9d2ef0cd3b Now implements delrules
paulson
parents: 1724
diff changeset
   440
	cs);
3d9d2ef0cd3b Now implements delrules
paulson
parents: 1724
diff changeset
   441
3d9d2ef0cd3b Now implements delrules
paulson
parents: 1724
diff changeset
   442
val op delrules = foldl delrule;
3d9d2ef0cd3b Now implements delrules
paulson
parents: 1724
diff changeset
   443
3d9d2ef0cd3b Now implements delrules
paulson
parents: 1724
diff changeset
   444
2630
7a962f6829ca moved THEN_MAYBE to Pure/tctical.ML
oheimb
parents: 2173
diff changeset
   445
(*** Setting or modifying the wrapper tacticals ***)
982
4fe0b642b7d5 Addition of wrappers for integration with the simplifier.
lcp
parents: 747
diff changeset
   446
2630
7a962f6829ca moved THEN_MAYBE to Pure/tctical.ML
oheimb
parents: 2173
diff changeset
   447
(*Set a new uwrapper*)
7a962f6829ca moved THEN_MAYBE to Pure/tctical.ML
oheimb
parents: 2173
diff changeset
   448
fun (CS{safeIs, safeEs, hazIs, hazEs, uwrapper, swrapper,
1073
b3f190995bc9 Recoded addSIs, etc., so that nets are built incrementally
lcp
parents: 1010
diff changeset
   449
	safe0_netpair, safep_netpair, haz_netpair, dup_netpair, ...}) 
2630
7a962f6829ca moved THEN_MAYBE to Pure/tctical.ML
oheimb
parents: 2173
diff changeset
   450
    setWrapper new_uwrapper  =
7a962f6829ca moved THEN_MAYBE to Pure/tctical.ML
oheimb
parents: 2173
diff changeset
   451
  CS{safeIs	= safeIs,
1073
b3f190995bc9 Recoded addSIs, etc., so that nets are built incrementally
lcp
parents: 1010
diff changeset
   452
     safeEs	= safeEs,
b3f190995bc9 Recoded addSIs, etc., so that nets are built incrementally
lcp
parents: 1010
diff changeset
   453
     hazIs	= hazIs,
b3f190995bc9 Recoded addSIs, etc., so that nets are built incrementally
lcp
parents: 1010
diff changeset
   454
     hazEs	= hazEs,
2630
7a962f6829ca moved THEN_MAYBE to Pure/tctical.ML
oheimb
parents: 2173
diff changeset
   455
     uwrapper 	= new_uwrapper,
7a962f6829ca moved THEN_MAYBE to Pure/tctical.ML
oheimb
parents: 2173
diff changeset
   456
     swrapper   = swrapper,
1073
b3f190995bc9 Recoded addSIs, etc., so that nets are built incrementally
lcp
parents: 1010
diff changeset
   457
     safe0_netpair = safe0_netpair,
b3f190995bc9 Recoded addSIs, etc., so that nets are built incrementally
lcp
parents: 1010
diff changeset
   458
     safep_netpair = safep_netpair,
b3f190995bc9 Recoded addSIs, etc., so that nets are built incrementally
lcp
parents: 1010
diff changeset
   459
     haz_netpair = haz_netpair,
b3f190995bc9 Recoded addSIs, etc., so that nets are built incrementally
lcp
parents: 1010
diff changeset
   460
     dup_netpair = dup_netpair};
982
4fe0b642b7d5 Addition of wrappers for integration with the simplifier.
lcp
parents: 747
diff changeset
   461
2630
7a962f6829ca moved THEN_MAYBE to Pure/tctical.ML
oheimb
parents: 2173
diff changeset
   462
(*Set a new swrapper*)
7a962f6829ca moved THEN_MAYBE to Pure/tctical.ML
oheimb
parents: 2173
diff changeset
   463
fun (CS{safeIs, safeEs, hazIs, hazEs, uwrapper, swrapper,
7a962f6829ca moved THEN_MAYBE to Pure/tctical.ML
oheimb
parents: 2173
diff changeset
   464
	safe0_netpair, safep_netpair, haz_netpair, dup_netpair, ...}) 
7a962f6829ca moved THEN_MAYBE to Pure/tctical.ML
oheimb
parents: 2173
diff changeset
   465
    setSWrapper new_swrapper  =
7a962f6829ca moved THEN_MAYBE to Pure/tctical.ML
oheimb
parents: 2173
diff changeset
   466
  CS{safeIs	= safeIs,
7a962f6829ca moved THEN_MAYBE to Pure/tctical.ML
oheimb
parents: 2173
diff changeset
   467
     safeEs	= safeEs,
7a962f6829ca moved THEN_MAYBE to Pure/tctical.ML
oheimb
parents: 2173
diff changeset
   468
     hazIs	= hazIs,
7a962f6829ca moved THEN_MAYBE to Pure/tctical.ML
oheimb
parents: 2173
diff changeset
   469
     hazEs	= hazEs,
7a962f6829ca moved THEN_MAYBE to Pure/tctical.ML
oheimb
parents: 2173
diff changeset
   470
     uwrapper   = uwrapper,
7a962f6829ca moved THEN_MAYBE to Pure/tctical.ML
oheimb
parents: 2173
diff changeset
   471
     swrapper   = new_swrapper,
7a962f6829ca moved THEN_MAYBE to Pure/tctical.ML
oheimb
parents: 2173
diff changeset
   472
     safe0_netpair = safe0_netpair,
7a962f6829ca moved THEN_MAYBE to Pure/tctical.ML
oheimb
parents: 2173
diff changeset
   473
     safep_netpair = safep_netpair,
7a962f6829ca moved THEN_MAYBE to Pure/tctical.ML
oheimb
parents: 2173
diff changeset
   474
     haz_netpair = haz_netpair,
7a962f6829ca moved THEN_MAYBE to Pure/tctical.ML
oheimb
parents: 2173
diff changeset
   475
     dup_netpair = dup_netpair};
982
4fe0b642b7d5 Addition of wrappers for integration with the simplifier.
lcp
parents: 747
diff changeset
   476
2630
7a962f6829ca moved THEN_MAYBE to Pure/tctical.ML
oheimb
parents: 2173
diff changeset
   477
(*Compose a tactical with the existing uwrapper*)
7a962f6829ca moved THEN_MAYBE to Pure/tctical.ML
oheimb
parents: 2173
diff changeset
   478
fun cs compWrapper  uwrapper' = cs setWrapper  (uwrapper' o getWrapper cs);
7a962f6829ca moved THEN_MAYBE to Pure/tctical.ML
oheimb
parents: 2173
diff changeset
   479
7a962f6829ca moved THEN_MAYBE to Pure/tctical.ML
oheimb
parents: 2173
diff changeset
   480
(*Compose a tactical with the existing swrapper*)
7a962f6829ca moved THEN_MAYBE to Pure/tctical.ML
oheimb
parents: 2173
diff changeset
   481
fun cs compSWrapper swrapper' = cs setSWrapper (swrapper' o getSWrapper cs);
982
4fe0b642b7d5 Addition of wrappers for integration with the simplifier.
lcp
parents: 747
diff changeset
   482
2630
7a962f6829ca moved THEN_MAYBE to Pure/tctical.ML
oheimb
parents: 2173
diff changeset
   483
(*compose a safe tactic sequentially before/alternatively after safe_step_tac*)
7a962f6829ca moved THEN_MAYBE to Pure/tctical.ML
oheimb
parents: 2173
diff changeset
   484
fun cs addSbefore tac1 = cs compSWrapper (fn tac2 => tac1 THEN_MAYBE' tac2);
7a962f6829ca moved THEN_MAYBE to Pure/tctical.ML
oheimb
parents: 2173
diff changeset
   485
fun cs addSaltern tac2 = cs compSWrapper (fn tac1 => tac1 ORELSE'     tac2);
982
4fe0b642b7d5 Addition of wrappers for integration with the simplifier.
lcp
parents: 747
diff changeset
   486
2630
7a962f6829ca moved THEN_MAYBE to Pure/tctical.ML
oheimb
parents: 2173
diff changeset
   487
(*compose a tactic sequentially before/alternatively after the step tactic*)
7a962f6829ca moved THEN_MAYBE to Pure/tctical.ML
oheimb
parents: 2173
diff changeset
   488
fun cs addbefore  tac1 = cs compWrapper  (fn tac2 => tac1 THEN_MAYBE' tac2);
7a962f6829ca moved THEN_MAYBE to Pure/tctical.ML
oheimb
parents: 2173
diff changeset
   489
fun cs addaltern  tac2 = cs compWrapper  (fn tac1 => tac1 APPEND'     tac2);
982
4fe0b642b7d5 Addition of wrappers for integration with the simplifier.
lcp
parents: 747
diff changeset
   490
1711
c06d01f75764 Provides merge_cs to support default clasets
paulson
parents: 1587
diff changeset
   491
(*Merge works by adding all new rules of the 2nd claset into the 1st claset.
c06d01f75764 Provides merge_cs to support default clasets
paulson
parents: 1587
diff changeset
   492
  Merging the term nets may look more efficient, but the rather delicate
c06d01f75764 Provides merge_cs to support default clasets
paulson
parents: 1587
diff changeset
   493
  treatment of priority might get muddled up.*)
c06d01f75764 Provides merge_cs to support default clasets
paulson
parents: 1587
diff changeset
   494
fun merge_cs
2630
7a962f6829ca moved THEN_MAYBE to Pure/tctical.ML
oheimb
parents: 2173
diff changeset
   495
    (cs as CS{safeIs, safeEs, hazIs, hazEs, ...},
1711
c06d01f75764 Provides merge_cs to support default clasets
paulson
parents: 1587
diff changeset
   496
     CS{safeIs=safeIs2, safeEs=safeEs2, hazIs=hazIs2, hazEs=hazEs2,...}) =
c06d01f75764 Provides merge_cs to support default clasets
paulson
parents: 1587
diff changeset
   497
  let val safeIs' = gen_rems eq_thm (safeIs2,safeIs)
c06d01f75764 Provides merge_cs to support default clasets
paulson
parents: 1587
diff changeset
   498
      val safeEs' = gen_rems eq_thm (safeEs2,safeEs)
2630
7a962f6829ca moved THEN_MAYBE to Pure/tctical.ML
oheimb
parents: 2173
diff changeset
   499
      val  hazIs' = gen_rems eq_thm ( hazIs2, hazIs)
7a962f6829ca moved THEN_MAYBE to Pure/tctical.ML
oheimb
parents: 2173
diff changeset
   500
      val  hazEs' = gen_rems eq_thm ( hazEs2, hazEs)
1711
c06d01f75764 Provides merge_cs to support default clasets
paulson
parents: 1587
diff changeset
   501
  in cs addSIs safeIs'
c06d01f75764 Provides merge_cs to support default clasets
paulson
parents: 1587
diff changeset
   502
        addSEs safeEs'
c06d01f75764 Provides merge_cs to support default clasets
paulson
parents: 1587
diff changeset
   503
        addIs  hazIs'
c06d01f75764 Provides merge_cs to support default clasets
paulson
parents: 1587
diff changeset
   504
        addEs  hazEs'
c06d01f75764 Provides merge_cs to support default clasets
paulson
parents: 1587
diff changeset
   505
  end;
c06d01f75764 Provides merge_cs to support default clasets
paulson
parents: 1587
diff changeset
   506
982
4fe0b642b7d5 Addition of wrappers for integration with the simplifier.
lcp
parents: 747
diff changeset
   507
1800
3d9d2ef0cd3b Now implements delrules
paulson
parents: 1724
diff changeset
   508
(**** Simple tactics for theorem proving ****)
0
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   509
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   510
(*Attack subgoals using safe inferences -- matching, not resolution*)
2630
7a962f6829ca moved THEN_MAYBE to Pure/tctical.ML
oheimb
parents: 2173
diff changeset
   511
fun safe_step_tac (cs as CS{safe0_netpair,safep_netpair,...}) = 
7a962f6829ca moved THEN_MAYBE to Pure/tctical.ML
oheimb
parents: 2173
diff changeset
   512
  getSWrapper cs (FIRST' [
7a962f6829ca moved THEN_MAYBE to Pure/tctical.ML
oheimb
parents: 2173
diff changeset
   513
	eq_assume_tac,
7a962f6829ca moved THEN_MAYBE to Pure/tctical.ML
oheimb
parents: 2173
diff changeset
   514
	eq_mp_tac,
7a962f6829ca moved THEN_MAYBE to Pure/tctical.ML
oheimb
parents: 2173
diff changeset
   515
	bimatch_from_nets_tac safe0_netpair,
7a962f6829ca moved THEN_MAYBE to Pure/tctical.ML
oheimb
parents: 2173
diff changeset
   516
	FIRST' hyp_subst_tacs,
7a962f6829ca moved THEN_MAYBE to Pure/tctical.ML
oheimb
parents: 2173
diff changeset
   517
	bimatch_from_nets_tac safep_netpair]);
0
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   518
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   519
(*Repeatedly attack subgoals using safe inferences -- it's deterministic!*)
2630
7a962f6829ca moved THEN_MAYBE to Pure/tctical.ML
oheimb
parents: 2173
diff changeset
   520
fun safe_tac cs = REPEAT_DETERM_FIRST 
7a962f6829ca moved THEN_MAYBE to Pure/tctical.ML
oheimb
parents: 2173
diff changeset
   521
	(fn i => COND (has_fewer_prems i) no_tac (safe_step_tac cs i));
747
bdc066781063 deepen_tac: modified due to outcome of experiments. Its
lcp
parents: 681
diff changeset
   522
bdc066781063 deepen_tac: modified due to outcome of experiments. Its
lcp
parents: 681
diff changeset
   523
(*But these unsafe steps at least solve a subgoal!*)
bdc066781063 deepen_tac: modified due to outcome of experiments. Its
lcp
parents: 681
diff changeset
   524
fun inst0_step_tac (CS{safe0_netpair,safep_netpair,...}) =
bdc066781063 deepen_tac: modified due to outcome of experiments. Its
lcp
parents: 681
diff changeset
   525
  assume_tac 			  APPEND' 
bdc066781063 deepen_tac: modified due to outcome of experiments. Its
lcp
parents: 681
diff changeset
   526
  contr_tac 			  APPEND' 
bdc066781063 deepen_tac: modified due to outcome of experiments. Its
lcp
parents: 681
diff changeset
   527
  biresolve_from_nets_tac safe0_netpair;
bdc066781063 deepen_tac: modified due to outcome of experiments. Its
lcp
parents: 681
diff changeset
   528
bdc066781063 deepen_tac: modified due to outcome of experiments. Its
lcp
parents: 681
diff changeset
   529
(*These are much worse since they could generate more and more subgoals*)
bdc066781063 deepen_tac: modified due to outcome of experiments. Its
lcp
parents: 681
diff changeset
   530
fun instp_step_tac (CS{safep_netpair,...}) =
bdc066781063 deepen_tac: modified due to outcome of experiments. Its
lcp
parents: 681
diff changeset
   531
  biresolve_from_nets_tac safep_netpair;
0
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   532
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   533
(*These steps could instantiate variables and are therefore unsafe.*)
747
bdc066781063 deepen_tac: modified due to outcome of experiments. Its
lcp
parents: 681
diff changeset
   534
fun inst_step_tac cs = inst0_step_tac cs APPEND' instp_step_tac cs;
0
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   535
982
4fe0b642b7d5 Addition of wrappers for integration with the simplifier.
lcp
parents: 747
diff changeset
   536
fun haz_step_tac (CS{haz_netpair,...}) = 
681
9b02474744ca Provers/classical: now takes theorem "classical" as argument, proves "swap"
lcp
parents: 469
diff changeset
   537
  biresolve_from_nets_tac haz_netpair;
9b02474744ca Provers/classical: now takes theorem "classical" as argument, proves "swap"
lcp
parents: 469
diff changeset
   538
0
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   539
(*Single step for the prover.  FAILS unless it makes progress. *)
2630
7a962f6829ca moved THEN_MAYBE to Pure/tctical.ML
oheimb
parents: 2173
diff changeset
   540
fun step_tac cs i = getWrapper cs 
7a962f6829ca moved THEN_MAYBE to Pure/tctical.ML
oheimb
parents: 2173
diff changeset
   541
	(K (safe_tac cs) ORELSE' (inst_step_tac cs ORELSE' haz_step_tac cs)) i;
0
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   542
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   543
(*Using a "safe" rule to instantiate variables is unsafe.  This tactic
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   544
  allows backtracking from "safe" rules to "unsafe" rules here.*)
2630
7a962f6829ca moved THEN_MAYBE to Pure/tctical.ML
oheimb
parents: 2173
diff changeset
   545
fun slow_step_tac cs i = getWrapper cs 
7a962f6829ca moved THEN_MAYBE to Pure/tctical.ML
oheimb
parents: 2173
diff changeset
   546
	(K (safe_tac cs) ORELSE' (inst_step_tac cs APPEND' haz_step_tac cs)) i;
0
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   547
1800
3d9d2ef0cd3b Now implements delrules
paulson
parents: 1724
diff changeset
   548
(**** The following tactics all fail unless they solve one goal ****)
0
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   549
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   550
(*Dumb but fast*)
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   551
fun fast_tac cs = SELECT_GOAL (DEPTH_SOLVE (step_tac cs 1));
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   552
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   553
(*Slower but smarter than fast_tac*)
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   554
fun best_tac cs = 
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   555
  SELECT_GOAL (BEST_FIRST (has_fewer_prems 1, sizef) (step_tac cs 1));
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   556
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   557
fun slow_tac cs = SELECT_GOAL (DEPTH_SOLVE (slow_step_tac cs 1));
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   558
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   559
fun slow_best_tac cs = 
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   560
  SELECT_GOAL (BEST_FIRST (has_fewer_prems 1, sizef) (slow_step_tac cs 1));
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   561
681
9b02474744ca Provers/classical: now takes theorem "classical" as argument, proves "swap"
lcp
parents: 469
diff changeset
   562
1800
3d9d2ef0cd3b Now implements delrules
paulson
parents: 1724
diff changeset
   563
(***ASTAR with weight weight_ASTAR, by Norbert Voelker*) 
1587
e7d8a4957bac Now provides astar versions (thanks to Norbert Voelker)
paulson
parents: 1524
diff changeset
   564
val weight_ASTAR = ref 5; 
e7d8a4957bac Now provides astar versions (thanks to Norbert Voelker)
paulson
parents: 1524
diff changeset
   565
e7d8a4957bac Now provides astar versions (thanks to Norbert Voelker)
paulson
parents: 1524
diff changeset
   566
fun astar_tac cs = 
e7d8a4957bac Now provides astar versions (thanks to Norbert Voelker)
paulson
parents: 1524
diff changeset
   567
  SELECT_GOAL ( ASTAR (has_fewer_prems 1
e7d8a4957bac Now provides astar versions (thanks to Norbert Voelker)
paulson
parents: 1524
diff changeset
   568
	      , fn level =>(fn thm =>size_of_thm thm + !weight_ASTAR *level)) 
e7d8a4957bac Now provides astar versions (thanks to Norbert Voelker)
paulson
parents: 1524
diff changeset
   569
	      (step_tac cs 1));
e7d8a4957bac Now provides astar versions (thanks to Norbert Voelker)
paulson
parents: 1524
diff changeset
   570
e7d8a4957bac Now provides astar versions (thanks to Norbert Voelker)
paulson
parents: 1524
diff changeset
   571
fun slow_astar_tac cs = 
e7d8a4957bac Now provides astar versions (thanks to Norbert Voelker)
paulson
parents: 1524
diff changeset
   572
  SELECT_GOAL ( ASTAR (has_fewer_prems 1
e7d8a4957bac Now provides astar versions (thanks to Norbert Voelker)
paulson
parents: 1524
diff changeset
   573
	      , fn level =>(fn thm =>size_of_thm thm + !weight_ASTAR *level)) 
e7d8a4957bac Now provides astar versions (thanks to Norbert Voelker)
paulson
parents: 1524
diff changeset
   574
	      (slow_step_tac cs 1));
e7d8a4957bac Now provides astar versions (thanks to Norbert Voelker)
paulson
parents: 1524
diff changeset
   575
1800
3d9d2ef0cd3b Now implements delrules
paulson
parents: 1724
diff changeset
   576
(**** Complete tactic, loosely based upon LeanTaP.  This tactic is the outcome
747
bdc066781063 deepen_tac: modified due to outcome of experiments. Its
lcp
parents: 681
diff changeset
   577
  of much experimentation!  Changing APPEND to ORELSE below would prove
bdc066781063 deepen_tac: modified due to outcome of experiments. Its
lcp
parents: 681
diff changeset
   578
  easy theorems faster, but loses completeness -- and many of the harder
1800
3d9d2ef0cd3b Now implements delrules
paulson
parents: 1724
diff changeset
   579
  theorems such as 43. ****)
681
9b02474744ca Provers/classical: now takes theorem "classical" as argument, proves "swap"
lcp
parents: 469
diff changeset
   580
747
bdc066781063 deepen_tac: modified due to outcome of experiments. Its
lcp
parents: 681
diff changeset
   581
(*Non-deterministic!  Could always expand the first unsafe connective.
bdc066781063 deepen_tac: modified due to outcome of experiments. Its
lcp
parents: 681
diff changeset
   582
  That's hard to implement and did not perform better in experiments, due to
bdc066781063 deepen_tac: modified due to outcome of experiments. Its
lcp
parents: 681
diff changeset
   583
  greater search depth required.*)
681
9b02474744ca Provers/classical: now takes theorem "classical" as argument, proves "swap"
lcp
parents: 469
diff changeset
   584
fun dup_step_tac (cs as (CS{dup_netpair,...})) = 
9b02474744ca Provers/classical: now takes theorem "classical" as argument, proves "swap"
lcp
parents: 469
diff changeset
   585
  biresolve_from_nets_tac dup_netpair;
9b02474744ca Provers/classical: now takes theorem "classical" as argument, proves "swap"
lcp
parents: 469
diff changeset
   586
747
bdc066781063 deepen_tac: modified due to outcome of experiments. Its
lcp
parents: 681
diff changeset
   587
(*Searching to depth m.*)
bdc066781063 deepen_tac: modified due to outcome of experiments. Its
lcp
parents: 681
diff changeset
   588
fun depth_tac cs m i = STATE(fn state => 
bdc066781063 deepen_tac: modified due to outcome of experiments. Its
lcp
parents: 681
diff changeset
   589
  SELECT_GOAL 
2630
7a962f6829ca moved THEN_MAYBE to Pure/tctical.ML
oheimb
parents: 2173
diff changeset
   590
   (getWrapper cs
7a962f6829ca moved THEN_MAYBE to Pure/tctical.ML
oheimb
parents: 2173
diff changeset
   591
    (fn i => REPEAT_DETERM1 (safe_step_tac cs i) THEN_ELSE
7a962f6829ca moved THEN_MAYBE to Pure/tctical.ML
oheimb
parents: 2173
diff changeset
   592
     (DEPTH_SOLVE (depth_tac cs m i),
7a962f6829ca moved THEN_MAYBE to Pure/tctical.ML
oheimb
parents: 2173
diff changeset
   593
      inst0_step_tac cs i  APPEND
747
bdc066781063 deepen_tac: modified due to outcome of experiments. Its
lcp
parents: 681
diff changeset
   594
      COND (K(m=0)) no_tac
2630
7a962f6829ca moved THEN_MAYBE to Pure/tctical.ML
oheimb
parents: 2173
diff changeset
   595
        ((instp_step_tac cs i APPEND dup_step_tac cs i)
7a962f6829ca moved THEN_MAYBE to Pure/tctical.ML
oheimb
parents: 2173
diff changeset
   596
	 THEN DEPTH_SOLVE (depth_tac cs (m-1) i)))) 1)
747
bdc066781063 deepen_tac: modified due to outcome of experiments. Its
lcp
parents: 681
diff changeset
   597
  i);
bdc066781063 deepen_tac: modified due to outcome of experiments. Its
lcp
parents: 681
diff changeset
   598
bdc066781063 deepen_tac: modified due to outcome of experiments. Its
lcp
parents: 681
diff changeset
   599
(*Iterative deepening tactical.  Allows us to "deepen" any search tactic*)
bdc066781063 deepen_tac: modified due to outcome of experiments. Its
lcp
parents: 681
diff changeset
   600
fun DEEPEN tacf m i = STATE(fn state => 
bdc066781063 deepen_tac: modified due to outcome of experiments. Its
lcp
parents: 681
diff changeset
   601
   if has_fewer_prems i state then no_tac
bdc066781063 deepen_tac: modified due to outcome of experiments. Its
lcp
parents: 681
diff changeset
   602
   else (writeln ("Depth = " ^ string_of_int m);
bdc066781063 deepen_tac: modified due to outcome of experiments. Its
lcp
parents: 681
diff changeset
   603
	 tacf m i  ORELSE  DEEPEN tacf (m+2) i));
bdc066781063 deepen_tac: modified due to outcome of experiments. Its
lcp
parents: 681
diff changeset
   604
2173
08c68550460b Added a comment
paulson
parents: 2066
diff changeset
   605
(*Search, with depth bound m.  
08c68550460b Added a comment
paulson
parents: 2066
diff changeset
   606
  This is the "entry point", which does safe inferences first.*)
747
bdc066781063 deepen_tac: modified due to outcome of experiments. Its
lcp
parents: 681
diff changeset
   607
fun safe_depth_tac cs m = 
681
9b02474744ca Provers/classical: now takes theorem "classical" as argument, proves "swap"
lcp
parents: 469
diff changeset
   608
  SUBGOAL 
9b02474744ca Provers/classical: now takes theorem "classical" as argument, proves "swap"
lcp
parents: 469
diff changeset
   609
    (fn (prem,i) =>
9b02474744ca Provers/classical: now takes theorem "classical" as argument, proves "swap"
lcp
parents: 469
diff changeset
   610
      let val deti =
9b02474744ca Provers/classical: now takes theorem "classical" as argument, proves "swap"
lcp
parents: 469
diff changeset
   611
	  (*No Vars in the goal?  No need to backtrack between goals.*)
9b02474744ca Provers/classical: now takes theorem "classical" as argument, proves "swap"
lcp
parents: 469
diff changeset
   612
	  case term_vars prem of
9b02474744ca Provers/classical: now takes theorem "classical" as argument, proves "swap"
lcp
parents: 469
diff changeset
   613
	      []	=> DETERM 
9b02474744ca Provers/classical: now takes theorem "classical" as argument, proves "swap"
lcp
parents: 469
diff changeset
   614
	    | _::_	=> I
9b02474744ca Provers/classical: now takes theorem "classical" as argument, proves "swap"
lcp
parents: 469
diff changeset
   615
      in  SELECT_GOAL (TRY (safe_tac cs) THEN 
747
bdc066781063 deepen_tac: modified due to outcome of experiments. Its
lcp
parents: 681
diff changeset
   616
		       DEPTH_SOLVE (deti (depth_tac cs m 1))) i
bdc066781063 deepen_tac: modified due to outcome of experiments. Its
lcp
parents: 681
diff changeset
   617
      end);
681
9b02474744ca Provers/classical: now takes theorem "classical" as argument, proves "swap"
lcp
parents: 469
diff changeset
   618
747
bdc066781063 deepen_tac: modified due to outcome of experiments. Its
lcp
parents: 681
diff changeset
   619
fun deepen_tac cs = DEEPEN (safe_depth_tac cs);
681
9b02474744ca Provers/classical: now takes theorem "classical" as argument, proves "swap"
lcp
parents: 469
diff changeset
   620
1724
bb02e6976258 Added functions for default claset.
berghofe
parents: 1711
diff changeset
   621
val claset = ref empty_cs;
bb02e6976258 Added functions for default claset.
berghofe
parents: 1711
diff changeset
   622
bb02e6976258 Added functions for default claset.
berghofe
parents: 1711
diff changeset
   623
fun AddDs ts = (claset := !claset addDs ts);
bb02e6976258 Added functions for default claset.
berghofe
parents: 1711
diff changeset
   624
bb02e6976258 Added functions for default claset.
berghofe
parents: 1711
diff changeset
   625
fun AddEs ts = (claset := !claset addEs ts);
bb02e6976258 Added functions for default claset.
berghofe
parents: 1711
diff changeset
   626
bb02e6976258 Added functions for default claset.
berghofe
parents: 1711
diff changeset
   627
fun AddIs ts = (claset := !claset addIs ts);
bb02e6976258 Added functions for default claset.
berghofe
parents: 1711
diff changeset
   628
bb02e6976258 Added functions for default claset.
berghofe
parents: 1711
diff changeset
   629
fun AddSDs ts = (claset := !claset addSDs ts);
bb02e6976258 Added functions for default claset.
berghofe
parents: 1711
diff changeset
   630
bb02e6976258 Added functions for default claset.
berghofe
parents: 1711
diff changeset
   631
fun AddSEs ts = (claset := !claset addSEs ts);
bb02e6976258 Added functions for default claset.
berghofe
parents: 1711
diff changeset
   632
bb02e6976258 Added functions for default claset.
berghofe
parents: 1711
diff changeset
   633
fun AddSIs ts = (claset := !claset addSIs ts);
bb02e6976258 Added functions for default claset.
berghofe
parents: 1711
diff changeset
   634
1807
3ff66483a8d4 Now exports Delrules
paulson
parents: 1800
diff changeset
   635
fun Delrules ts = (claset := !claset delrules ts);
3ff66483a8d4 Now exports Delrules
paulson
parents: 1800
diff changeset
   636
1800
3d9d2ef0cd3b Now implements delrules
paulson
parents: 1724
diff changeset
   637
(*Cannot have Safe_tac, as it takes no arguments; must delay dereferencing!*)
3d9d2ef0cd3b Now implements delrules
paulson
parents: 1724
diff changeset
   638
1814
89f8d4a88cca Addition of Safe_step_tac
paulson
parents: 1807
diff changeset
   639
fun Safe_step_tac i = safe_step_tac (!claset) i; 
89f8d4a88cca Addition of Safe_step_tac
paulson
parents: 1807
diff changeset
   640
1800
3d9d2ef0cd3b Now implements delrules
paulson
parents: 1724
diff changeset
   641
fun Step_tac i = step_tac (!claset) i; 
3d9d2ef0cd3b Now implements delrules
paulson
parents: 1724
diff changeset
   642
1724
bb02e6976258 Added functions for default claset.
berghofe
parents: 1711
diff changeset
   643
fun Fast_tac i = fast_tac (!claset) i; 
bb02e6976258 Added functions for default claset.
berghofe
parents: 1711
diff changeset
   644
1800
3d9d2ef0cd3b Now implements delrules
paulson
parents: 1724
diff changeset
   645
fun Best_tac i = best_tac (!claset) i; 
3d9d2ef0cd3b Now implements delrules
paulson
parents: 1724
diff changeset
   646
2066
b9063086ef56 Introduction of Slow_tac and Slow_best_tac
paulson
parents: 1938
diff changeset
   647
fun Slow_tac i = slow_tac (!claset) i; 
b9063086ef56 Introduction of Slow_tac and Slow_best_tac
paulson
parents: 1938
diff changeset
   648
b9063086ef56 Introduction of Slow_tac and Slow_best_tac
paulson
parents: 1938
diff changeset
   649
fun Slow_best_tac i = slow_best_tac (!claset) i; 
b9063086ef56 Introduction of Slow_tac and Slow_best_tac
paulson
parents: 1938
diff changeset
   650
1800
3d9d2ef0cd3b Now implements delrules
paulson
parents: 1724
diff changeset
   651
fun Deepen_tac m = deepen_tac (!claset) m; 
3d9d2ef0cd3b Now implements delrules
paulson
parents: 1724
diff changeset
   652
0
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   653
end; 
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   654
end;
2630
7a962f6829ca moved THEN_MAYBE to Pure/tctical.ML
oheimb
parents: 2173
diff changeset
   655
7a962f6829ca moved THEN_MAYBE to Pure/tctical.ML
oheimb
parents: 2173
diff changeset
   656