src/Pure/logic.ML
author wenzelm
Fri, 19 Dec 1997 10:15:51 +0100
changeset 4443 d55e85d7f0c2
parent 4345 7e9436ffb813
child 4631 c7fa4ae34495
permissions -rw-r--r--
term order stuff moved to term.ML;
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
1460
5a6f2aabd538 inserted tabs again
clasohm
parents: 1458
diff changeset
     1
(*  Title: 	Pure/logic.ML
0
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
     2
    ID:         $Id$
1460
5a6f2aabd538 inserted tabs again
clasohm
parents: 1458
diff changeset
     3
    Author: 	Lawrence C Paulson, Cambridge University Computer Laboratory
0
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
     4
    Copyright   Cambridge University 1992
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
     5
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
     6
Supporting code for defining the abstract type "thm"
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
     7
*)
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
     8
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
     9
infix occs;
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
    10
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
    11
signature LOGIC = 
4345
7e9436ffb813 tuned term order;
wenzelm
parents: 4318
diff changeset
    12
sig
1460
5a6f2aabd538 inserted tabs again
clasohm
parents: 1458
diff changeset
    13
  val assum_pairs	: term -> (term*term)list
5a6f2aabd538 inserted tabs again
clasohm
parents: 1458
diff changeset
    14
  val auto_rename	: bool ref   
5a6f2aabd538 inserted tabs again
clasohm
parents: 1458
diff changeset
    15
  val close_form	: term -> term   
5a6f2aabd538 inserted tabs again
clasohm
parents: 1458
diff changeset
    16
  val count_prems	: term * int -> int
5a6f2aabd538 inserted tabs again
clasohm
parents: 1458
diff changeset
    17
  val dest_equals	: term -> term * term
5a6f2aabd538 inserted tabs again
clasohm
parents: 1458
diff changeset
    18
  val dest_flexpair	: term -> term * term
5a6f2aabd538 inserted tabs again
clasohm
parents: 1458
diff changeset
    19
  val dest_implies	: term -> term * term
5a6f2aabd538 inserted tabs again
clasohm
parents: 1458
diff changeset
    20
  val dest_inclass	: term -> typ * class
5a6f2aabd538 inserted tabs again
clasohm
parents: 1458
diff changeset
    21
  val dest_type		: term -> typ
5a6f2aabd538 inserted tabs again
clasohm
parents: 1458
diff changeset
    22
  val flatten_params	: int -> term -> term
5a6f2aabd538 inserted tabs again
clasohm
parents: 1458
diff changeset
    23
  val incr_indexes	: typ list * int -> term -> term
3963
29c5ec9ecbaa Corrected alphabetical order of entries in signature.
nipkow
parents: 3915
diff changeset
    24
  val is_equals         : term -> bool
1460
5a6f2aabd538 inserted tabs again
clasohm
parents: 1458
diff changeset
    25
  val lift_fns		: term * int -> (term -> term) * (term -> term)
5a6f2aabd538 inserted tabs again
clasohm
parents: 1458
diff changeset
    26
  val list_flexpairs	: (term*term)list * term -> term
5a6f2aabd538 inserted tabs again
clasohm
parents: 1458
diff changeset
    27
  val list_implies	: term list * term -> term
0
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
    28
  val list_rename_params: string list * term -> term
4116
42606637f87f logic: loops -> rewrite_rule_ok
nipkow
parents: 3963
diff changeset
    29
  val rewrite_rule_extra_vars: term list -> term -> term -> string option
42606637f87f logic: loops -> rewrite_rule_ok
nipkow
parents: 3963
diff changeset
    30
  val rewrite_rule_ok   : Sign.sg -> term list -> term -> term
3893
5a1f22e7b359 The simplifier has been improved a little: equations s=t which used to be
nipkow
parents: 3408
diff changeset
    31
                          -> string option * bool
1460
5a6f2aabd538 inserted tabs again
clasohm
parents: 1458
diff changeset
    32
  val mk_equals		: term * term -> term
5a6f2aabd538 inserted tabs again
clasohm
parents: 1458
diff changeset
    33
  val mk_flexpair	: term * term -> term
5a6f2aabd538 inserted tabs again
clasohm
parents: 1458
diff changeset
    34
  val mk_implies	: term * term -> term
5a6f2aabd538 inserted tabs again
clasohm
parents: 1458
diff changeset
    35
  val mk_inclass	: typ * class -> term
5a6f2aabd538 inserted tabs again
clasohm
parents: 1458
diff changeset
    36
  val mk_type		: typ -> term
5a6f2aabd538 inserted tabs again
clasohm
parents: 1458
diff changeset
    37
  val occs		: term * term -> bool
