src/Provers/simplifier.ML
author oheimb
Sat, 15 Feb 1997 16:14:35 +0100
changeset 2629 b442786d4469
parent 2567 7a28e02e10b7
child 2645 9d3a3e62bf34
permissions -rw-r--r--
added deleqcongs, richer rep_ss split solver in safe and unsafe parts (finish_tac, unsafe_finish_tac) added safe_asm_full_simp_tac, setSSolver, addSSolver renamed setsolver to setSolver, addsolver to addSolver
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
1243
fa09705a5890 added global simpset
clasohm
parents: 983
diff changeset
     1
(*  Title:      Provers/simplifier.ML
1
c6a6e3db5353 changed addcongs to addeqcongs in simplifier.ML
nipkow
parents: 0
diff changeset
     2
    ID:         $Id$
c6a6e3db5353 changed addcongs to addeqcongs in simplifier.ML
nipkow
parents: 0
diff changeset
     3
    Author:     Tobias Nipkow
c6a6e3db5353 changed addcongs to addeqcongs in simplifier.ML
nipkow
parents: 0
diff changeset
     4
    Copyright   1993  TU Munich
c6a6e3db5353 changed addcongs to addeqcongs in simplifier.ML
nipkow
parents: 0
diff changeset
     5
c6a6e3db5353 changed addcongs to addeqcongs in simplifier.ML
nipkow
parents: 0
diff changeset
     6
Generic simplifier, suitable for most logics.
2503
7590fd5ce3c7 cleaned up (real changes next time);
wenzelm
parents: 1770
diff changeset
     7
7590fd5ce3c7 cleaned up (real changes next time);
wenzelm
parents: 1770
diff changeset
     8
TODO:
7590fd5ce3c7 cleaned up (real changes next time);
wenzelm
parents: 1770
diff changeset
     9
  - stamps to identify funs / tacs
7590fd5ce3c7 cleaned up (real changes next time);
wenzelm
parents: 1770
diff changeset
    10
  - merge: fail if incompatible funs
2509
0a7169d89b7a added termless parameter;
wenzelm
parents: 2503
diff changeset
    11
  - improve merge
1
c6a6e3db5353 changed addcongs to addeqcongs in simplifier.ML
nipkow
parents: 0
diff changeset
    12
*)
1260
c76ac4a9dc2b renamed SS to Simpset; fixed bug in merge_ss
clasohm
parents: 1243
diff changeset
    13
2629
b442786d4469 added deleqcongs, richer rep_ss
oheimb
parents: 2567
diff changeset
    14
infix 4 setsubgoaler setloop addloop setSSolver addSSolver setSolver addSolver 
b442786d4469 added deleqcongs, richer rep_ss
oheimb
parents: 2567
diff changeset
    15
        setmksimps addsimps delsimps addeqcongs deleqcongs
