src/HOL/Tools/ATP/recon_order_clauses.ML
author paulson
Fri, 08 Apr 2005 18:43:39 +0200
changeset 15684 5ec4d21889d6
parent 15642 028059faa963
child 15697 681bcb7f0389
permissions -rw-r--r--
Reconstruction code, now packaged to avoid name clashes
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
15642
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
     1
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
     2
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
     3
(*----------------------------------------------*)
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
     4
(* Reorder clauses for use in binary resolution *)
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
     5
(*----------------------------------------------*)
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
     6
fun take n [] = []
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
     7
|   take n (x::xs) = (if n = 0 then [] else (x::(take (n - 1) xs)))
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
     8
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
     9
fun drop n [] = []
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
    10
|   drop n (x::xs) = (if n = 0 then (x::xs) else drop (n-1) xs)
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
    11
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
    12
fun remove n [] = []
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
    13
|   remove n (x::xs) = List.filter (not_equal n) (x::xs);
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
    14
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
    15
fun remove_nth n [] = []
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
    16
|   remove_nth n (x::xs) = (take (n -1) (x::xs))@(drop n (x::xs))
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
    17
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
    18
fun get_nth n (x::xs) = hd (drop (n-1) (x::xs))
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
    19
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
    20
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
    21
 fun literals (Const("Trueprop",_) $ P) = literals P
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
    22
   | literals (Const("op |",_) $ P $ Q) = literals P @ literals Q
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
    23
   | literals (Const("Not",_) $ P) = [(false,P)]
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
    24
   | literals P = [(true,P)];
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
    25
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
    26
 (*number of literals in a term*)
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
    27
 val nliterals = length o literals; 
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
    28
     
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
    29
exception Not_in_list;  
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
    30
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
    31
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
    32
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
    33
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
    34
   (* get the literals from a disjunctive clause *)
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
    35
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
    36
(*fun get_disj_literals t = if is_disj t then
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
    37
			           let 
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
    38
                                      val {disj1, disj2} = dest_disj t  
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
    39
                                   in 
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
    40
                                      disj1::(get_disj_literals disj2)
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
    41
                                   end
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
    42
                                else
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
    43
                                    ([t])
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
    44
   
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
    45
*)
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
    46
             
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
    47