5a6f2aabd538 inserted tabs again
clasohm
parents: 1458
diff changeset
    38
  val rule_of		: (term*term)list * term list * term -> term
5a6f2aabd538 inserted tabs again
clasohm
parents: 1458
diff changeset
    39
  val set_rename_prefix	: string -> unit   
5a6f2aabd538 inserted tabs again
clasohm
parents: 1458
diff changeset
    40
  val skip_flexpairs	: term -> term
0
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
    41
  val strip_assums_concl: term -> term
1460
5a6f2aabd538 inserted tabs again
clasohm
parents: 1458
diff changeset
    42
  val strip_assums_hyp	: term -> term list
5a6f2aabd538 inserted tabs again
clasohm
parents: 1458
diff changeset
    43
  val strip_flexpairs	: term -> (term*term)list * term
5a6f2aabd538 inserted tabs again
clasohm
parents: 1458
diff changeset
    44
  val strip_horn	: term -> (term*term)list * term list * term
5a6f2aabd538 inserted tabs again
clasohm
parents: 1458
diff changeset
    45
  val strip_imp_concl	: term -> term
5a6f2aabd538 inserted tabs again
clasohm
parents: 1458
diff changeset
    46
  val strip_imp_prems	: term -> term list
5a6f2aabd538 inserted tabs again
clasohm
parents: 1458
diff changeset
    47
  val strip_params	: term -> (string * typ) list
5a6f2aabd538 inserted tabs again
clasohm
parents: 1458
diff changeset
    48
  val strip_prems	: int * term list * term -> term list * term
2508
ce48daa388a7 added term order;
wenzelm
parents: 2266
diff changeset
    49
  val unvarify		: term -> term
ce48daa388a7 added term order;
wenzelm
parents: 2266
diff changeset
    50
  val varify		: term -> term
4345
7e9436ffb813 tuned term order;
wenzelm
parents: 4318
diff changeset
    51
end;
0
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
    52
1500
b2de3b3277b8 Elimination of fully-functorial style.
paulson
parents: 1460
diff changeset
    53
structure Logic : LOGIC =
0
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
    54
struct
398
41f279b477e2 added mk_type, dest_type, mk_inclass, dest_inclass (for axclasses);
wenzelm
parents: 210
diff changeset
    55
4345
7e9436ffb813 tuned term order;
wenzelm
parents: 4318
diff changeset
    56
0
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
    57
(*** Abstract syntax operations on the meta-connectives ***)
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
    58
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
    59
(** equality **)
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
    60
1835
07eee14f5bd4 Restored warning comment
paulson
parents: 1500
diff changeset
    61
(*Make an equality.  DOES NOT CHECK TYPE OF u*)
64
0bbe5d86cb38 logic/mk_equals,mk_flexpair: now calls fastype_of instead of type_of.
lcp
parents: 0
diff changeset
    62
fun mk_equals(t,u) = equals(fastype_of t) $ t $ u;
0
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
    63
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
    64
fun dest_equals (Const("==",_) $ t $ u)  =  (t,u)
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
    65
  | dest_equals t = raise TERM("dest_equals", [t]);
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
    66
637
b344bf624143 added is_equals: term -> bool;
wenzelm
parents: 585
diff changeset
    67
fun is_equals (Const ("==", _) $ _ $ _) = true
b344bf624143 added is_equals: term -> bool;
wenzelm
parents: 585
diff changeset
    68
  | is_equals _ = false;
b344bf624143 added is_equals: term -> bool;
wenzelm
parents: 585
diff changeset
    69
b344bf624143 added is_equals: term -> bool;
wenzelm
parents: 585
diff changeset
    70
0
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
    71
(** implies **)
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
    72
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
    73
fun mk_implies(A,B) = implies $ A $ B;
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
    74
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
    75
fun dest_implies (Const("==>",_) $ A $ B)  =  (A,B)
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
    76
  | dest_implies A = raise TERM("dest_implies", [A]);
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
    77
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
    78
(** nested implications **)
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
    79
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
    80
(* [A1,...,An], B  goes to  A1==>...An==>B  *)
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
    81
fun list_implies ([], B) = B : term
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
    82
  | list_implies (A::AS, B) = implies $ A $ list_implies(AS,B);
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
    83
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
    84
(* A1==>...An==>B  goes to  [A1,...,An], where B is not an implication *)
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
    85
fun strip_imp_prems (Const("==>", _) $ A $ B) = A :: strip_imp_prems B
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
    86
  | strip_imp_prems _ = [];
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
    87
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
    88
(* A1==>...An==>B  goes to B, where B is not an implication *)
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
    89
