src/Pure/Isar/theory_target.ML

 (* pretty *)
 
 fun pretty loc ctxt =
   let
     val thy = ProofContext.theory_of ctxt;
+    val loc_kind = if is_some (Class.class_of_locale thy loc) then "class" else "locale";
+    val loc_name = Locale.extern thy loc;
+
     val fixes = map (fn (x, T) => (x, SOME T, NoSyn)) (#1 (ProofContext.inferred_fixes ctxt));
     val assumes = map (fn A => (("", []), [(A, [])])) (map Thm.term_of (Assumption.assms_of ctxt));
     val elems =
       (if null fixes then [] else [Element.Fixes fixes]) @
       (if null assumes then [] else [Element.Assumes assumes]);
   in
-    if loc = "" then
-      [Pretty.block
-        [Pretty.str "theory", Pretty.brk 1, Pretty.str (Context.theory_name thy),
-          Pretty.str " =", Pretty.brk 1, ThyInfo.pretty_theory thy]]
-    else if null elems then [Pretty.str ("locale " ^ Locale.extern thy loc)]
-    else
-      [Pretty.big_list ("locale " ^ Locale.extern thy loc ^ " =")
-        (map (Pretty.chunks o Element.pretty_ctxt ctxt) elems)]
+    Pretty.block [Pretty.str "theory", Pretty.brk 1, Pretty.str (Context.theory_name thy)] ::
+     (if loc = "" then []
+      else if null elems then [Pretty.str (loc_kind ^ " " ^ loc_name)]
+      else [Pretty.big_list (loc_kind ^ " " ^ loc_name ^ " =")
+        (map (Pretty.chunks o Element.pretty_ctxt ctxt) elems)])
   end;
 
 
 (* target declarations *)
 

   (if loc = "" then Sign.naming_of (ProofContext.theory_of lthy)
    else ProofContext.naming_of (LocalTheory.target_of lthy))
   |> NameSpace.qualified_names;
 
 
+
+(* notes *)
+
+fun import_export_proof ctxt (name, raw_th) =
+  let
+    val thy = ProofContext.theory_of ctxt;
+    val thy_ctxt = ProofContext.init thy;
+    val certT = Thm.ctyp_of thy;
+    val cert = Thm.cterm_of thy;
+
+    (*export assumes/defines*)
+    val th = Goal.norm_result raw_th;
+    val (defs, th') = LocalDefs.export ctxt thy_ctxt th;
+    val concl_conv = MetaSimplifier.rewrite true defs (Thm.cprop_of th);
+    val assms = map (MetaSimplifier.rewrite_rule defs o Thm.assume) (Assumption.assms_of ctxt);
+    val nprems = Thm.nprems_of th' - Thm.nprems_of th;
+
+    (*export fixes*)
+    val tfrees = map TFree (Thm.fold_terms Term.add_tfrees th' []);
+    val frees = map Free (Thm.fold_terms Term.add_frees th' []);
+    val (th'' :: vs) = (th' :: map (Drule.mk_term o cert) (map Logic.mk_type tfrees @ frees))
+      |> Variable.export ctxt thy_ctxt
+      |> Drule.zero_var_indexes_list;
+
+    (*thm definition*)
+    val result = th''
+      |> PureThy.name_thm true true ""
+      |> Goal.close_result
+      |> fold PureThy.tag_rule (ContextPosition.properties_of ctxt)
+      |> PureThy.name_thm true true name;
+
+    (*import fixes*)
+    val (tvars, vars) =
+      chop (length tfrees) (map (Thm.term_of o Drule.dest_term) vs)
+      |>> map Logic.dest_type;
+
+    val instT = map_filter (fn (TVar v, T) => SOME (v, T) | _ => NONE) (tvars ~~ tfrees);
+    val inst = filter (is_Var o fst) (vars ~~ frees);
+    val cinstT = map (pairself certT o apfst TVar) instT;
+    val cinst = map (pairself (cert o Term.map_types (TermSubst.instantiateT instT))) inst;
+    val result' = Thm.instantiate (cinstT, cinst) result;
+
+    (*import assumes/defines*)
+    val assm_tac = FIRST' (map (fn assm => Tactic.compose_tac (false, assm, 0)) assms);
+    val result'' =
+      (case SINGLE (Seq.INTERVAL assm_tac 1 nprems) result' of
+        NONE => raise THM ("Failed to re-import result", 0, [result'])
+      | SOME res => LocalDefs.trans_props ctxt [res, Thm.symmetric concl_conv])
+      |> Goal.norm_result
+      |> PureThy.name_thm false false name;
+
+  in (result'', result) end;
+
+fun local_notes loc kind facts lthy =
+  let
+    val is_loc = loc <> "";
+    val thy = ProofContext.theory_of lthy;
+    val full = LocalTheory.full_name lthy;
+
+    val facts' = facts
+      |> map (fn (a, bs) => (a, PureThy.burrow_fact (PureThy.name_multi (full (fst a))) bs))
+      |> PureThy.map_facts (import_export_proof lthy);
+    val local_facts = PureThy.map_facts #1 facts'
+      |> Attrib.map_facts (Attrib.attribute_i thy);
+    val target_facts = PureThy.map_facts #1 facts'
+      |> is_loc ? Element.facts_map (Element.morph_ctxt (LocalTheory.target_morphism lthy));
+    val global_facts = PureThy.map_facts #2 facts'
+      |> Attrib.map_facts (if is_loc then K I else Attrib.attribute_i thy);
+  in
+    lthy |> LocalTheory.theory
+      (Sign.qualified_names
+        #> PureThy.note_thmss_i kind global_facts #> snd
+        #> Sign.restore_naming thy)
+
+    |> is_loc ? LocalTheory.target (Locale.add_thmss loc kind target_facts)
+
+    |> ProofContext.qualified_names
+    |> ProofContext.note_thmss_i kind local_facts
+    ||> ProofContext.restore_naming lthy
+  end;
+
+
 (* consts *)
 
 fun target_abbrev prmode ((c, mx), rhs) phi =
   let
     val c' = Morphism.name phi c;

     #-> (fn (lhs, _) =>
       Term.equiv_types (rhs, rhs') ?
         Morphism.form (ProofContext.target_notation prmode [(lhs, mx)])))
   end;
 
-fun internal_abbrev prmode ((c, mx), t) lthy = lthy
+fun internal_abbrev loc prmode ((c, mx), t) lthy = lthy
   (* FIXME really permissive *)
-  |> LocalTheory.term_syntax (perhaps o try o target_abbrev prmode ((c, mx), t))
+  |> term_syntax loc (perhaps o try o target_abbrev prmode ((c, mx), t))
   |> ProofContext.add_abbrev Syntax.internalM (ContextPosition.properties_of lthy) (c, t)
   |> snd;
 
-fun consts is_loc some_class depends decls lthy =
-  let
+fun declare_consts loc depends decls lthy =
+  let
+    val thy = ProofContext.theory_of lthy;
+    val is_loc = loc <> "";
+    val some_class = Class.class_of_locale thy loc;
+
     val xs = filter depends (#1 (ProofContext.inferred_fixes (LocalTheory.target_of lthy)));
 
     fun const ((c, T), mx) thy =
       let
         val U = map #2 xs ---> T;

         val (mx1, mx2) = Class.fork_mixfix is_loc some_class mx;
         val mx3 = if is_loc then NoSyn else mx1;
         val thy' = Sign.add_consts_authentic (ContextPosition.properties_of lthy) [(c, U, mx3)] thy;
       in (((c, mx2), t), thy') end;
     fun const_class (SOME class) ((c, _), mx) (_, t) =
-          LocalTheory.raw_theory_result
-            (Class.add_const_in_class class ((c, t), mx))
-          #-> (fn c => Class.remove_constraint [class] c)
+          LocalTheory.raw_theory_result (Class.add_const_in_class class ((c, t), mx))
+          #-> Class.remove_constraint [class]
       | const_class NONE _ _ = I;
     fun hide_abbrev (SOME class) abbrs thy =
           let
             val raw_cs = map (fst o fst) abbrs;
             val prfx = (Logic.const_of_class o NameSpace.base) class;

     val defs = map (apsnd (pair ("", []))) abbrs;
 
   in
     lthy'
     |> fold2 (const_class some_class) decls abbrs
-    |> is_loc ? fold (internal_abbrev Syntax.default_mode) abbrs
+    |> is_loc ? fold (internal_abbrev loc Syntax.default_mode) abbrs
     |> LocalTheory.raw_theory (hide_abbrev some_class abbrs)
         (*FIXME abbreviations should never occur*)
     |> LocalDefs.add_defs defs
     |>> map (apsnd snd)
   end;

       Variable.declare_term rhs #>
       Assumption.add_assms (K (K (I, Envir.expand_term_frees [((x', T), rhs)]))) [] #> snd #>
       pair (lhs, rhs)
     end);
 
-fun abbrev is_loc some_class prmode ((raw_c, mx), raw_t) lthy =
-  let
-    val thy_ctxt = ProofContext.init (ProofContext.theory_of lthy);
+fun abbrev loc prmode ((raw_c, mx), raw_t) lthy =
+  let
+    val thy = ProofContext.theory_of lthy;
+    val is_loc = loc <> "";
+    val some_class = Class.class_of_locale thy loc;
+
+    val thy_ctxt = ProofContext.init thy;
     val target = LocalTheory.target_of lthy;
     val target_morphism = LocalTheory.target_morphism lthy;
 
     val c = Morphism.name target_morphism raw_c;
     val t = Morphism.term target_morphism raw_t;

   in
     lthy
     |> LocalTheory.theory_result
         (Sign.add_abbrev (#1 prmode) (ContextPosition.properties_of lthy) (c, u'))
     |-> (fn (lhs as Const (full_c, _), rhs) => LocalTheory.theory (Sign.add_notation prmode [(lhs, mx3)])
-    #> is_loc ? internal_abbrev prmode ((c, mx2), Term.list_comb (Const (full_c, U), xs))
+    #> is_loc ? internal_abbrev loc prmode ((c, mx2), Term.list_comb (Const (full_c, U), xs))
     #> add_abbrev_in_class some_class ((c, Term.list_comb (Const (full_c, U), xs)), mx1)
     #> local_abbrev (c, rhs))
   end;
 
 

     val def = Thm.instantiate (recover_sorts, []) axm';
   in (Drule.unvarify def, thy') end;
 
 in
 
-fun local_def kind ((c, mx), ((name, atts), rhs)) lthy1 =
+fun local_def loc kind ((c, mx), ((name, atts), rhs)) lthy1 =
   let
     val (rhs', rhs_conv) = expand_term lthy1 rhs;
     val xs = Variable.add_fixed (LocalTheory.target_of lthy1) rhs' [];
     val T = Term.fastype_of rhs;
 
     (*consts*)
     val ([(lhs, lhs_def)], lthy2) = lthy1
-      |> LocalTheory.consts (member (op =) xs) [((c, T), mx)];
+      |> declare_consts loc (member (op =) xs) [((c, T), mx)];
     val (_, lhs') = Logic.dest_equals (Thm.prop_of lhs_def);
 
     (*def*)
     val name' = Thm.def_name_optional c name;
     val (def, lthy3) = lthy2

        (*lhs' == rhs'*)  def,
        (*rhs' == rhs*)   Thm.symmetric rhs_conv];
 
     (*notes*)
     val ([(res_name, [res])], lthy4) = lthy3
-      |> LocalTheory.notes kind [((name', atts), [([eq], [])])];
+      |> local_notes loc kind [((name', atts), [([eq], [])])];
   in ((lhs, (res_name, res)), lthy4) end;
 
 end;
 
 

     val prems = map (Thm.assume o Thm.cterm_of thy') hyps;
   in (Drule.implies_elim_list axm prems, thy') end;
 
 in
 
-fun axioms kind specs lthy =
+fun axioms loc kind specs lthy =
   let
     val hyps = map Thm.term_of (Assumption.assms_of lthy);
     fun axiom ((name, atts), props) thy = thy
       |> fold_map (add_axiom hyps) (PureThy.name_multi name props)
       |-> (fn ths => pair ((name, atts), [(ths, [])]));
   in
     lthy
     |> fold (fold Variable.declare_term o snd) specs
     |> LocalTheory.theory_result (fold_map axiom specs)
-    |-> LocalTheory.notes kind
+    |-> local_notes loc kind
   end;
 
 end;
-
-
-(* notes *)
-
-fun import_export_proof ctxt (name, raw_th) =
-  let
-    val thy = ProofContext.theory_of ctxt;
-    val thy_ctxt = ProofContext.init thy;
-    val certT = Thm.ctyp_of thy;
-    val cert = Thm.cterm_of thy;
-
-    (*export assumes/defines*)
-    val th = Goal.norm_result raw_th;
-    val (defs, th') = LocalDefs.export ctxt thy_ctxt th;
-    val concl_conv = MetaSimplifier.rewrite true defs (Thm.cprop_of th);
-    val assms = map (MetaSimplifier.rewrite_rule defs o Thm.assume) (Assumption.assms_of ctxt);
-    val nprems = Thm.nprems_of th' - Thm.nprems_of th;
-
-    (*export fixes*)
-    val tfrees = map TFree (Thm.fold_terms Term.add_tfrees th' []);
-    val frees = map Free (Thm.fold_terms Term.add_frees th' []);
-    val (th'' :: vs) = (th' :: map (Drule.mk_term o cert) (map Logic.mk_type tfrees @ frees))
-      |> Variable.export ctxt thy_ctxt
-      |> Drule.zero_var_indexes_list;
-
-    (*thm definition*)
-    val result = th''
-      |> PureThy.name_thm true true ""
-      |> Goal.close_result
-      |> fold PureThy.tag_rule (ContextPosition.properties_of ctxt)
-      |> PureThy.name_thm true true name;
-
-    (*import fixes*)
-    val (tvars, vars) =
-      chop (length tfrees) (map (Thm.term_of o Drule.dest_term) vs)
-      |>> map Logic.dest_type;
-
-    val instT = map_filter (fn (TVar v, T) => SOME (v, T) | _ => NONE) (tvars ~~ tfrees);
-    val inst = filter (is_Var o fst) (vars ~~ frees);
-    val cinstT = map (pairself certT o apfst TVar) instT;
-    val cinst = map (pairself (cert o Term.map_types (TermSubst.instantiateT instT))) inst;
-    val result' = Thm.instantiate (cinstT, cinst) result;
-
-    (*import assumes/defines*)
-    val assm_tac = FIRST' (map (fn assm => Tactic.compose_tac (false, assm, 0)) assms);
-    val result'' =
-      (case SINGLE (Seq.INTERVAL assm_tac 1 nprems) result' of
-        NONE => raise THM ("Failed to re-import result", 0, [result'])
-      | SOME res => LocalDefs.trans_props ctxt [res, Thm.symmetric concl_conv])
-      |> Goal.norm_result
-      |> PureThy.name_thm false false name;
-
-  in (result'', result) end;
-
-fun notes loc kind facts lthy =
-  let
-    val is_loc = loc <> "";
-    val thy = ProofContext.theory_of lthy;
-    val full = LocalTheory.full_name lthy;
-
-    val facts' = facts
-      |> map (fn (a, bs) => (a, PureThy.burrow_fact (PureThy.name_multi (full (fst a))) bs))
-      |> PureThy.map_facts (import_export_proof lthy);
-    val local_facts = PureThy.map_facts #1 facts'
-      |> Attrib.map_facts (Attrib.attribute_i thy);
-    val target_facts = PureThy.map_facts #1 facts'
-      |> is_loc ? Element.facts_map (Element.morph_ctxt (LocalTheory.target_morphism lthy));
-    val global_facts = PureThy.map_facts #2 facts'
-      |> Attrib.map_facts (if is_loc then K I else Attrib.attribute_i thy);
-  in
-    lthy |> LocalTheory.theory
-      (Sign.qualified_names
-        #> PureThy.note_thmss_i kind global_facts #> snd
-        #> Sign.restore_naming thy)
-
-    |> is_loc ? LocalTheory.target (Locale.add_thmss loc kind target_facts)
-
-    |> ProofContext.qualified_names
-    |> ProofContext.note_thmss_i kind local_facts
-    ||> ProofContext.restore_naming lthy
-  end;
 
 
 (* init and exit *)
 
 fun begin loc ctxt =
   let
     val thy = ProofContext.theory_of ctxt;
     val is_loc = loc <> "";
-    val some_class = Class.class_of_locale thy loc;
   in
     ctxt
     |> Data.put (if is_loc then SOME loc else NONE)
-    |> fold Class.init (the_list some_class)
+    |> fold Class.init (the_list (Class.class_of_locale thy loc))
     |> LocalTheory.init (NameSpace.base loc)
      {pretty = pretty loc,
-      consts = consts is_loc some_class,
-      axioms = axioms,
-      abbrev = abbrev is_loc some_class,
-      def = local_def,
-      notes = notes loc,
+      consts = declare_consts loc,
+      axioms = axioms loc,
+      abbrev = abbrev loc,
+      def = local_def loc,
+      notes = local_notes loc,
       type_syntax = type_syntax loc,
       term_syntax = term_syntax loc,
       declaration = declaration loc,
       target_naming = target_naming loc,
       reinit = fn _ =>