(*
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
    48
(* gives horn clause with kth disj as concl (starting at 1) *)
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
    49
fun rots (0,th) =  (Meson.make_horn Meson.crules th)
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
    50
         | rots (k,th) = rots(k-1, assoc_right (th RS disj_comm))
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
    51
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
    52
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
    53
                
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
    54
Goal " (~~P) == P";
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
    55
by Auto_tac;
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
    56
qed "notnotEq";
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
    57
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
    58
Goal "A | A ==> A";
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
    59
by Auto_tac;
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
    60
qed "rem_dup_disj";
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
    61
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
    62
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
    63
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
    64
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
    65
(* New Meson code  Versions of make_neg_rule and make_pos_rule that don't insert new *)
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
    66
(* assumptions, for ordinary resolution. *)
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
    67
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
    68
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
    69
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
    70
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
    71
 val not_conjD = thm "meson_not_conjD";
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
    72
 val not_disjD = thm "meson_not_disjD";
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
    73
 val not_notD = thm "meson_not_notD";
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
    74
 val not_allD = thm "meson_not_allD";
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
    75
 val not_exD = thm "meson_not_exD";
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
    76
 val imp_to_disjD = thm "meson_imp_to_disjD";
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
    77
 val not_impD = thm "meson_not_impD";
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
    78
 val iff_to_disjD = thm "meson_iff_to_disjD";
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
    79
 val not_iffD = thm "meson_not_iffD";
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
    80
 val conj_exD1 = thm "meson_conj_exD1";
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
    81
 val conj_exD2 = thm "meson_conj_exD2";
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
    82
 val disj_exD = thm "meson_disj_exD";
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
    83
 val disj_exD1 = thm "meson_disj_exD1";
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
    84
 val disj_exD2 = thm "meson_disj_exD2";
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
    85
 val disj_assoc = thm "meson_disj_assoc";
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
    86
 val disj_comm = thm "meson_disj_comm";
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
    87
 val disj_FalseD1 = thm "meson_disj_FalseD1";
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
    88
 val disj_FalseD2 = thm "meson_disj_FalseD2";
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
    89
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
    90
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
    91
 fun literals (Const("Trueprop",_) $ P) = literals P
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
    92
   | literals (Const("op |",_) $ P $ Q) = literals P @ literals Q
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
    93
   | literals (Const("Not",_) $ P) = [(false,P)]
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
    94
   | literals P = [(true,P)];
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
    95
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
    96
 (*number of literals in a term*)
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
    97
 val nliterals = length o literals; 
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
    98
     
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
    99
exception Not_in_list;  
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   100
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   101
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   102
(*Permute a rule's premises to move the i-th premise to the last position.*)
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   103
fun make_last i th =
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   104
  let val n = nprems_of th 
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   105
  in  if 1 <= i andalso i <= n 
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   106
      then Thm.permute_prems (i-1) 1 th
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   107
      else raise THM("make_last", i, [th])
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   108
  end;
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   109
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   110
(*Maps a rule that ends "... ==> P ==> False" to "... ==> ~P" while suppressing
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   111
  double-negations.*)
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   112
val negate_head = rewrite_rule [atomize_not, not_not RS eq_reflection];
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   113
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   114
(*Maps the clause  [P1,...Pn]==>False to [P1,...,P(i-1),P(i+1),...Pn] ==> ~P*)
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   115
fun select_literal i cl = negate_head (make_last i cl);
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   116
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   117
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   118
(* get a meta-clause for resolution with correct order of literals *)
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   119
fun get_meta_cl  (th,n) = let val lits = nliterals(prop_of th)
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   120
                              val contra =  if lits = 1 
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   121
                                                 then
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   122
                                                     th
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   123
                                                 else
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   124
                                                     rots (n,th)   
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   125
                          in 
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   126
                               if lits = 1 
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   127
                               then
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   128
                                            
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   129
                                  contra
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   130
                               else
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   131
                                  rotate_prems (lits - n) contra
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   132
                          end
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   133
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   134
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   135
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   136
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   137
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   138
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   139
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   140
fun zip xs [] = []
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   141
|   zip xs (y::ys) = (case xs of [] => [] | (z::zs) => ((z,y)::zip zs ys))
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   142
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   143
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   144
fun unzip [] = ([],[])
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   145
    | unzip((x,y)::pairs) =
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   146
	  let val (xs,ys) = unzip pairs
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   147
	  in  (x::xs, y::ys)  end;
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   148
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   149
fun numlist 0 = []
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   150
|   numlist n = (numlist (n - 1))@[n]
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   151
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   152
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   153
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   154
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   155
fun last(x::xs) = if xs=[] then x else last xs
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   156
fun butlast []= []
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   157
|   butlast(x::xs) = if xs=[] then [] else (x::(butlast xs))
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   158
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   159
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   160
fun minus a b = b - a;
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   161
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   162
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   163
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   164
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   165
(* gives meta clause with kth disj as concl (starting at 1) *)
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   166
(*fun rots (0,th) = negate_nead (make_horn resolution_clause_rules  th)
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   167
         | rots (k,th) = rots(k-1, assoc_right (th RS disj_comm))*)
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   168
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   169
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   170
(* get a meta-clause for resolution with correct order of literals *)
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   171
fun get_meta_cl  (th,n) = let val lits = nliterals(prop_of th)
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   172
                                   val contra =  if lits = 1 
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   173
                                                 then
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   174
                                                     th
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   175
                                                 else
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   176
                                                     rots (n,th)   
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   177
                                in 
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   178
                                   if lits = 1 
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   179
                                   then
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   180
                                            
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   181
                                     contra
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   182
                                   else
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   183
                                     rotate_prems (lits - n) contra
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   184
                               end
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   185
*)
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   186
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   187
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   188
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   189
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   190
fun zip xs [] = []
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   191
|   zip xs (y::ys) = (case xs of [] => [] | (z::zs) => ((z,y)::zip zs ys))
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   192
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   193
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   194
fun unzip [] = ([],[])
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   195
    | unzip((x,y)::pairs) =
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   196
	  let val (xs,ys) = unzip pairs
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   197
	  in  (x::xs, y::ys)  end;
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   198
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   199
fun numlist 0 = []
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   200
|   numlist n = (numlist (n - 1))@[n]
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   201
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   202
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   203
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   204
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   205
fun last(x::xs) = if xs=[] then x else last xs
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   206
fun butlast []= []
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   207
|   butlast(x::xs) = if xs=[] then [] else (x::(butlast xs))
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   208
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   209
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   210
fun minus a b = b - a;
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   211
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   212
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   213
(* code to rearrange clauses so that they're the same as the parsed in SPASS version *)
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   214
15684
5ec4d21889d6 Reconstruction code, now packaged to avoid name clashes
paulson
parents: 15642
diff changeset
   215
fun assoc3 a [] = raise Recon_Base.Noassoc
15642
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   216
  | assoc3 a ((x, y, z)::t) = if a = x then z else assoc3 a t;
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   217
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   218
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   219
fun third (a,b,c) = c;
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   220
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   221
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   222
 fun takeUntil ch [] res  = (res, [])
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   223
 |   takeUntil ch (x::xs) res = if   x = ch 
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   224
                                then
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   225
                                     (res, xs)
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   226
                                else
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   227
                                     takeUntil ch xs (res@[x])
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   228
fun contains_eq str = inlist "=" str 
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   229
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   230
fun eq_not_neq str = let val uptoeq = fst(takeUntil "=" str [])
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   231
                     in
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   232
                        if ((last uptoeq) = "~")
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   233
                        then 
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   234
                            false
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   235
                        else
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   236
                            true
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   237
                     end
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   238
                   
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   239
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   240
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   241
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   242
fun get_eq_strs str =  if eq_not_neq  str   (*not an inequality *)
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   243
                       then 
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   244
                           let val (left, right) = takeUntil "=" str []
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   245
                           in
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   246
                               ((butlast left), (drop 1 right))
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   247
                           end
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   248
                       else                  (* is an inequality *)
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   249
                           let val (left, right) = takeUntil "~" str []
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   250
                           in 
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   251
                              ((butlast left), (drop 2 right))
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   252
                           end
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   253
                
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   254
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   255
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   256
fun switch_equal a x = let val (a_lhs, a_rhs) = get_eq_strs a
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   257
                           val (x_lhs, x_rhs) = get_eq_strs x
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   258
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   259
                       in
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   260
                           (a_lhs = x_rhs) andalso (a_rhs = x_lhs)
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   261
                       end
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   262
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   263
fun equal_pair (a,b) = equal a b
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   264
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   265
fun is_var_pair (a,b) vars = (a mem vars) andalso (b mem vars)
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   266
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   267
fun var_equiv vars (a,b)  = (equal_pair (a,b)) orelse (is_var_pair (a,b) vars)
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   268
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   269
fun all_true [] = false
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   270
|   all_true xs = let val falselist = List.filter (equal false ) xs 
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   271
                  in
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   272
                      falselist = []
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   273
                  end
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   274
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   275
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   276
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   277
fun var_pos_eq vars x y = let val xs = explode x
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   278
                              val ys = explode y
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   279
                          in
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   280
                              if not_equal (length xs) (length ys)
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   281
                              then 
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   282
                                  false
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   283
                              else
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   284
                                  let val xsys = zip xs ys
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   285
                                      val are_var_pairs = map (var_equiv vars) xsys
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   286
                                  in
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   287
                                      all_true are_var_pairs 
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   288
                                  end
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   289
                          end
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   290
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   291
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   292
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   293
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   294
fun  pos_in_list a [] allvars (pos_num, symlist, nsymlist) =  raise Not_in_list
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   295
    |pos_in_list a (x::[])  allvars (pos_num , symlist, nsymlist) = 
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   296
                                 let val y = explode x 
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   297
                                     val b = explode a
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   298
                                 in
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   299
                                    if  b = y
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   300
                                    then 
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   301
                                         (pos_num, symlist, nsymlist)
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   302
                                    else 
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   303
                                         if (var_pos_eq allvars  a x) (* Equal apart from meta-vars having different names *)
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   304
                                         then 
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   305
                                             (pos_num, symlist, nsymlist)
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   306
                                         else 
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   307
                                             if (contains_eq b) andalso (contains_eq y)
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   308
                                             then 
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   309
                                                 if (eq_not_neq b) andalso (eq_not_neq y)  andalso (switch_equal b y )   (* both are equalities and equal under sym*)        
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   310
                                                 then 
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   311
                                                     (pos_num, (pos_num::symlist), nsymlist)  (* add pos to symlist *)                                                                    else 
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   312
                                                      if not(eq_not_neq b) andalso not(eq_not_neq y) andalso  (switch_equal b y )  (* if they're equal under not_sym *)
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   313
                                                      then 
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   314
                                                          (pos_num, (symlist), (pos_num::nsymlist))(* add pos to nsymlist *)
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   315
                                                      else 
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   316
                                                           raise Not_in_list
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   317
                                             else 
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   318
                                                  raise Not_in_list
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   319
                                              
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   320
                                 end   
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   321
                                 
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   322
    | pos_in_list a (x::xs) allvars (pos_num, symlist, nsymlist) = 
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   323
                                 let val y = explode x 
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   324
                                     val b = explode a
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   325
                                 in
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   326
                                    if  b = y
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   327
                                    then 
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   328
                                         (pos_num, symlist, nsymlist)
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   329
                                    
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   330
                                    else
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   331
                                          if (var_pos_eq allvars  a x) (* Equal apart from meta-vars having different names *)
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   332
                                          then 
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   333
                                             (pos_num, symlist, nsymlist)
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   334
                                          else 
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   335
                                              if (contains_eq b) andalso (contains_eq y)
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   336
                                              then 
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   337
                                                  if (eq_not_neq b) andalso (eq_not_neq y)  andalso (switch_equal b y )   (* both are equalities and equal under sym*)        
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   338
                                                  then 
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   339
                                                      (pos_num, (pos_num::symlist), nsymlist)  (* add pos to symlist *)                                                                    else 
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   340
                                                      if not(eq_not_neq b) andalso not(eq_not_neq y) andalso  (switch_equal b y )  (* if they're equal under not_sym *)
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   341
                                                      then 
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   342
                                                           (pos_num, (symlist), (pos_num::nsymlist))(* add pos to nsymlist *)
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   343
                                                      else 
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   344
                                                           pos_in_list a xs allvars((pos_num + 1), symlist, nsymlist)
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   345
                                              else 
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   346
                                                    pos_in_list a xs allvars((pos_num + 1), symlist, nsymlist)
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   347
                                              
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   348
                                 end   
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   349
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   350
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   351
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   352
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   353
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   354
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   355
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   356
                                (* in
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   357
                                    if  b = y
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   358
                                    then 
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   359
                                         (pos_num, symlist, nsymlist)
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   360
                                    else if (contains_eq b) andalso (contains_eq y)
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   361
                                         then if (eq_not_neq b) andalso (eq_not_neq y) (* both are equalities*)
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   362
                                              then if (switch_equal b y )              (* if they're equal under sym *)
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   363
                                                   then 
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   364
                                                       (pos_num, (pos_num::symlist), nsymlist)  (* add pos to symlist *)
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   365
                                                   else 
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   366
                                                         pos_in_list a xs ((pos_num + 1), symlist, nsymlist)
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   367
                                              else if not(eq_not_neq b) andalso not(eq_not_neq y)  (* both are inequalities *)
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   368
                                                   then if (switch_equal b y )  (* if they're equal under not_sym *)
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   369
                                                        then 
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   370
                                                            (pos_num, (symlist), (pos_num::nsymlist))(* add pos to nsymlist *)
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   371
                                                        else 
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   372
                                                                 pos_in_list a xs ((pos_num + 1), symlist, nsymlist)
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   373
                                                   else
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   374
                                                          pos_in_list a xs ((pos_num + 1), symlist, nsymlist)
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   375
                                               else  
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   376
                                                       pos_in_list a xs ((pos_num + 1), symlist, nsymlist)
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   377
                                          else 
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   378
                                                  pos_in_list a xs ((pos_num + 1), symlist, nsymlist)
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   379
                                 end   
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   380
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   381
                                *)
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   382
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   383
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   384
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   385
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   386
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   387
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   388
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   389
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   390
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   391
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   392
(* checkorder Spass Isabelle [] *)
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   393
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   394
fun checkorder [] strlist allvars (numlist, symlist, not_symlist)= (numlist,symlist, not_symlist)
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   395
|   checkorder (x::xs) strlist allvars (numlist, symlist, not_symlist) =  
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   396
         let val (posnum, symlist', not_symlist') = pos_in_list x strlist allvars (0, symlist, not_symlist) 
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   397
         in
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   398
             checkorder xs  strlist allvars ((numlist@[posnum]), symlist', not_symlist') 
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   399
         end
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   400
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   401
fun is_digit ch =
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   402
    ( ch >=  "0" andalso ch <=  "9")
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   403
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   404
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   405
fun is_alpha ch =
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   406
    (ch >=  "A" andalso  ch <=  "Z") orelse
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   407
    (ch >=  "a" andalso ch <=  "z")
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   408
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   409
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   410
fun is_alpha_space_or_neg_or_eq ch = (ch = "~") orelse (is_alpha ch) orelse ( ch = " ")orelse ( ch = "=")
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   411
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   412
fun lit_string t = let val termstr = (Sign.string_of_term Mainsign ) t
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   413
                       val exp_term = explode termstr
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   414
                   in
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   415
                       implode(List.filter is_alpha_space_or_neg_or_eq exp_term)
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   416
                   end
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   417
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   418
fun get_meta_lits thm = map lit_string (prems_of thm)
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   419
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   420
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   421
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   422
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   423
fun is_alpha_space_or_neg_or_eq_or_bracket ch = (ch = "~") orelse (is_alpha ch) orelse ( ch = " ")orelse ( ch = "=") orelse (ch= "(") orelse (ch = ")")
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   424
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   425
fun lit_string_bracket  t = let val termstr = (Sign.string_of_term Mainsign ) t
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   426
                       val exp_term = explode termstr
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   427
                   in
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   428
                       implode(List.filter  is_alpha_space_or_neg_or_eq_or_bracket exp_term)
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   429
                   end
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   430
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   431
fun get_meta_lits_bracket thm = map lit_string_bracket (prems_of thm)
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   432
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   433
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   434
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   435
      
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   436
fun apply_rule rule [] thm = thm
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   437
|   apply_rule rule  (x::xs) thm = let val thm' = rule RSN ((x+1),thm)
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   438
                                  in
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   439
                                      apply_rule rule xs thm'
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   440
                                  end
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   441
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   442
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   443
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   444
                    (* resulting thm, clause-strs in spass order, vars *)
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   445
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   446
fun rearrange_clause thm res_strlist allvars = 
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   447
                          let val isa_strlist = get_meta_lits thm
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   448
                              val (posns, symlist, not_symlist) = checkorder res_strlist isa_strlist allvars([],[],[])
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   449
                              val symmed = apply_rule sym symlist thm
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   450
                              val not_symmed = apply_rule not_sym not_symlist symmed
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   451
                                           
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   452
                          in
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   453
                             ((rearrange_prems posns not_symmed), posns, symlist,not_symlist)
028059faa963 *** empty log message ***
quigley
parents:
diff changeset
   454
                          end