fun strip_imp_concl (Const("==>", _) $ A $ B) = strip_imp_concl B
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
    90
  | strip_imp_concl A = A : term;
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
    91
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
    92
(*Strip and return premises: (i, [], A1==>...Ai==>B)
1460
5a6f2aabd538 inserted tabs again
clasohm
parents: 1458
diff changeset
    93
    goes to   ([Ai, A(i-1),...,A1] , B) 	(REVERSED) 
0
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
    94
  if  i<0 or else i too big then raises  TERM*)
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
    95
fun strip_prems (0, As, B) = (As, B) 
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
    96
  | strip_prems (i, As, Const("==>", _) $ A $ B) = 
1460
5a6f2aabd538 inserted tabs again
clasohm
parents: 1458
diff changeset
    97
	strip_prems (i-1, A::As, B)
0
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
    98
  | strip_prems (_, As, A) = raise TERM("strip_prems", A::As);
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
    99
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   100
(*Count premises -- quicker than (length ostrip_prems) *)
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   101
fun count_prems (Const("==>", _) $ A $ B, n) = count_prems (B,n+1)
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   102
  | count_prems (_,n) = n;
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   103
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   104
(** flex-flex constraints **)
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   105
64
0bbe5d86cb38 logic/mk_equals,mk_flexpair: now calls fastype_of instead of type_of.
lcp
parents: 0
diff changeset
   106
(*Make a constraint.*)
0bbe5d86cb38 logic/mk_equals,mk_flexpair: now calls fastype_of instead of type_of.
lcp
parents: 0
diff changeset
   107
fun mk_flexpair(t,u) = flexpair(fastype_of t) $ t $ u;
0
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   108
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   109
fun dest_flexpair (Const("=?=",_) $ t $ u)  =  (t,u)
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   110
  | dest_flexpair t = raise TERM("dest_flexpair", [t]);
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   111
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   112
(*make flexflex antecedents: ( [(a1,b1),...,(an,bn)] , C )
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   113
    goes to (a1=?=b1) ==>...(an=?=bn)==>C *)
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   114
fun list_flexpairs ([], A) = A
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   115
  | list_flexpairs ((t,u)::pairs, A) =
1460
5a6f2aabd538 inserted tabs again
clasohm
parents: 1458
diff changeset
   116
	implies $ (mk_flexpair(t,u)) $ list_flexpairs(pairs,A);
0
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   117
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   118
(*Make the object-rule tpairs==>As==>B   *)
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   119
fun rule_of (tpairs, As, B) = list_flexpairs(tpairs, list_implies(As, B));
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   120
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   121
(*Remove and return flexflex pairs: 
1460
5a6f2aabd538 inserted tabs again
clasohm
parents: 1458
diff changeset
   122
    (a1=?=b1)==>...(an=?=bn)==>C  to  ( [(a1,b1),...,(an,bn)] , C )	
0
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   123
  [Tail recursive in order to return a pair of results] *)
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   124
fun strip_flex_aux (pairs, Const("==>", _) $ (Const("=?=",_)$t$u) $ C) =
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   125
        strip_flex_aux ((t,u)::pairs, C)
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   126
  | strip_flex_aux (pairs,C) = (rev pairs, C);
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   127
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   128
fun strip_flexpairs A = strip_flex_aux([], A);
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   129
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   130
(*Discard flexflex pairs*)
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   131
fun skip_flexpairs (Const("==>", _) $ (Const("=?=",_)$_$_) $ C) =
1460
5a6f2aabd538 inserted tabs again
clasohm
parents: 1458
diff changeset
   132
	skip_flexpairs C
0
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   133
  | skip_flexpairs C = C;
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   134
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   135
(*strip a proof state (Horn clause): 
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   136
   (a1==b1)==>...(am==bm)==>B1==>...Bn==>C
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   137
    goes to   ( [(a1,b1),...,(am,bm)] , [B1,...,Bn] , C)    *)
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   138
fun strip_horn A =
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   139
  let val (tpairs,horn) = strip_flexpairs A 
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   140
  in  (tpairs, strip_imp_prems horn, strip_imp_concl horn)   end;
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   141
398
41f279b477e2 added mk_type, dest_type, mk_inclass, dest_inclass (for axclasses);
wenzelm
parents: 210
diff changeset
   142
(** types as terms **)
41f279b477e2 added mk_type, dest_type, mk_inclass, dest_inclass (for axclasses);
wenzelm
parents: 210
diff changeset
   143
41f279b477e2 added mk_type, dest_type, mk_inclass, dest_inclass (for axclasses);
wenzelm
parents: 210
diff changeset
   144
fun mk_type ty = Const ("TYPE", itselfT ty);
41f279b477e2 added mk_type, dest_type, mk_inclass, dest_inclass (for axclasses);
wenzelm
parents: 210
diff changeset
   145
