# HG changeset patch
# User haftmann
# Date 1275400741 -7200
# Node ID b3ff14122645ece1c195c7cd587896359fc6cf79
# Parent  c1d14288c5c0767e39dff7e4bdeb956e89421695
do not expose store flag of AxClass.add_*

diff -r c1d14288c5c0 -r b3ff14122645 src/Pure/Isar/class_target.ML
--- a/src/Pure/Isar/class_target.ML	Tue Jun 01 13:59:13 2010 +0200
+++ b/src/Pure/Isar/class_target.ML	Tue Jun 01 15:59:01 2010 +0200
@@ -243,7 +243,7 @@
       | NONE => I
   in
     thy
-    |> AxClass.add_classrel true classrel
+    |> AxClass.add_classrel classrel
     |> ClassData.map (Graph.add_edge (sub, sup))
     |> activate_defs sub (these_defs thy diff_sort)
     |> add_dependency
@@ -366,7 +366,7 @@
 fun gen_classrel mk_prop classrel thy =
   let
     fun after_qed results =
-      ProofContext.theory ((fold o fold) (AxClass.add_classrel true) results);
+      ProofContext.theory ((fold o fold) AxClass.add_classrel results);
   in
     thy
     |> ProofContext.init_global
@@ -450,7 +450,7 @@
 
 (* target *)
 
-val sanatize_name = (*FIXME*)
+val sanitize_name = (*FIXME*)
   let
     fun is_valid s = Symbol.is_ascii_letter s orelse Symbol.is_ascii_digit s
       orelse s = "'" orelse s = "_";
@@ -467,7 +467,7 @@
 
 fun type_name "*" = "prod"
   | type_name "+" = "sum"
-  | type_name s = sanatize_name (Long_Name.base_name s);
+  | type_name s = sanitize_name (Long_Name.base_name s);
 
 fun resort_terms pp algebra consts constraints ts =
   let
@@ -531,7 +531,7 @@
     val (tycos, vs, sort) = (#arities o the_instantiation) lthy;
     val arities_proof = maps (fn tyco => Logic.mk_arities (tyco, map snd vs, sort)) tycos;
     fun after_qed' results =
-      Local_Theory.theory (fold (AxClass.add_arity true o Thm.varifyT_global) results)
+      Local_Theory.theory (fold (AxClass.add_arity o Thm.varifyT_global) results)
       #> after_qed;
   in
     lthy
@@ -591,7 +591,7 @@
     val sorts = map snd vs;
     val arities = maps (fn tyco => Logic.mk_arities (tyco, sorts, sort)) tycos;
     fun after_qed results = ProofContext.theory
-      ((fold o fold) (AxClass.add_arity true) results);
+      ((fold o fold) AxClass.add_arity results);
   in
     thy
     |> ProofContext.init_global
diff -r c1d14288c5c0 -r b3ff14122645 src/Pure/axclass.ML
--- a/src/Pure/axclass.ML	Tue Jun 01 13:59:13 2010 +0200
+++ b/src/Pure/axclass.ML	Tue Jun 01 15:59:01 2010 +0200
@@ -24,8 +24,8 @@
   val read_classrel: theory -> xstring * xstring -> class * class
   val declare_overloaded: string * typ -> theory -> term * theory
   val define_overloaded: binding -> string * term -> theory -> thm * theory
-  val add_classrel: bool -> thm -> theory -> theory
-  val add_arity: bool -> thm -> theory -> theory
+  val add_classrel: thm -> theory -> theory
+  val add_arity: thm -> theory -> theory
   val prove_classrel: class * class -> tactic -> theory -> theory
   val prove_arity: string * sort list * sort -> tactic -> theory -> theory
   val define_class: binding * class list -> string list ->
@@ -412,7 +412,7 @@
 
 (* primitive rules *)
 
-fun add_classrel store raw_th thy =
+fun gen_add_classrel store raw_th thy =
   let
     val th = Thm.strip_shyps (Thm.transfer thy raw_th);
     val prop = Thm.plain_prop_of th;
@@ -433,7 +433,7 @@
     |> perhaps complete_arities
   end;
 
-fun add_arity store raw_th thy =
+fun gen_add_arity store raw_th thy =
   let
     val th = Thm.strip_shyps (Thm.transfer thy raw_th);
     val prop = Thm.plain_prop_of th;
@@ -463,6 +463,9 @@
     |> put_arity ((t, Ss, c), th'')
   end;
 
+val add_classrel = gen_add_classrel true;
+val add_arity = gen_add_arity true;
+
 
 (* tactical proofs *)
 
@@ -477,7 +480,7 @@
     thy
     |> PureThy.add_thms [((Binding.name
         (prefix classrel_prefix (Logic.name_classrel (c1, c2))), th), [])]
-    |-> (fn [th'] => add_classrel false th')
+    |-> (fn [th'] => gen_add_classrel false th')
   end;
 
 fun prove_arity raw_arity tac thy =
@@ -493,7 +496,7 @@
   in
     thy
     |> PureThy.add_thms (map (rpair []) (map Binding.name names ~~ ths))
-    |-> fold (add_arity false)
+    |-> fold (gen_add_arity false)
   end;
 
 
@@ -627,11 +630,11 @@
 
 fun ax_classrel prep =
   axiomatize (map o prep) (map Logic.mk_classrel)
-    (map (prefix classrel_prefix o Logic.name_classrel)) (add_classrel false);
+    (map (prefix classrel_prefix o Logic.name_classrel)) (gen_add_classrel false);
 
 fun ax_arity prep =
   axiomatize (prep o ProofContext.init_global) Logic.mk_arities
-    (map (prefix arity_prefix) o Logic.name_arities) (add_arity false);
+    (map (prefix arity_prefix) o Logic.name_arities) (gen_add_arity false);
 
 fun class_const c =
   (Logic.const_of_class c, Term.itselfT (Term.aT []) --> propT);