2567
7a28e02e10b7 added addloop (and also documentation of addsolver
oheimb
parents: 2521
diff changeset
    16
	settermless addsimprocs delsimprocs;
7a28e02e10b7 added addloop (and also documentation of addsolver
oheimb
parents: 2521
diff changeset
    17
0
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
    18
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
    19
signature SIMPLIFIER =
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
    20
sig
2509
0a7169d89b7a added termless parameter;
wenzelm
parents: 2503
diff changeset
    21
  type simproc
0a7169d89b7a added termless parameter;
wenzelm
parents: 2503
diff changeset
    22
  val mk_simproc: string -> cterm list -> (Sign.sg -> term -> thm option) -> simproc
0a7169d89b7a added termless parameter;
wenzelm
parents: 2503
diff changeset
    23
  val name_of_simproc: simproc -> string
0a7169d89b7a added termless parameter;
wenzelm
parents: 2503
diff changeset
    24
  val conv_prover: (term * term -> term) -> thm -> (thm -> thm)
0a7169d89b7a added termless parameter;
wenzelm
parents: 2503
diff changeset
    25
    -> tactic -> (int -> tactic) -> Sign.sg -> term -> term -> thm	(* FIXME move?, rename? *)
0
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
    26
  type simpset
2503
7590fd5ce3c7 cleaned up (real changes next time);
wenzelm
parents: 1770
diff changeset
    27
  val empty_ss: simpset
2629
b442786d4469 added deleqcongs, richer rep_ss
oheimb
parents: 2567
diff changeset
    28
  val rep_ss: simpset -> {simps: thm list, procs: string list, congs: thm list,
b442786d4469 added deleqcongs, richer rep_ss
oheimb
parents: 2567
diff changeset
    29
			  subgoal_tac:        simpset -> int -> tactic,
b442786d4469 added deleqcongs, richer rep_ss
oheimb
parents: 2567
diff changeset
    30
			  loop_tac:                      int -> tactic,
b442786d4469 added deleqcongs, richer rep_ss
oheimb
parents: 2567
diff changeset
    31
			         finish_tac: thm list -> int -> tactic,
b442786d4469 added deleqcongs, richer rep_ss
oheimb
parents: 2567
diff changeset
    32
			  unsafe_finish_tac: thm list -> int -> tactic}
b442786d4469 added deleqcongs, richer rep_ss
oheimb
parents: 2567
diff changeset
    33
  val setsubgoaler: simpset *  (simpset -> int -> tactic) -> simpset
b442786d4469 added deleqcongs, richer rep_ss
oheimb
parents: 2567
diff changeset
    34
  val setloop:      simpset *             (int -> tactic) -> simpset
b442786d4469 added deleqcongs, richer rep_ss
oheimb
parents: 2567
diff changeset
    35
  val addloop:      simpset *             (int -> tactic) -> simpset
b442786d4469 added deleqcongs, richer rep_ss
oheimb
parents: 2567
diff changeset
    36
  val setSSolver:   simpset * (thm list -> int -> tactic) -> simpset
b442786d4469 added deleqcongs, richer rep_ss
oheimb
parents: 2567
diff changeset
    37
  val addSSolver:   simpset * (thm list -> int -> tactic) -> simpset
b442786d4469 added deleqcongs, richer rep_ss
oheimb
parents: 2567
diff changeset
    38
  val setSolver:    simpset * (thm list -> int -> tactic) -> simpset
b442786d4469 added deleqcongs, richer rep_ss
oheimb
parents: 2567
diff changeset
    39
  val addSolver:    simpset * (thm list -> int -> tactic) -> simpset
b442786d4469 added deleqcongs, richer rep_ss
oheimb
parents: 2567
diff changeset
    40
  val setmksimps:  simpset * (thm -> thm list) -> simpset
2509
0a7169d89b7a added termless parameter;
wenzelm
parents: 2503
diff changeset
    41
  val settermless: simpset * (term * term -> bool) -> simpset
2629
b442786d4469 added deleqcongs, richer rep_ss
oheimb
parents: 2567
diff changeset
    42
  val addsimps:    simpset * thm list -> simpset
b442786d4469 added deleqcongs, richer rep_ss
oheimb
parents: 2567
diff changeset
    43
  val delsimps:    simpset * thm list -> simpset
b442786d4469 added deleqcongs, richer rep_ss
oheimb
parents: 2567
diff changeset
    44
  val addeqcongs:  simpset * thm list -> simpset
b442786d4469 added deleqcongs, richer rep_ss
oheimb
parents: 2567
diff changeset
    45
  val deleqcongs:  simpset * thm list -> simpset
2509
0a7169d89b7a added termless parameter;
wenzelm
parents: 2503
diff changeset
    46
  val addsimprocs: simpset * simproc list -> simpset
0a7169d89b7a added termless parameter;
wenzelm
parents: 2503
diff changeset
    47
  val delsimprocs: simpset * simproc list -> simpset
2629
b442786d4469 added deleqcongs, richer rep_ss
oheimb
parents: 2567
diff changeset
    48
  val merge_ss:    simpset * simpset -> simpset
b442786d4469 added deleqcongs, richer rep_ss
oheimb
parents: 2567
diff changeset
    49
  val prems_of_ss: simpset -> thm list
b442786d4469 added deleqcongs, richer rep_ss
oheimb
parents: 2567
diff changeset
    50
  val simpset:     simpset ref
1243
fa09705a5890 added global simpset
clasohm
parents: 983
diff changeset
    51
  val Addsimps: thm list -> unit
fa09705a5890 added global simpset
clasohm
parents: 983
diff changeset
    52
  val Delsimps: thm list -> unit
2509
0a7169d89b7a added termless parameter;
wenzelm
parents: 2503
diff changeset
    53
  val Addsimprocs: simproc list -> unit
0a7169d89b7a added termless parameter;
wenzelm
parents: 2503
diff changeset
    54
  val Delsimprocs: simproc list -> unit
2629
b442786d4469 added deleqcongs, richer rep_ss
oheimb
parents: 2567
diff changeset
    55
  val               simp_tac: simpset -> int -> tactic
b442786d4469 added deleqcongs, richer rep_ss
oheimb
parents: 2567
diff changeset
    56
  val           asm_simp_tac: simpset -> int -> tactic
b442786d4469 added deleqcongs, richer rep_ss
oheimb
parents: 2567
diff changeset
    57
  val          full_simp_tac: simpset -> int -> tactic
b442786d4469 added deleqcongs, richer rep_ss
oheimb
parents: 2567
diff changeset
    58
  val      asm_full_simp_tac: simpset -> int -> tactic
b442786d4469 added deleqcongs, richer rep_ss
oheimb
parents: 2567
diff changeset
    59
  val safe_asm_full_simp_tac: simpset -> int -> tactic
b442786d4469 added deleqcongs, richer rep_ss
oheimb
parents: 2567
diff changeset
    60
  val               Simp_tac:            int -> tactic
b442786d4469 added deleqcongs, richer rep_ss
oheimb
parents: 2567
diff changeset
    61
  val           Asm_simp_tac:            int -> tactic
b442786d4469 added deleqcongs, richer rep_ss
oheimb
parents: 2567
diff changeset
    62
  val          Full_simp_tac:            int -> tactic
b442786d4469 added deleqcongs, richer rep_ss
oheimb
parents: 2567
diff changeset
    63
  val      Asm_full_simp_tac:            int -> tactic
0
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
    64
end;
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
    65
2503
7590fd5ce3c7 cleaned up (real changes next time);
wenzelm
parents: 1770
diff changeset
    66
7590fd5ce3c7 cleaned up (real changes next time);
wenzelm
parents: 1770
diff changeset
    67
structure Simplifier: SIMPLIFIER =
0
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
    68
struct
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
    69
2509
0a7169d89b7a added termless parameter;
wenzelm
parents: 2503
diff changeset
    70
0a7169d89b7a added termless parameter;
wenzelm
parents: 2503
diff changeset
    71
(** simplification procedures **)
0a7169d89b7a added termless parameter;
wenzelm
parents: 2503
diff changeset
    72
0a7169d89b7a added termless parameter;
wenzelm
parents: 2503
diff changeset
    73
(* datatype simproc *)
0a7169d89b7a added termless parameter;
wenzelm
parents: 2503
diff changeset
    74
0a7169d89b7a added termless parameter;
wenzelm
parents: 2503
diff changeset
    75
datatype simproc =
0a7169d89b7a added termless parameter;
wenzelm
parents: 2503
diff changeset
    76
  Simproc of {
0a7169d89b7a added termless parameter;
wenzelm
parents: 2503
diff changeset
    77
    name: string,
0a7169d89b7a added termless parameter;
wenzelm
parents: 2503
diff changeset
    78
    procs: (Sign.sg * term * (Sign.sg -> term -> thm option) * stamp) list}
0a7169d89b7a added termless parameter;
wenzelm
parents: 2503
diff changeset
    79
0a7169d89b7a added termless parameter;
wenzelm
parents: 2503
diff changeset
    80
(* FIXME stamps!? *)
0a7169d89b7a added termless parameter;
wenzelm
parents: 2503
diff changeset
    81
fun eq_simproc (Simproc {name = name1, ...}, Simproc {name = name2, ...}) =
0a7169d89b7a added termless parameter;
wenzelm
parents: 2503
diff changeset
    82
  (name1 = name2);
0a7169d89b7a added termless parameter;
wenzelm
parents: 2503
diff changeset
    83
0a7169d89b7a added termless parameter;
wenzelm
parents: 2503
diff changeset
    84
fun mk_simproc name lhss proc =
0a7169d89b7a added termless parameter;
wenzelm
parents: 2503
diff changeset
    85
  let
0a7169d89b7a added termless parameter;
wenzelm
parents: 2503
diff changeset
    86
    fun mk_proc lhs =
0a7169d89b7a added termless parameter;
wenzelm
parents: 2503
diff changeset
    87
      (#sign (Thm.rep_cterm lhs), Logic.varify (term_of lhs), proc, stamp ());
0a7169d89b7a added termless parameter;
wenzelm
parents: 2503
diff changeset
    88
  in
0a7169d89b7a added termless parameter;
wenzelm
parents: 2503
diff changeset
    89
    Simproc {name = name, procs = map mk_proc lhss}
0a7169d89b7a added termless parameter;
wenzelm
parents: 2503
diff changeset
    90
  end;
0a7169d89b7a added termless parameter;
wenzelm
parents: 2503
diff changeset
    91
0a7169d89b7a added termless parameter;
wenzelm
parents: 2503
diff changeset
    92
fun name_of_simproc (Simproc {name, ...}) = name;
0a7169d89b7a added termless parameter;
wenzelm
parents: 2503
diff changeset
    93
0a7169d89b7a added termless parameter;
wenzelm
parents: 2503
diff changeset
    94
0a7169d89b7a added termless parameter;
wenzelm
parents: 2503
diff changeset
    95
(* generic conversion prover *)		(* FIXME move?, rename? *)
0a7169d89b7a added termless parameter;
wenzelm
parents: 2503
diff changeset
    96
0a7169d89b7a added termless parameter;
wenzelm
parents: 2503
diff changeset
    97
fun conv_prover mk_eqv eqv_refl mk_meta_eq expand_tac norm_tac sg t u =
0a7169d89b7a added termless parameter;
wenzelm
parents: 2503
diff changeset
    98
  let
0a7169d89b7a added termless parameter;
wenzelm
parents: 2503
diff changeset
    99
    val X = Free (gensym "X.", fastype_of t);
0a7169d89b7a added termless parameter;
wenzelm
parents: 2503
diff changeset
   100
    val goal = Logic.mk_implies (mk_eqv (X, t), mk_eqv (X, u));
0a7169d89b7a added termless parameter;
wenzelm
parents: 2503
diff changeset
   101
    val pre_result =
0a7169d89b7a added termless parameter;
wenzelm
parents: 2503
diff changeset
   102
      prove_goalw_cterm [] (cterm_of sg goal)   (*goal: X=t ==> X=u*)
0a7169d89b7a added termless parameter;
wenzelm
parents: 2503
diff changeset
   103
        (fn prems => [
0a7169d89b7a added termless parameter;
wenzelm
parents: 2503
diff changeset
   104
          expand_tac,				(*expand u*)
0a7169d89b7a added termless parameter;
wenzelm
parents: 2503
diff changeset
   105
          ALLGOALS (cut_facts_tac prems),
0a7169d89b7a added termless parameter;
wenzelm
parents: 2503
diff changeset
   106
          ALLGOALS norm_tac]);			(*normalize both t and u*)
0a7169d89b7a added termless parameter;
wenzelm
parents: 2503
diff changeset
   107
  in
0a7169d89b7a added termless parameter;
wenzelm
parents: 2503
diff changeset
   108
    mk_meta_eq (eqv_refl RS pre_result)         (*final result: t==u*)
0a7169d89b7a added termless parameter;
wenzelm
parents: 2503
diff changeset
   109
  end
0a7169d89b7a added termless parameter;
wenzelm
parents: 2503
diff changeset
   110
  handle ERROR => error ("The error(s) above occurred while trying to prove " ^
0a7169d89b7a added termless parameter;
wenzelm
parents: 2503
diff changeset
   111
    (string_of_cterm (cterm_of sg (mk_eqv (t, u)))));
0a7169d89b7a added termless parameter;
wenzelm
parents: 2503
diff changeset
   112
0a7169d89b7a added termless parameter;
wenzelm
parents: 2503
diff changeset
   113
0a7169d89b7a added termless parameter;
wenzelm
parents: 2503
diff changeset
   114
2503
7590fd5ce3c7 cleaned up (real changes next time);
wenzelm
parents: 1770
diff changeset
   115
(** simplification sets **)
7590fd5ce3c7 cleaned up (real changes next time);
wenzelm
parents: 1770
diff changeset
   116
7590fd5ce3c7 cleaned up (real changes next time);
wenzelm
parents: 1770
diff changeset
   117
(* type simpset *)
7590fd5ce3c7 cleaned up (real changes next time);
wenzelm
parents: 1770
diff changeset
   118
0
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   119
datatype simpset =
2503
7590fd5ce3c7 cleaned up (real changes next time);
wenzelm
parents: 1770
diff changeset
   120
  Simpset of {
7590fd5ce3c7 cleaned up (real changes next time);
wenzelm
parents: 1770
diff changeset
   121
    mss: meta_simpset,
7590fd5ce3c7 cleaned up (real changes next time);
wenzelm
parents: 1770
diff changeset
   122
    simps: thm list,
2509
0a7169d89b7a added termless parameter;
wenzelm
parents: 2503
diff changeset
   123
    procs: simproc list,
2503
7590fd5ce3c7 cleaned up (real changes next time);
wenzelm
parents: 1770
diff changeset
   124
    congs: thm list,
2629
b442786d4469 added deleqcongs, richer rep_ss
oheimb
parents: 2567
diff changeset
   125
    subgoal_tac:        simpset -> int -> tactic,
b442786d4469 added deleqcongs, richer rep_ss
oheimb
parents: 2567
diff changeset
   126
    loop_tac:                      int -> tactic,
b442786d4469 added deleqcongs, richer rep_ss
oheimb
parents: 2567
diff changeset
   127
           finish_tac: thm list -> int -> tactic,
b442786d4469 added deleqcongs, richer rep_ss
oheimb
parents: 2567
diff changeset
   128
    unsafe_finish_tac: thm list -> int -> tactic};
2503
7590fd5ce3c7 cleaned up (real changes next time);
wenzelm
parents: 1770
diff changeset
   129
2629
b442786d4469 added deleqcongs, richer rep_ss
oheimb
parents: 2567
diff changeset
   130
fun make_ss (mss, simps, procs, congs, 
b442786d4469 added deleqcongs, richer rep_ss
oheimb
parents: 2567
diff changeset
   131
	     subgoal_tac, loop_tac, finish_tac, unsafe_finish_tac) =
2509
0a7169d89b7a added termless parameter;
wenzelm
parents: 2503
diff changeset
   132
  Simpset {mss = mss, simps = simps, procs = procs, congs = congs,
2629
b442786d4469 added deleqcongs, richer rep_ss
oheimb
parents: 2567
diff changeset
   133
    subgoal_tac = subgoal_tac, loop_tac = loop_tac,
b442786d4469 added deleqcongs, richer rep_ss
oheimb
parents: 2567
diff changeset
   134
    finish_tac = finish_tac, unsafe_finish_tac = unsafe_finish_tac};
0
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   135
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   136
val empty_ss =
2629
b442786d4469 added deleqcongs, richer rep_ss
oheimb
parents: 2567
diff changeset
   137
  make_ss (Thm.empty_mss, [], [], [], 
b442786d4469 added deleqcongs, richer rep_ss
oheimb
parents: 2567
diff changeset
   138
	   K (K no_tac), K no_tac, K (K no_tac), K (K no_tac));
2503
7590fd5ce3c7 cleaned up (real changes next time);
wenzelm
parents: 1770
diff changeset
   139
2629
b442786d4469 added deleqcongs, richer rep_ss
oheimb
parents: 2567
diff changeset
   140
fun rep_ss (Simpset {simps, procs, congs, subgoal_tac, loop_tac, 
b442786d4469 added deleqcongs, richer rep_ss
oheimb
parents: 2567
diff changeset
   141
		     finish_tac, unsafe_finish_tac, ...}) =
b442786d4469 added deleqcongs, richer rep_ss
oheimb
parents: 2567
diff changeset
   142
  {simps = simps, procs = map name_of_simproc procs, congs = congs,
b442786d4469 added deleqcongs, richer rep_ss
oheimb
parents: 2567
diff changeset
   143
   subgoal_tac = subgoal_tac, loop_tac = loop_tac,
b442786d4469 added deleqcongs, richer rep_ss
oheimb
parents: 2567
diff changeset
   144
   finish_tac = finish_tac, unsafe_finish_tac = unsafe_finish_tac};
2503
7590fd5ce3c7 cleaned up (real changes next time);
wenzelm
parents: 1770
diff changeset
   145
7590fd5ce3c7 cleaned up (real changes next time);
wenzelm
parents: 1770
diff changeset
   146
fun prems_of_ss (Simpset {mss, ...}) = Thm.prems_of_mss mss;
7590fd5ce3c7 cleaned up (real changes next time);
wenzelm
parents: 1770
diff changeset
   147
7590fd5ce3c7 cleaned up (real changes next time);
wenzelm
parents: 1770
diff changeset
   148
7590fd5ce3c7 cleaned up (real changes next time);
wenzelm
parents: 1770
diff changeset
   149
(* extend simpsets *)
7590fd5ce3c7 cleaned up (real changes next time);
wenzelm
parents: 1770
diff changeset
   150
2629
b442786d4469 added deleqcongs, richer rep_ss
oheimb
parents: 2567
diff changeset
   151
fun (Simpset {mss, simps, procs, congs, subgoal_tac = _, loop_tac, 
b442786d4469 added deleqcongs, richer rep_ss
oheimb
parents: 2567
diff changeset
   152
	      finish_tac, unsafe_finish_tac}) setsubgoaler subgoal_tac =
b442786d4469 added deleqcongs, richer rep_ss
oheimb
parents: 2567
diff changeset
   153
  make_ss (mss, simps, procs, congs, subgoal_tac, loop_tac, 
b442786d4469 added deleqcongs, richer rep_ss
oheimb
parents: 2567
diff changeset
   154
	   finish_tac, unsafe_finish_tac);
b442786d4469 added deleqcongs, richer rep_ss
oheimb
parents: 2567
diff changeset
   155
b442786d4469 added deleqcongs, richer rep_ss
oheimb
parents: 2567
diff changeset
   156
fun (Simpset {mss, simps, procs, congs, subgoal_tac, loop_tac = _, 
b442786d4469 added deleqcongs, richer rep_ss
oheimb
parents: 2567
diff changeset
   157
	      finish_tac, unsafe_finish_tac}) setloop loop_tac =
b442786d4469 added deleqcongs, richer rep_ss
oheimb
parents: 2567
diff changeset
   158
  make_ss (mss, simps, procs, congs, subgoal_tac, DETERM o loop_tac, 
b442786d4469 added deleqcongs, richer rep_ss
oheimb
parents: 2567
diff changeset
   159
	   finish_tac, unsafe_finish_tac);
2503
7590fd5ce3c7 cleaned up (real changes next time);
wenzelm
parents: 1770
diff changeset
   160
2629
b442786d4469 added deleqcongs, richer rep_ss
oheimb
parents: 2567
diff changeset
   161
fun (Simpset {mss, simps, procs, congs, subgoal_tac, loop_tac, 
b442786d4469 added deleqcongs, richer rep_ss
oheimb
parents: 2567
diff changeset
   162
	      finish_tac, unsafe_finish_tac}) addloop tac =
b442786d4469 added deleqcongs, richer rep_ss
oheimb
parents: 2567
diff changeset
   163
  make_ss (mss, simps, procs, congs, subgoal_tac, loop_tac ORELSE'(DETERM o tac),
b442786d4469 added deleqcongs, richer rep_ss
oheimb
parents: 2567
diff changeset
   164
	   finish_tac, unsafe_finish_tac);
2567
7a28e02e10b7 added addloop (and also documentation of addsolver
oheimb
parents: 2521
diff changeset
   165
2629
b442786d4469 added deleqcongs, richer rep_ss
oheimb
parents: 2567
diff changeset
   166
fun (Simpset {mss, simps, procs, congs, subgoal_tac, loop_tac,
b442786d4469 added deleqcongs, richer rep_ss
oheimb
parents: 2567
diff changeset
   167
	      finish_tac = _, unsafe_finish_tac}) setSSolver finish_tac =
b442786d4469 added deleqcongs, richer rep_ss
oheimb
parents: 2567
diff changeset
   168
  make_ss (mss, simps, procs, congs, subgoal_tac, loop_tac, 
b442786d4469 added deleqcongs, richer rep_ss
oheimb
parents: 2567
diff changeset
   169
	   finish_tac, unsafe_finish_tac);
2503
7590fd5ce3c7 cleaned up (real changes next time);
wenzelm
parents: 1770
diff changeset
   170
2629
b442786d4469 added deleqcongs, richer rep_ss
oheimb
parents: 2567
diff changeset
   171
fun (Simpset {mss, simps, procs, congs, subgoal_tac, loop_tac, 
b442786d4469 added deleqcongs, richer rep_ss
oheimb
parents: 2567
diff changeset
   172
	      finish_tac, unsafe_finish_tac}) addSSolver tac =
b442786d4469 added deleqcongs, richer rep_ss
oheimb
parents: 2567
diff changeset
   173
  make_ss (mss, simps, procs, congs, subgoal_tac, loop_tac,
b442786d4469 added deleqcongs, richer rep_ss
oheimb
parents: 2567
diff changeset
   174
    fn hyps => finish_tac hyps ORELSE' tac hyps, unsafe_finish_tac);
2503
7590fd5ce3c7 cleaned up (real changes next time);
wenzelm
parents: 1770
diff changeset
   175
2629
b442786d4469 added deleqcongs, richer rep_ss
oheimb
parents: 2567
diff changeset
   176
fun (Simpset {mss, simps, procs, congs, subgoal_tac, loop_tac,
b442786d4469 added deleqcongs, richer rep_ss
oheimb
parents: 2567
diff changeset
   177
	      finish_tac, unsafe_finish_tac = _}) setSolver unsafe_finish_tac =
b442786d4469 added deleqcongs, richer rep_ss
oheimb
parents: 2567
diff changeset
   178
  make_ss (mss, simps, procs, congs, subgoal_tac, loop_tac, 
b442786d4469 added deleqcongs, richer rep_ss
oheimb
parents: 2567
diff changeset
   179
	   finish_tac, unsafe_finish_tac);
2503
7590fd5ce3c7 cleaned up (real changes next time);
wenzelm
parents: 1770
diff changeset
   180
2629
b442786d4469 added deleqcongs, richer rep_ss
oheimb
parents: 2567
diff changeset
   181
fun (Simpset {mss, simps, procs, congs, subgoal_tac, loop_tac, 
b442786d4469 added deleqcongs, richer rep_ss
oheimb
parents: 2567
diff changeset
   182
	      finish_tac, unsafe_finish_tac}) addSolver tac =
b442786d4469 added deleqcongs, richer rep_ss
oheimb
parents: 2567
diff changeset
   183
  make_ss (mss, simps, procs, congs, subgoal_tac, loop_tac,
b442786d4469 added deleqcongs, richer rep_ss
oheimb
parents: 2567
diff changeset
   184
    finish_tac, fn hyps => unsafe_finish_tac hyps ORELSE' tac hyps);
2503
7590fd5ce3c7 cleaned up (real changes next time);
wenzelm
parents: 1770
diff changeset
   185
2629
b442786d4469 added deleqcongs, richer rep_ss
oheimb
parents: 2567
diff changeset
   186
fun (Simpset {mss, simps, procs, congs, subgoal_tac, loop_tac, 
b442786d4469 added deleqcongs, richer rep_ss
oheimb
parents: 2567
diff changeset
   187
	      finish_tac, unsafe_finish_tac}) setmksimps mk_simps =
b442786d4469 added deleqcongs, richer rep_ss
oheimb
parents: 2567
diff changeset
   188
  make_ss (Thm.set_mk_rews (mss, mk_simps), simps, procs, congs,
b442786d4469 added deleqcongs, richer rep_ss
oheimb
parents: 2567
diff changeset
   189
    subgoal_tac, loop_tac, finish_tac, unsafe_finish_tac);
b442786d4469 added deleqcongs, richer rep_ss
oheimb
parents: 2567
diff changeset
   190
b442786d4469 added deleqcongs, richer rep_ss
oheimb
parents: 2567
diff changeset
   191
fun (Simpset {mss, simps, procs, congs, subgoal_tac, loop_tac, 
b442786d4469 added deleqcongs, richer rep_ss
oheimb
parents: 2567
diff changeset
   192
	      finish_tac, unsafe_finish_tac}) settermless termless =
2509
0a7169d89b7a added termless parameter;
wenzelm
parents: 2503
diff changeset
   193
  make_ss (Thm.set_termless (mss, termless), simps, procs, congs,
2629
b442786d4469 added deleqcongs, richer rep_ss
oheimb
parents: 2567
diff changeset
   194
    subgoal_tac, loop_tac, finish_tac, unsafe_finish_tac);
2509
0a7169d89b7a added termless parameter;
wenzelm
parents: 2503
diff changeset
   195
2629
b442786d4469 added deleqcongs, richer rep_ss
oheimb
parents: 2567
diff changeset
   196
fun (Simpset {mss, simps, procs, congs, subgoal_tac, loop_tac, 
b442786d4469 added deleqcongs, richer rep_ss
oheimb
parents: 2567
diff changeset
   197
	      finish_tac, unsafe_finish_tac}) addsimps rews =
2503
7590fd5ce3c7 cleaned up (real changes next time);
wenzelm
parents: 1770
diff changeset
   198
  let val rews' = flat (map (Thm.mk_rews_of_mss mss) rews) in
2521
b7dd670cfe3a addsimps, addeqcongs: replaced @ by gen_union;
wenzelm
parents: 2509
diff changeset
   199
    make_ss (Thm.add_simps (mss, rews'), gen_union eq_thm (rews', simps),
2629
b442786d4469 added deleqcongs, richer rep_ss
oheimb
parents: 2567
diff changeset
   200
    procs, congs, subgoal_tac, loop_tac, finish_tac, unsafe_finish_tac)
2503
7590fd5ce3c7 cleaned up (real changes next time);
wenzelm
parents: 1770
diff changeset
   201
  end;
7590fd5ce3c7 cleaned up (real changes next time);
wenzelm
parents: 1770
diff changeset
   202
2629
b442786d4469 added deleqcongs, richer rep_ss
oheimb
parents: 2567
diff changeset
   203
fun (Simpset {mss, simps, procs, congs, subgoal_tac, loop_tac, 
b442786d4469 added deleqcongs, richer rep_ss
oheimb
parents: 2567
diff changeset
   204
	      finish_tac, unsafe_finish_tac}) delsimps rews =
2503
7590fd5ce3c7 cleaned up (real changes next time);
wenzelm
parents: 1770
diff changeset
   205
  let val rews' = flat (map (Thm.mk_rews_of_mss mss) rews) in
2629
b442786d4469 added deleqcongs, richer rep_ss
oheimb
parents: 2567
diff changeset
   206
    make_ss (Thm.del_simps (mss, rews'), foldl (gen_rem eq_thm) (simps, rews'),
b442786d4469 added deleqcongs, richer rep_ss
oheimb
parents: 2567
diff changeset
   207
    procs, congs, subgoal_tac, loop_tac, finish_tac, unsafe_finish_tac)
2503
7590fd5ce3c7 cleaned up (real changes next time);
wenzelm
parents: 1770
diff changeset
   208
  end;
7590fd5ce3c7 cleaned up (real changes next time);
wenzelm
parents: 1770
diff changeset
   209
2629
b442786d4469 added deleqcongs, richer rep_ss
oheimb
parents: 2567
diff changeset
   210
fun (Simpset {mss, simps, procs, congs, subgoal_tac, loop_tac, 
b442786d4469 added deleqcongs, richer rep_ss
oheimb
parents: 2567
diff changeset
   211
	      finish_tac, unsafe_finish_tac}) addeqcongs newcongs =
b442786d4469 added deleqcongs, richer rep_ss
oheimb
parents: 2567
diff changeset
   212
  make_ss (Thm.add_congs (mss, newcongs), simps, procs, 
b442786d4469 added deleqcongs, richer rep_ss
oheimb
parents: 2567
diff changeset
   213
  gen_union eq_thm (congs, newcongs), subgoal_tac, loop_tac, 
b442786d4469 added deleqcongs, richer rep_ss
oheimb
parents: 2567
diff changeset
   214
  finish_tac, unsafe_finish_tac);
2509
0a7169d89b7a added termless parameter;
wenzelm
parents: 2503
diff changeset
   215
2629
b442786d4469 added deleqcongs, richer rep_ss
oheimb
parents: 2567
diff changeset
   216
fun (Simpset {mss, simps, procs, congs, subgoal_tac, loop_tac, 
b442786d4469 added deleqcongs, richer rep_ss
oheimb
parents: 2567
diff changeset
   217
	      finish_tac, unsafe_finish_tac}) deleqcongs oldcongs =
b442786d4469 added deleqcongs, richer rep_ss
oheimb
parents: 2567
diff changeset
   218
  make_ss (Thm.del_congs (mss, oldcongs), simps, procs, 
b442786d4469 added deleqcongs, richer rep_ss
oheimb
parents: 2567
diff changeset
   219
  foldl (gen_rem eq_thm) (congs, oldcongs), subgoal_tac, loop_tac, 
b442786d4469 added deleqcongs, richer rep_ss
oheimb
parents: 2567
diff changeset
   220
  finish_tac, unsafe_finish_tac);
b442786d4469 added deleqcongs, richer rep_ss
oheimb
parents: 2567
diff changeset
   221
b442786d4469 added deleqcongs, richer rep_ss
oheimb
parents: 2567
diff changeset
   222
fun addsimproc ((Simpset {mss, simps, procs, congs, subgoal_tac, loop_tac, 
b442786d4469 added deleqcongs, richer rep_ss
oheimb
parents: 2567
diff changeset
   223
			  finish_tac, unsafe_finish_tac}),
b442786d4469 added deleqcongs, richer rep_ss
oheimb
parents: 2567
diff changeset
   224
			  simproc as Simproc {name = _, procs = procs'}) =
2509
0a7169d89b7a added termless parameter;
wenzelm
parents: 2503
diff changeset
   225
  make_ss (Thm.add_simprocs (mss, procs'),
0a7169d89b7a added termless parameter;
wenzelm
parents: 2503
diff changeset
   226
    simps, gen_ins eq_simproc (simproc, procs),
2629
b442786d4469 added deleqcongs, richer rep_ss
oheimb
parents: 2567
diff changeset
   227
    congs, subgoal_tac, loop_tac, finish_tac, unsafe_finish_tac);
2509
0a7169d89b7a added termless parameter;
wenzelm
parents: 2503
diff changeset
   228
0a7169d89b7a added termless parameter;
wenzelm
parents: 2503
diff changeset
   229
val op addsimprocs = foldl addsimproc;
0a7169d89b7a added termless parameter;
wenzelm
parents: 2503
diff changeset
   230
2629
b442786d4469 added deleqcongs, richer rep_ss
oheimb
parents: 2567
diff changeset
   231
fun delsimproc ((Simpset {mss, simps, procs, congs, subgoal_tac, loop_tac, 
b442786d4469 added deleqcongs, richer rep_ss
oheimb
parents: 2567
diff changeset
   232
			  finish_tac, unsafe_finish_tac}),
b442786d4469 added deleqcongs, richer rep_ss
oheimb
parents: 2567
diff changeset
   233
			  simproc as Simproc {name = _, procs = procs'}) =
2509
0a7169d89b7a added termless parameter;
wenzelm
parents: 2503
diff changeset
   234
  make_ss (Thm.del_simprocs (mss, procs'),
0a7169d89b7a added termless parameter;
wenzelm
parents: 2503
diff changeset
   235
    simps, gen_rem eq_simproc (procs, simproc),
2629
b442786d4469 added deleqcongs, richer rep_ss
oheimb
parents: 2567
diff changeset
   236
    congs, subgoal_tac, loop_tac, finish_tac, unsafe_finish_tac);
2509
0a7169d89b7a added termless parameter;
wenzelm
parents: 2503
diff changeset
   237
0a7169d89b7a added termless parameter;
wenzelm
parents: 2503
diff changeset
   238
val op delsimprocs = foldl delsimproc;
2503
7590fd5ce3c7 cleaned up (real changes next time);
wenzelm
parents: 1770
diff changeset
   239
7590fd5ce3c7 cleaned up (real changes next time);
wenzelm
parents: 1770
diff changeset
   240
7590fd5ce3c7 cleaned up (real changes next time);
wenzelm
parents: 1770
diff changeset
   241
(* merge simpsets *)
7590fd5ce3c7 cleaned up (real changes next time);
wenzelm
parents: 1770
diff changeset
   242
2509
0a7169d89b7a added termless parameter;
wenzelm
parents: 2503
diff changeset
   243
(*prefers first simpset (FIXME improve?)*)
2629
b442786d4469 added deleqcongs, richer rep_ss
oheimb
parents: 2567
diff changeset
   244
fun merge_ss (Simpset {mss, simps, procs, congs, subgoal_tac, loop_tac, 
b442786d4469 added deleqcongs, richer rep_ss
oheimb
parents: 2567
diff changeset
   245
		       finish_tac, unsafe_finish_tac},
2509
0a7169d89b7a added termless parameter;
wenzelm
parents: 2503
diff changeset
   246
    Simpset {simps = simps2, procs = procs2, congs = congs2, ...}) =
2503
7590fd5ce3c7 cleaned up (real changes next time);
wenzelm
parents: 1770
diff changeset
   247
  let
7590fd5ce3c7 cleaned up (real changes next time);
wenzelm
parents: 1770
diff changeset
   248
    val simps' = gen_union eq_thm (simps, simps2);
2509
0a7169d89b7a added termless parameter;
wenzelm
parents: 2503
diff changeset
   249
    val procs' = gen_union eq_simproc (procs, procs2);
2503
7590fd5ce3c7 cleaned up (real changes next time);
wenzelm
parents: 1770
diff changeset
   250
    val congs' = gen_union eq_thm (congs, congs2);
7590fd5ce3c7 cleaned up (real changes next time);
wenzelm
parents: 1770
diff changeset
   251
    val mss' = Thm.set_mk_rews (empty_mss, Thm.mk_rews_of_mss mss);
7590fd5ce3c7 cleaned up (real changes next time);
wenzelm
parents: 1770
diff changeset
   252
    val mss' = Thm.add_simps (mss', simps');
7590fd5ce3c7 cleaned up (real changes next time);
wenzelm
parents: 1770
diff changeset
   253
    val mss' = Thm.add_congs (mss', congs');
7590fd5ce3c7 cleaned up (real changes next time);
wenzelm
parents: 1770
diff changeset
   254
  in
2629
b442786d4469 added deleqcongs, richer rep_ss
oheimb
parents: 2567
diff changeset
   255
    make_ss (mss', simps', procs', congs', subgoal_tac, loop_tac, 
b442786d4469 added deleqcongs, richer rep_ss
oheimb
parents: 2567
diff changeset
   256
	     finish_tac, unsafe_finish_tac)
2503
7590fd5ce3c7 cleaned up (real changes next time);
wenzelm
parents: 1770
diff changeset
   257
  end;
7590fd5ce3c7 cleaned up (real changes next time);
wenzelm
parents: 1770
diff changeset
   258
7590fd5ce3c7 cleaned up (real changes next time);
wenzelm
parents: 1770
diff changeset
   259
7590fd5ce3c7 cleaned up (real changes next time);
wenzelm
parents: 1770
diff changeset
   260
(* the current simpset *)
0
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   261
1243
fa09705a5890 added global simpset
clasohm
parents: 983
diff changeset
   262
val simpset = ref empty_ss;
0
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   263
2503
7590fd5ce3c7 cleaned up (real changes next time);
wenzelm
parents: 1770
diff changeset
   264
fun Addsimps rews = (simpset := ! simpset addsimps rews);
7590fd5ce3c7 cleaned up (real changes next time);
wenzelm
parents: 1770
diff changeset
   265
fun Delsimps rews = (simpset := ! simpset delsimps rews);
0
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   266
2509
0a7169d89b7a added termless parameter;
wenzelm
parents: 2503
diff changeset
   267
fun Addsimprocs procs = (simpset := ! simpset addsimprocs procs);
0a7169d89b7a added termless parameter;
wenzelm
parents: 2503
diff changeset
   268
fun Delsimprocs procs = (simpset := ! simpset delsimprocs procs);
0a7169d89b7a added termless parameter;
wenzelm
parents: 2503
diff changeset
   269
0
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   270
2503
7590fd5ce3c7 cleaned up (real changes next time);
wenzelm
parents: 1770
diff changeset
   271
(** simplification tactics **)
0
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   272
1
c6a6e3db5353 changed addcongs to addeqcongs in simplifier.ML
nipkow
parents: 0
diff changeset
   273
fun NEWSUBGOALS tac tacf =
2503
7590fd5ce3c7 cleaned up (real changes next time);
wenzelm
parents: 1770
diff changeset
   274
  STATE (fn state0 =>
7590fd5ce3c7 cleaned up (real changes next time);
wenzelm
parents: 1770
diff changeset
   275
    tac THEN STATE (fn state1 => tacf (nprems_of state1 - nprems_of state0)));
1
c6a6e3db5353 changed addcongs to addeqcongs in simplifier.ML
nipkow
parents: 0
diff changeset
   276
2629
b442786d4469 added deleqcongs, richer rep_ss
oheimb
parents: 2567
diff changeset
   277
(*not totally safe: may instantiate unknowns that appear also in other subgoals*)
b442786d4469 added deleqcongs, richer rep_ss
oheimb
parents: 2567
diff changeset
   278
fun basic_gen_simp_tac mode =
b442786d4469 added deleqcongs, richer rep_ss
oheimb
parents: 2567
diff changeset
   279
  fn (Simpset {mss, simps, procs, congs, subgoal_tac, loop_tac, 
b442786d4469 added deleqcongs, richer rep_ss
oheimb
parents: 2567
diff changeset
   280
	       finish_tac, unsafe_finish_tac}) =>
0
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   281
  let fun solve_all_tac mss =
2509
0a7169d89b7a added termless parameter;
wenzelm
parents: 2503
diff changeset
   282
        let val ss =
2629
b442786d4469 added deleqcongs, richer rep_ss
oheimb
parents: 2567
diff changeset
   283
              make_ss (mss, simps, procs, congs, subgoal_tac, loop_tac,
b442786d4469 added deleqcongs, richer rep_ss
oheimb
parents: 2567
diff changeset
   284
		       unsafe_finish_tac, unsafe_finish_tac);
1
c6a6e3db5353 changed addcongs to addeqcongs in simplifier.ML
nipkow
parents: 0
diff changeset
   285
            val solve1_tac =
c6a6e3db5353 changed addcongs to addeqcongs in simplifier.ML
nipkow
parents: 0
diff changeset
   286
              NEWSUBGOALS (subgoal_tac ss 1)
c6a6e3db5353 changed addcongs to addeqcongs in simplifier.ML
nipkow
parents: 0
diff changeset
   287
                          (fn n => if n<0 then all_tac else no_tac)
c6a6e3db5353 changed addcongs to addeqcongs in simplifier.ML
nipkow
parents: 0
diff changeset
   288
        in DEPTH_SOLVE(solve1_tac) end
1512
ce37c64244c0 Elimination of fully-functorial style.
paulson
parents: 1260
diff changeset
   289
      fun simp_loop_tac i thm =
2503
7590fd5ce3c7 cleaned up (real changes next time);
wenzelm
parents: 1770
diff changeset
   290
          (asm_rewrite_goal_tac mode solve_all_tac mss i THEN
7590fd5ce3c7 cleaned up (real changes next time);
wenzelm
parents: 1770
diff changeset
   291
           (finish_tac (prems_of_mss mss) i  ORELSE  looper i))  thm
1
c6a6e3db5353 changed addcongs to addeqcongs in simplifier.ML
nipkow
parents: 0
diff changeset
   292
      and allsimp i n = EVERY(map (fn j => simp_loop_tac (i+j)) (n downto 0))
c6a6e3db5353 changed addcongs to addeqcongs in simplifier.ML
nipkow
parents: 0
diff changeset
   293
      and looper i = TRY(NEWSUBGOALS (loop_tac i) (allsimp i))
217
c972c57e7762 got rid of METAHYPS due to the change of the basic simplification routines
nipkow
parents: 146
diff changeset
   294
  in simp_loop_tac end;
0
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   295
2629
b442786d4469 added deleqcongs, richer rep_ss
oheimb
parents: 2567
diff changeset
   296
fun gen_simp_tac mode ss = basic_gen_simp_tac mode 
b442786d4469 added deleqcongs, richer rep_ss
oheimb
parents: 2567
diff changeset
   297
			   (ss setSSolver #unsafe_finish_tac (rep_ss ss));
b442786d4469 added deleqcongs, richer rep_ss
oheimb
parents: 2567
diff changeset
   298
2503
7590fd5ce3c7 cleaned up (real changes next time);
wenzelm
parents: 1770
diff changeset
   299
val          simp_tac = gen_simp_tac (false, false);
7590fd5ce3c7 cleaned up (real changes next time);
wenzelm
parents: 1770
diff changeset
   300
val      asm_simp_tac = gen_simp_tac (false, true);
7590fd5ce3c7 cleaned up (real changes next time);
wenzelm
parents: 1770
diff changeset
   301
val     full_simp_tac = gen_simp_tac (true,  false);
7590fd5ce3c7 cleaned up (real changes next time);
wenzelm
parents: 1770
diff changeset
   302
val asm_full_simp_tac = gen_simp_tac (true,  true);
0
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   303
2629
b442786d4469 added deleqcongs, richer rep_ss
oheimb
parents: 2567
diff changeset
   304
(*not totally safe: may instantiate unknowns that appear also in other subgoals*)
b442786d4469 added deleqcongs, richer rep_ss
oheimb
parents: 2567
diff changeset
   305
val safe_asm_full_simp_tac = basic_gen_simp_tac (true, true);
b442786d4469 added deleqcongs, richer rep_ss
oheimb
parents: 2567
diff changeset
   306
2503
7590fd5ce3c7 cleaned up (real changes next time);
wenzelm
parents: 1770
diff changeset
   307
fun          Simp_tac i =          simp_tac (! simpset) i;
7590fd5ce3c7 cleaned up (real changes next time);
wenzelm
parents: 1770
diff changeset
   308
fun      Asm_simp_tac i =      asm_simp_tac (! simpset) i;
7590fd5ce3c7 cleaned up (real changes next time);
wenzelm
parents: 1770
diff changeset
   309
fun     Full_simp_tac i =     full_simp_tac (! simpset) i;
7590fd5ce3c7 cleaned up (real changes next time);
wenzelm
parents: 1770
diff changeset
   310
fun Asm_full_simp_tac i = asm_full_simp_tac (! simpset) i;
406
4d4e0442b106 simpset is hidden in a functor now.
nipkow
parents: 217
diff changeset
   311
1243
fa09705a5890 added global simpset
clasohm
parents: 983
diff changeset
   312
end;