41f279b477e2 added mk_type, dest_type, mk_inclass, dest_inclass (for axclasses);
wenzelm
parents: 210
diff changeset
   146
fun dest_type (Const ("TYPE", Type ("itself", [ty]))) = ty
41f279b477e2 added mk_type, dest_type, mk_inclass, dest_inclass (for axclasses);
wenzelm
parents: 210
diff changeset
   147
  | dest_type t = raise TERM ("dest_type", [t]);
41f279b477e2 added mk_type, dest_type, mk_inclass, dest_inclass (for axclasses);
wenzelm
parents: 210
diff changeset
   148
447
d1f827fa0a18 changed comment only;
wenzelm
parents: 398
diff changeset
   149
(** class constraints **)
398
41f279b477e2 added mk_type, dest_type, mk_inclass, dest_inclass (for axclasses);
wenzelm
parents: 210
diff changeset
   150
41f279b477e2 added mk_type, dest_type, mk_inclass, dest_inclass (for axclasses);
wenzelm
parents: 210
diff changeset
   151
fun mk_inclass (ty, c) =
41f279b477e2 added mk_type, dest_type, mk_inclass, dest_inclass (for axclasses);
wenzelm
parents: 210
diff changeset
   152
  Const (Sign.const_of_class c, itselfT ty --> propT) $ mk_type ty;
41f279b477e2 added mk_type, dest_type, mk_inclass, dest_inclass (for axclasses);
wenzelm
parents: 210
diff changeset
   153
41f279b477e2 added mk_type, dest_type, mk_inclass, dest_inclass (for axclasses);
wenzelm
parents: 210
diff changeset
   154
fun dest_inclass (t as Const (c_class, _) $ ty) =
41f279b477e2 added mk_type, dest_type, mk_inclass, dest_inclass (for axclasses);
wenzelm
parents: 210
diff changeset
   155
      ((dest_type ty, Sign.class_of_const c_class)
41f279b477e2 added mk_type, dest_type, mk_inclass, dest_inclass (for axclasses);
wenzelm
parents: 210
diff changeset
   156
        handle TERM _ => raise TERM ("dest_inclass", [t]))
41f279b477e2 added mk_type, dest_type, mk_inclass, dest_inclass (for axclasses);
wenzelm
parents: 210
diff changeset
   157
  | dest_inclass t = raise TERM ("dest_inclass", [t]);
41f279b477e2 added mk_type, dest_type, mk_inclass, dest_inclass (for axclasses);
wenzelm
parents: 210
diff changeset
   158
0
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   159
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   160
(*** Low-level term operations ***)
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   161
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   162
(*Does t occur in u?  Or is alpha-convertible to u?
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   163
  The term t must contain no loose bound variables*)
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   164
fun t occs u = (t aconv u) orelse 
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   165
      (case u of
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   166
          Abs(_,_,body) => t occs body
1460
5a6f2aabd538 inserted tabs again
clasohm
parents: 1458
diff changeset
   167
	| f$t' => t occs f  orelse  t occs t'
5a6f2aabd538 inserted tabs again
clasohm
parents: 1458
diff changeset
   168
	| _ => false);
0
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   169
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   170
(*Close up a formula over all free variables by quantification*)
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   171
fun close_form A =
4443
d55e85d7f0c2 term order stuff moved to term.ML;
wenzelm
parents: 4345
diff changeset
   172
  list_all_free (sort_wrt fst (map dest_Free (term_frees A)), A);
0
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   173
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   174
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   175
(*** Specialized operations for resolution... ***)
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   176
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   177
(*For all variables in the term, increment indexnames and lift over the Us
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   178
    result is ?Gidx(B.(lev+n-1),...,B.lev) where lev is abstraction level *)
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   179
fun incr_indexes (Us: typ list, inc:int) t = 
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   180
  let fun incr (Var ((a,i), T), lev) = 
1460
5a6f2aabd538 inserted tabs again
clasohm
parents: 1458
diff changeset
   181
		Unify.combound (Var((a, i+inc), Us---> incr_tvar inc T),
5a6f2aabd538 inserted tabs again
clasohm
parents: 1458
diff changeset
   182
				lev, length Us)
5a6f2aabd538 inserted tabs again
clasohm
parents: 1458
diff changeset
   183
	| incr (Abs (a,T,body), lev) =
5a6f2aabd538 inserted tabs again
clasohm
parents: 1458
diff changeset
   184
		Abs (a, incr_tvar inc T, incr(body,lev+1))
5a6f2aabd538 inserted tabs again
clasohm
parents: 1458
diff changeset
   185
	| incr (Const(a,T),_) = Const(a, incr_tvar inc T)
