src/FOLP/simp.ML
changeset 26928 ca87aff1ad2d
parent 24707 dfeb98f84e93
child 26939 1035c89b4c02
     1.1 --- a/src/FOLP/simp.ML	Fri May 16 23:25:37 2008 +0200
     1.2 +++ b/src/FOLP/simp.ML	Sat May 17 13:54:30 2008 +0200
     1.3 @@ -114,7 +114,7 @@
     1.4    let fun norm thm = 
     1.5        case lhs_of(concl_of thm) of
     1.6            Const(n,_)$_ => n
     1.7 -        | _ => (prths normE_thms; error"No constant in lhs of a norm_thm")
     1.8 +        | _ => (Display.prths normE_thms; error"No constant in lhs of a norm_thm")
     1.9    in map norm normE_thms end;
    1.10  
    1.11  fun lhs_is_NORM(thm,i) = case lhs_of_eq i thm of
    1.12 @@ -123,7 +123,7 @@
    1.13  val refl_tac = resolve_tac refl_thms;
    1.14  
    1.15  fun find_res thms thm =
    1.16 -    let fun find [] = (prths thms; error"Check Simp_Data")
    1.17 +    let fun find [] = (Display.prths thms; error"Check Simp_Data")
    1.18            | find(th::thms) = thm RS th handle THM _ => find thms
    1.19      in find thms end;
    1.20  
    1.21 @@ -250,7 +250,7 @@
    1.22  fun insert_thm_warn th net = 
    1.23    Net.insert_term Thm.eq_thm_prop (concl_of th, th) net
    1.24    handle Net.INSERT => 
    1.25 -    (writeln"\nDuplicate rewrite or congruence rule:"; print_thm th;
    1.26 +    (writeln"\nDuplicate rewrite or congruence rule:"; Display.print_thm th;
    1.27       net);
    1.28  
    1.29  val insert_thms = fold_rev insert_thm_warn;
    1.30 @@ -276,7 +276,7 @@
    1.31  fun delete_thm_warn th net = 
    1.32    Net.delete_term Thm.eq_thm_prop (concl_of th, th) net
    1.33    handle Net.DELETE => 
    1.34 -    (writeln"\nNo such rewrite or congruence rule:";  print_thm th;
    1.35 +    (writeln"\nNo such rewrite or congruence rule:";  Display.print_thm th;
    1.36       net);
    1.37  
    1.38  val delete_thms = fold_rev delete_thm_warn;
    1.39 @@ -292,7 +292,7 @@
    1.40  let fun find((p as (th,ths))::ps',ps) =
    1.41            if Thm.eq_thm_prop(thm,th) then (ths,ps@ps') else find(ps',p::ps)
    1.42        | find([],simps') = (writeln"\nNo such rewrite or congruence rule:";
    1.43 -                           print_thm thm;
    1.44 +                           Display.print_thm thm;
    1.45                             ([],simps'))
    1.46      val (thms,simps') = find(simps,[])
    1.47  in SS{auto_tac=auto_tac, congs=congs, cong_net=cong_net, mk_simps=mk_simps,
    1.48 @@ -312,8 +312,8 @@
    1.49  fun dest_ss(SS{congs,simps,...}) = (congs, map #1 simps);
    1.50  
    1.51  fun print_ss(SS{congs,simps,...}) =
    1.52 -        (writeln"Congruences:"; prths congs;
    1.53 -         writeln"Rewrite Rules:"; prths (map #1 simps); ());
    1.54 +        (writeln"Congruences:"; Display.prths congs;
    1.55 +         writeln"Rewrite Rules:"; Display.prths (map #1 simps); ());
    1.56  
    1.57  
    1.58  (* Rewriting with conditionals *)
    1.59 @@ -436,7 +436,7 @@
    1.60          val rwrls = map mk_trans (List.concat(map mk_rew_rules thms));
    1.61          val anet' = foldr lhs_insert_thm anet rwrls
    1.62      in  if !tracing andalso not(null new_rws)
    1.63 -        then (writeln"Adding rewrites:";  prths new_rws;  ())
    1.64 +        then (writeln"Adding rewrites:";  Display.prths new_rws;  ())
    1.65          else ();
    1.66          (ss,thm,anet',anet::ats,cs) 
    1.67      end;