5a6f2aabd538 inserted tabs again
clasohm
parents: 1458
diff changeset
   186
	| incr (Free(a,T),_) = Free(a, incr_tvar inc T)
5a6f2aabd538 inserted tabs again
clasohm
parents: 1458
diff changeset
   187
	| incr (f$t, lev) = incr(f,lev) $ incr(t,lev)
5a6f2aabd538 inserted tabs again
clasohm
parents: 1458
diff changeset
   188
	| incr (t,lev) = t
0
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   189
  in  incr(t,0)  end;
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   190
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   191
(*Make lifting functions from subgoal and increment.
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   192
    lift_abs operates on tpairs (unification constraints)
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   193
    lift_all operates on propositions     *)
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   194
fun lift_fns (B,inc) =
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   195
  let fun lift_abs (Us, Const("==>", _) $ _ $ B) u = lift_abs (Us,B) u
1460
5a6f2aabd538 inserted tabs again
clasohm
parents: 1458
diff changeset
   196
	| lift_abs (Us, Const("all",_)$Abs(a,T,t)) u =
5a6f2aabd538 inserted tabs again
clasohm
parents: 1458
diff changeset
   197
	      Abs(a, T, lift_abs (T::Us, t) u)
5a6f2aabd538 inserted tabs again
clasohm
parents: 1458
diff changeset
   198
	| lift_abs (Us, _) u = incr_indexes(rev Us, inc) u
0
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   199
      fun lift_all (Us, Const("==>", _) $ A $ B) u =
1460
5a6f2aabd538 inserted tabs again
clasohm
parents: 1458
diff changeset
   200
	      implies $ A $ lift_all (Us,B) u
5a6f2aabd538 inserted tabs again
clasohm
parents: 1458
diff changeset
   201
	| lift_all (Us, Const("all",_)$Abs(a,T,t)) u = 
5a6f2aabd538 inserted tabs again
clasohm
parents: 1458
diff changeset
   202
	      all T $ Abs(a, T, lift_all (T::Us,t) u)
5a6f2aabd538 inserted tabs again
clasohm
parents: 1458
diff changeset
   203
	| lift_all (Us, _) u = incr_indexes(rev Us, inc) u;
0
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   204
  in  (lift_abs([],B), lift_all([],B))  end;
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   205
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   206
(*Strips assumptions in goal, yielding list of hypotheses.   *)
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   207
fun strip_assums_hyp (Const("==>", _) $ H $ B) = H :: strip_assums_hyp B
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   208
  | strip_assums_hyp (Const("all",_)$Abs(a,T,t)) = strip_assums_hyp t
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   209
  | strip_assums_hyp B = [];
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   210
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   211
(*Strips assumptions in goal, yielding conclusion.   *)
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   212
fun strip_assums_concl (Const("==>", _) $ H $ B) = strip_assums_concl B
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   213
  | strip_assums_concl (Const("all",_)$Abs(a,T,t)) = strip_assums_concl t
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   214
  | strip_assums_concl B = B;
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   215
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   216
(*Make a list of all the parameters in a subgoal, even if nested*)
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   217
fun strip_params (Const("==>", _) $ H $ B) = strip_params B
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   218
  | strip_params (Const("all",_)$Abs(a,T,t)) = (a,T) :: strip_params t
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   219
  | strip_params B = [];
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   220
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   221
(*Removes the parameters from a subgoal and renumber bvars in hypotheses,
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   222
    where j is the total number of parameters (precomputed) 
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   223
  If n>0 then deletes assumption n. *)
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   224
fun remove_params j n A = 
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   225
    if j=0 andalso n<=0 then A  (*nothing left to do...*)
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   226
    else case A of
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   227
        Const("==>", _) $ H $ B => 
1460
5a6f2aabd538 inserted tabs again
clasohm
parents: 1458
diff changeset
   228
	  if n=1 then                           (remove_params j (n-1) B)
5a6f2aabd538 inserted tabs again
clasohm
parents: 1458
diff changeset
   229
	  else implies $ (incr_boundvars j H) $ (remove_params j (n-1) B)
0
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   230
      | Const("all",_)$Abs(a,T,t) => remove_params (j-1) n t
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   231
      | _ => if n>0 then raise TERM("remove_params", [A])
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   232
             else A;
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   233
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   234
(** Auto-renaming of parameters in subgoals **)
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   235
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   236
val auto_rename = ref false
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   237
and rename_prefix = ref "ka";
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   238
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   239
(*rename_prefix is not exported; it is set by this function.*)
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   240
fun set_rename_prefix a =
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   241
    if a<>"" andalso forall is_letter (explode a)
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   242
    then  (rename_prefix := a;  auto_rename := true)
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   243
    else  error"rename prefix must be nonempty and consist of letters";
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   244
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   245
(*Makes parameters in a goal have distinctive names (not guaranteed unique!)
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   246
  A name clash could cause the printer to rename bound vars;
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   247
    then res_inst_tac would not work properly.*)
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   248
fun rename_vars (a, []) = []
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   249
  | rename_vars (a, (_,T)::vars) =
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   250
        (a,T) :: rename_vars (bump_string a, vars);
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   251
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   252
(*Move all parameters to the front of the subgoal, renaming them apart;
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   253
  if n>0 then deletes assumption n. *)
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   254
fun flatten_params n A =
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   255
    let val params = strip_params A;
1460
5a6f2aabd538 inserted tabs again
clasohm
parents: 1458
diff changeset
   256
	val vars = if !auto_rename 
5a6f2aabd538 inserted tabs again
clasohm
parents: 1458
diff changeset
   257
		   then rename_vars (!rename_prefix, params)
2266
82aef6857c5b Replaced map...~~ by ListPair.map
paulson
parents: 1835
diff changeset
   258
		   else ListPair.zip (variantlist(map #1 params,[]),
82aef6857c5b Replaced map...~~ by ListPair.map
paulson
parents: 1835
diff changeset
   259
				      map #2 params)
0
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   260
    in  list_all (vars, remove_params (length vars) n A)
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   261
    end;
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   262
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   263
(*Makes parameters in a goal have the names supplied by the list cs.*)
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   264
fun list_rename_params (cs, Const("==>", _) $ A $ B) =
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   265
      implies $ A $ list_rename_params (cs, B)
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   266
  | list_rename_params (c::cs, Const("all",_)$Abs(_,T,t)) = 
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   267
      all T $ Abs(c, T, list_rename_params (cs, t))
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   268
  | list_rename_params (cs, B) = B;
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   269
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   270
(*Strips assumptions in goal yielding  ( [Hn,...,H1], [xm,...,x1], B )
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   271
  where H1,...,Hn are the hypotheses and x1...xm are the parameters.   *)
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   272
fun strip_assums_aux (Hs, params, Const("==>", _) $ H $ B) = 
1460
5a6f2aabd538 inserted tabs again
clasohm
parents: 1458
diff changeset
   273
	strip_assums_aux (H::Hs, params, B)
0
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   274
  | strip_assums_aux (Hs, params, Const("all",_)$Abs(a,T,t)) =
1460
5a6f2aabd538 inserted tabs again
clasohm
parents: 1458
diff changeset
   275
	strip_assums_aux (Hs, (a,T)::params, t)
0
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   276
  | strip_assums_aux (Hs, params, B) = (Hs, params, B);
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   277
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   278
fun strip_assums A = strip_assums_aux ([],[],A);
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   279
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   280
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   281
(*Produces disagreement pairs, one for each assumption proof, in order.
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   282
  A is the first premise of the lifted rule, and thus has the form
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   283
    H1 ==> ... Hk ==> B   and the pairs are (H1,B),...,(Hk,B) *)
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   284
fun assum_pairs A =
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   285
  let val (Hs, params, B) = strip_assums A
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   286
      val D = Unify.rlist_abs(params, B)
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   287
      fun pairrev ([],pairs) = pairs  
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   288
        | pairrev (H::Hs,pairs) = 
1460
5a6f2aabd538 inserted tabs again
clasohm
parents: 1458
diff changeset
   289
	    pairrev(Hs, (Unify.rlist_abs(params,H), D) :: pairs)
0
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   290
  in  pairrev (Hs,[])   (*WAS:  map pair (rev Hs)  *)
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   291
  end;
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   292
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   293
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   294
(*Converts Frees to Vars and TFrees to TVars so that axioms can be written
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   295
  without (?) everywhere*)
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   296
fun varify (Const(a,T)) = Const(a, Type.varifyT T)
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   297
  | varify (Free(a,T)) = Var((a,0), Type.varifyT T)
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   298
  | varify (Var(ixn,T)) = Var(ixn, Type.varifyT T)
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   299
  | varify (Abs (a,T,body)) = Abs (a, Type.varifyT T, varify body)
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   300
  | varify (f$t) = varify f $ varify t
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   301
  | varify t = t;
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   302
546
36e40454e03e /unvarifyT, unvarify: moved to Pure/logic.ML
lcp
parents: 447
diff changeset
   303
(*Inverse of varify.  Converts axioms back to their original form.*)
585
409c9ee7a9f3 Pure/type/unvarifyT: moved there from logic.ML
lcp
parents: 546
diff changeset
   304
fun unvarify (Const(a,T))    = Const(a, Type.unvarifyT T)
409c9ee7a9f3 Pure/type/unvarifyT: moved there from logic.ML
lcp
parents: 546
diff changeset
   305
  | unvarify (Var((a,0), T)) = Free(a, Type.unvarifyT T)
409c9ee7a9f3 Pure/type/unvarifyT: moved there from logic.ML
lcp
parents: 546
diff changeset
   306
  | unvarify (Var(ixn,T))    = Var(ixn, Type.unvarifyT T)  (*non-0 index!*)
409c9ee7a9f3 Pure/type/unvarifyT: moved there from logic.ML
lcp
parents: 546
diff changeset
   307
  | unvarify (Abs (a,T,body)) = Abs (a, Type.unvarifyT T, unvarify body)
546
36e40454e03e /unvarifyT, unvarify: moved to Pure/logic.ML
lcp
parents: 447
diff changeset
   308
  | unvarify (f$t) = unvarify f $ unvarify t
36e40454e03e /unvarifyT, unvarify: moved to Pure/logic.ML
lcp
parents: 447
diff changeset
   309
  | unvarify t = t;
36e40454e03e /unvarifyT, unvarify: moved to Pure/logic.ML
lcp
parents: 447
diff changeset
   310
2508
ce48daa388a7 added term order;
wenzelm
parents: 2266
diff changeset
   311
ce48daa388a7 added term order;
wenzelm
parents: 2266
diff changeset
   312
4116
42606637f87f logic: loops -> rewrite_rule_ok
nipkow
parents: 3963
diff changeset
   313
(** Test wellformedness of rewrite rules **)
3893
5a1f22e7b359 The simplifier has been improved a little: equations s=t which used to be
nipkow
parents: 3408
diff changeset
   314
5a1f22e7b359 The simplifier has been improved a little: equations s=t which used to be
nipkow
parents: 3408
diff changeset
   315
fun vperm (Var _, Var _) = true
5a1f22e7b359 The simplifier has been improved a little: equations s=t which used to be
nipkow
parents: 3408
diff changeset
   316
  | vperm (Abs (_, _, s), Abs (_, _, t)) = vperm (s, t)
5a1f22e7b359 The simplifier has been improved a little: equations s=t which used to be
nipkow
parents: 3408
diff changeset
   317
  | vperm (t1 $ t2, u1 $ u2) = vperm (t1, u1) andalso vperm (t2, u2)
5a1f22e7b359 The simplifier has been improved a little: equations s=t which used to be
nipkow
parents: 3408
diff changeset
   318
  | vperm (t, u) = (t = u);
5a1f22e7b359 The simplifier has been improved a little: equations s=t which used to be
nipkow
parents: 3408
diff changeset
   319
5a1f22e7b359 The simplifier has been improved a little: equations s=t which used to be
nipkow
parents: 3408
diff changeset
   320
fun var_perm (t, u) =
5a1f22e7b359 The simplifier has been improved a little: equations s=t which used to be
nipkow
parents: 3408
diff changeset
   321
  vperm (t, u) andalso eq_set_term (term_vars t, term_vars u);
5a1f22e7b359 The simplifier has been improved a little: equations s=t which used to be
nipkow
parents: 3408
diff changeset
   322
5a1f22e7b359 The simplifier has been improved a little: equations s=t which used to be
nipkow
parents: 3408
diff changeset
   323
(*simple test for looping rewrite*)
5a1f22e7b359 The simplifier has been improved a little: equations s=t which used to be
nipkow
parents: 3408
diff changeset
   324
fun looptest sign prems lhs rhs =
5a1f22e7b359 The simplifier has been improved a little: equations s=t which used to be
nipkow
parents: 3408
diff changeset
   325
   is_Var (head_of lhs)
5a1f22e7b359 The simplifier has been improved a little: equations s=t which used to be
nipkow
parents: 3408
diff changeset
   326
  orelse
3915
0eb9b9dd4de6 Added "op" before "occs" to make sml/nj happy
paulson
parents: 3893
diff changeset
   327
   (exists (apl (lhs, op occs)) (rhs :: prems))
3893
5a1f22e7b359 The simplifier has been improved a little: equations s=t which used to be
nipkow
parents: 3408
diff changeset
   328
  orelse
5a1f22e7b359 The simplifier has been improved a little: equations s=t which used to be
nipkow
parents: 3408
diff changeset
   329
   (null prems andalso
5a1f22e7b359 The simplifier has been improved a little: equations s=t which used to be
nipkow
parents: 3408
diff changeset
   330
    Pattern.matches (#tsig (Sign.rep_sg sign)) (lhs, rhs));
5a1f22e7b359 The simplifier has been improved a little: equations s=t which used to be
nipkow
parents: 3408
diff changeset
   331
(*the condition "null prems" in the last case is necessary because
5a1f22e7b359 The simplifier has been improved a little: equations s=t which used to be
nipkow
parents: 3408
diff changeset
   332
  conditional rewrites with extra variables in the conditions may terminate
5a1f22e7b359 The simplifier has been improved a little: equations s=t which used to be
nipkow
parents: 3408
diff changeset
   333
  although the rhs is an instance of the lhs. Example:
5a1f22e7b359 The simplifier has been improved a little: equations s=t which used to be
nipkow
parents: 3408
diff changeset
   334
  ?m < ?n ==> f(?n) == f(?m)*)
5a1f22e7b359 The simplifier has been improved a little: equations s=t which used to be
nipkow
parents: 3408
diff changeset
   335
4116
42606637f87f logic: loops -> rewrite_rule_ok
nipkow
parents: 3963
diff changeset
   336
fun rewrite_rule_extra_vars prems elhs erhs =
42606637f87f logic: loops -> rewrite_rule_ok
nipkow
parents: 3963
diff changeset
   337
  if not ((term_vars erhs) subset
42606637f87f logic: loops -> rewrite_rule_ok
nipkow
parents: 3963
diff changeset
   338
          (union_term (term_vars elhs, List.concat(map term_vars prems))))
42606637f87f logic: loops -> rewrite_rule_ok
nipkow
parents: 3963
diff changeset
   339
  then Some("extra Var(s) on rhs") else
42606637f87f logic: loops -> rewrite_rule_ok
nipkow
parents: 3963
diff changeset
   340
  if not ((term_tvars erhs) subset
42606637f87f logic: loops -> rewrite_rule_ok
nipkow
parents: 3963
diff changeset
   341
          (term_tvars elhs  union  List.concat(map term_tvars prems)))
42606637f87f logic: loops -> rewrite_rule_ok
nipkow
parents: 3963
diff changeset
   342
  then Some("extra TVar(s) on rhs")
42606637f87f logic: loops -> rewrite_rule_ok
nipkow
parents: 3963
diff changeset
   343
  else None;
42606637f87f logic: loops -> rewrite_rule_ok
nipkow
parents: 3963
diff changeset
   344
42606637f87f logic: loops -> rewrite_rule_ok
nipkow
parents: 3963
diff changeset
   345
fun rewrite_rule_ok sign prems lhs rhs =
3893
5a1f22e7b359 The simplifier has been improved a little: equations s=t which used to be
nipkow
parents: 3408
diff changeset
   346
  let
5a1f22e7b359 The simplifier has been improved a little: equations s=t which used to be
nipkow
parents: 3408
diff changeset
   347
    val elhs = Pattern.eta_contract lhs;
5a1f22e7b359 The simplifier has been improved a little: equations s=t which used to be
nipkow
parents: 3408
diff changeset
   348
    val erhs = Pattern.eta_contract rhs;
5a1f22e7b359 The simplifier has been improved a little: equations s=t which used to be
nipkow
parents: 3408
diff changeset
   349
    val perm = var_perm (elhs, erhs) andalso not (elhs aconv erhs)
5a1f22e7b359 The simplifier has been improved a little: equations s=t which used to be
nipkow
parents: 3408
diff changeset
   350
               andalso not (is_Var elhs)
4116
42606637f87f logic: loops -> rewrite_rule_ok
nipkow
parents: 3963
diff changeset
   351
  in (case rewrite_rule_extra_vars prems elhs erhs of
42606637f87f logic: loops -> rewrite_rule_ok
nipkow
parents: 3963
diff changeset
   352
        None => if not perm andalso looptest sign prems elhs erhs
42606637f87f logic: loops -> rewrite_rule_ok
nipkow
parents: 3963
diff changeset
   353
                then Some("loops")
42606637f87f logic: loops -> rewrite_rule_ok
nipkow
parents: 3963
diff changeset
   354
                else None
42606637f87f logic: loops -> rewrite_rule_ok
nipkow
parents: 3963
diff changeset
   355
      | some => some
3893
5a1f22e7b359 The simplifier has been improved a little: equations s=t which used to be
nipkow
parents: 3408
diff changeset
   356
      ,perm)
5a1f22e7b359 The simplifier has been improved a little: equations s=t which used to be
nipkow
parents: 3408
diff changeset
   357
  end;
5a1f22e7b359 The simplifier has been improved a little: equations s=t which used to be
nipkow
parents: 3408
diff changeset
   358
0
a5a9c433f639 Initial revision
clasohm
parents:
diff changeset
   359
end;