merged
authorhaftmann
Tue, 06 Jan 2009 08:50:12 +0100
changeset 29363 c1f024b4d76d
parent 29356 aa8689d93135 (current diff)
parent 29362 f9ded2d789b9 (diff)
child 29364 cea7b4034461
merged
src/FOL/ex/NewLocaleSetup.thy
src/FOL/ex/NewLocaleTest.thy
src/Pure/Isar/instance.ML
src/Pure/Isar/isar_syn.ML
src/Pure/Isar/locale.ML
src/Pure/Isar/new_locale.ML
src/Pure/Isar/subclass.ML
--- a/src/FOL/IsaMakefile	Mon Jan 05 19:37:15 2009 +0100
+++ b/src/FOL/IsaMakefile	Tue Jan 06 08:50:12 2009 +0100
@@ -47,7 +47,7 @@
 
 $(LOG)/FOL-ex.gz: $(OUT)/FOL ex/First_Order_Logic.thy ex/If.thy		\
   ex/IffOracle.thy ex/Nat.thy ex/Natural_Numbers.thy	\
-  ex/NewLocaleSetup.thy ex/NewLocaleTest.thy    \
+  ex/LocaleTest.thy    \
   ex/Miniscope.thy ex/Prolog.thy ex/ROOT.ML ex/Classical.thy		\
   ex/document/root.tex ex/Foundation.thy ex/Intuitionistic.thy		\
   ex/Intro.thy ex/Propositional_Int.thy ex/Propositional_Cla.thy	\
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/FOL/ex/LocaleTest.thy	Tue Jan 06 08:50:12 2009 +0100
@@ -0,0 +1,486 @@
+(*  Title:      FOL/ex/NewLocaleTest.thy
+    Author:     Clemens Ballarin, TU Muenchen
+
+Testing environment for locale expressions --- experimental.
+*)
+
+theory LocaleTest
+imports FOL
+begin
+
+ML_val {* set Toplevel.debug *}
+
+
+typedecl int arities int :: "term"
+consts plus :: "int => int => int" (infixl "+" 60)
+  zero :: int ("0")
+  minus :: "int => int" ("- _")
+
+axioms
+  int_assoc: "(x + y::int) + z = x + (y + z)"
+  int_zero: "0 + x = x"
+  int_minus: "(-x) + x = 0"
+  int_minus2: "-(-x) = x"
+
+section {* Inference of parameter types *}
+
+locale param1 = fixes p
+print_locale! param1
+
+locale param2 = fixes p :: 'b
+print_locale! param2
+
+(*
+locale param_top = param2 r for r :: "'b :: {}"
+  Fails, cannot generalise parameter.
+*)
+
+locale param3 = fixes p (infix ".." 50)
+print_locale! param3
+
+locale param4 = fixes p :: "'a => 'a => 'a" (infix ".." 50)
+print_locale! param4
+
+
+subsection {* Incremental type constraints *}
+
+locale constraint1 =
+  fixes  prod (infixl "**" 65)
+  assumes l_id: "x ** y = x"
+  assumes assoc: "(x ** y) ** z = x ** (y ** z)"
+print_locale! constraint1
+
+locale constraint2 =
+  fixes p and q
+  assumes "p = q"
+print_locale! constraint2
+
+
+section {* Inheritance *}
+
+locale semi =
+  fixes prod (infixl "**" 65)
+  assumes assoc: "(x ** y) ** z = x ** (y ** z)"
+print_locale! semi thm semi_def
+
+locale lgrp = semi +
+  fixes one and inv
+  assumes lone: "one ** x = x"
+    and linv: "inv(x) ** x = one"
+print_locale! lgrp thm lgrp_def lgrp_axioms_def
+
+locale add_lgrp = semi "op ++" for sum (infixl "++" 60) +
+  fixes zero and neg
+  assumes lzero: "zero ++ x = x"
+    and lneg: "neg(x) ++ x = zero"
+print_locale! add_lgrp thm add_lgrp_def add_lgrp_axioms_def
+
+locale rev_lgrp = semi "%x y. y ++ x" for sum (infixl "++" 60)
+print_locale! rev_lgrp thm rev_lgrp_def
+
+locale hom = f: semi f + g: semi g for f and g
+print_locale! hom thm hom_def
+
+locale perturbation = semi + d: semi "%x y. delta(x) ** delta(y)" for delta
+print_locale! perturbation thm perturbation_def
+
+locale pert_hom = d1: perturbation f d1 + d2: perturbation f d2 for f d1 d2
+print_locale! pert_hom thm pert_hom_def
+
+text {* Alternative expression, obtaining nicer names in @{text "semi f"}. *}
+locale pert_hom' = semi f + d1: perturbation f d1 + d2: perturbation f d2 for f d1 d2
+print_locale! pert_hom' thm pert_hom'_def
+
+
+section {* Syntax declarations *}
+
+locale logic =
+  fixes land (infixl "&&" 55)
+    and lnot ("-- _" [60] 60)
+  assumes assoc: "(x && y) && z = x && (y && z)"
+    and notnot: "-- (-- x) = x"
+begin
+
+definition lor (infixl "||" 50) where
+  "x || y = --(-- x && -- y)"
+
+end
+print_locale! logic
+
+locale use_decl = logic + semi "op ||"
+print_locale! use_decl thm use_decl_def
+
+locale extra_type =
+  fixes a :: 'a
+    and P :: "'a => 'b => o"
+begin
+
+definition test :: "'a => o" where
+  "test(x) <-> (ALL b. P(x, b))"
+
+end
+
+term extra_type.test thm extra_type.test_def
+
+interpretation var: extra_type "0" "%x y. x = 0" .
+
+thm var.test_def
+
+
+section {* Foundational versions of theorems *}
+
+thm logic.assoc
+thm logic.lor_def
+
+
+section {* Defines *}
+
+locale logic_def =
+  fixes land (infixl "&&" 55)
+    and lor (infixl "||" 50)
+    and lnot ("-- _" [60] 60)
+  assumes assoc: "(x && y) && z = x && (y && z)"
+    and notnot: "-- (-- x) = x"
+  defines "x || y == --(-- x && -- y)"
+begin
+
+thm lor_def
+(* Can we get rid the the additional hypothesis, caused by LocalTheory.notes? *)
+
+lemma "x || y = --(-- x && --y)"
+  by (unfold lor_def) (rule refl)
+
+end
+
+(* Inheritance of defines *)
+
+locale logic_def2 = logic_def
+begin
+
+lemma "x || y = --(-- x && --y)"
+  by (unfold lor_def) (rule refl)
+
+end
+
+
+section {* Notes *}
+
+(* A somewhat arcane homomorphism example *)
+
+definition semi_hom where
+  "semi_hom(prod, sum, h) <-> (ALL x y. h(prod(x, y)) = sum(h(x), h(y)))"
+
+lemma semi_hom_mult:
+  "semi_hom(prod, sum, h) ==> h(prod(x, y)) = sum(h(x), h(y))"
+  by (simp add: semi_hom_def)
+
+locale semi_hom_loc = prod: semi prod + sum: semi sum
+  for prod and sum and h +
+  assumes semi_homh: "semi_hom(prod, sum, h)"
+  notes semi_hom_mult = semi_hom_mult [OF semi_homh]
+
+thm semi_hom_loc.semi_hom_mult
+(* unspecified, attribute not applied in backgroud theory !!! *)
+
+lemma (in semi_hom_loc) "h(prod(x, y)) = sum(h(x), h(y))"
+  by (rule semi_hom_mult)
+
+(* Referring to facts from within a context specification *)
+
+lemma
+  assumes x: "P <-> P"
+  notes y = x
+  shows True ..
+
+
+section {* Theorem statements *}
+
+lemma (in lgrp) lcancel:
+  "x ** y = x ** z <-> y = z"
+proof
+  assume "x ** y = x ** z"
+  then have "inv(x) ** x ** y = inv(x) ** x ** z" by (simp add: assoc)
+  then show "y = z" by (simp add: lone linv)
+qed simp
+print_locale! lgrp
+
+
+locale rgrp = semi +
+  fixes one and inv
+  assumes rone: "x ** one = x"
+    and rinv: "x ** inv(x) = one"
+begin
+
+lemma rcancel:
+  "y ** x = z ** x <-> y = z"
+proof
+  assume "y ** x = z ** x"
+  then have "y ** (x ** inv(x)) = z ** (x ** inv(x))"
+    by (simp add: assoc [symmetric])
+  then show "y = z" by (simp add: rone rinv)
+qed simp
+
+end
+print_locale! rgrp
+
+
+subsection {* Patterns *}
+
+lemma (in rgrp)
+  assumes "y ** x = z ** x" (is ?a)
+  shows "y = z" (is ?t)
+proof -
+  txt {* Weird proof involving patterns from context element and conclusion. *}
+  {
+    assume ?a
+    then have "y ** (x ** inv(x)) = z ** (x ** inv(x))"
+      by (simp add: assoc [symmetric])
+    then have ?t by (simp add: rone rinv)
+  }
+  note x = this
+  show ?t by (rule x [OF `?a`])
+qed
+
+
+section {* Interpretation between locales: sublocales *}
+
+sublocale lgrp < right: rgrp
+print_facts
+proof unfold_locales
+  {
+    fix x
+    have "inv(x) ** x ** one = inv(x) ** x" by (simp add: linv lone)
+    then show "x ** one = x" by (simp add: assoc lcancel)
+  }
+  note rone = this
+  {
+    fix x
+    have "inv(x) ** x ** inv(x) = inv(x) ** one"
+      by (simp add: linv lone rone)
+    then show "x ** inv(x) = one" by (simp add: assoc lcancel)
+  }
+qed
+
+(* effect on printed locale *)
+
+print_locale! lgrp
+
+(* use of derived theorem *)
+
+lemma (in lgrp)
+  "y ** x = z ** x <-> y = z"
+  apply (rule rcancel)
+  done
+
+(* circular interpretation *)
+
+sublocale rgrp < left: lgrp
+proof unfold_locales
+  {
+    fix x
+    have "one ** (x ** inv(x)) = x ** inv(x)" by (simp add: rinv rone)
+    then show "one ** x = x" by (simp add: assoc [symmetric] rcancel)
+  }
+  note lone = this
+  {
+    fix x
+    have "inv(x) ** (x ** inv(x)) = one ** inv(x)"
+      by (simp add: rinv lone rone)
+    then show "inv(x) ** x = one" by (simp add: assoc [symmetric] rcancel)
+  }
+qed
+
+(* effect on printed locale *)
+
+print_locale! rgrp
+print_locale! lgrp
+
+
+(* Duality *)
+
+locale order =
+  fixes less :: "'a => 'a => o" (infix "<<" 50)
+  assumes refl: "x << x"
+    and trans: "[| x << y; y << z |] ==> x << z"
+
+sublocale order < dual: order "%x y. y << x"
+  apply unfold_locales apply (rule refl) apply (blast intro: trans)
+  done
+
+print_locale! order  (* Only two instances of order. *)
+
+locale order' =
+  fixes less :: "'a => 'a => o" (infix "<<" 50)
+  assumes refl: "x << x"
+    and trans: "[| x << y; y << z |] ==> x << z"
+
+locale order_with_def = order'
+begin
+
+definition greater :: "'a => 'a => o" (infix ">>" 50) where
+  "x >> y <-> y << x"
+
+end
+
+sublocale order_with_def < dual: order' "op >>"
+  apply unfold_locales
+  unfolding greater_def
+  apply (rule refl) apply (blast intro: trans)
+  done
+
+print_locale! order_with_def
+(* Note that decls come after theorems that make use of them. *)
+
+
+(* locale with many parameters ---
+   interpretations generate alternating group A5 *)
+
+
+locale A5 =
+  fixes A and B and C and D and E
+  assumes eq: "A <-> B <-> C <-> D <-> E"
+
+sublocale A5 < 1: A5 _ _ D E C
+print_facts
+  using eq apply (blast intro: A5.intro) done
+
+sublocale A5 < 2: A5 C _ E _ A
+print_facts
+  using eq apply (blast intro: A5.intro) done
+
+sublocale A5 < 3: A5 B C A _ _
+print_facts
+  using eq apply (blast intro: A5.intro) done
+
+(* Any even permutation of parameters is subsumed by the above. *)
+
+print_locale! A5
+
+
+(* Free arguments of instance *)
+
+locale trivial =
+  fixes P and Q :: o
+  assumes Q: "P <-> P <-> Q"
+begin
+
+lemma Q_triv: "Q" using Q by fast
+
+end
+
+sublocale trivial < x: trivial x _
+  apply unfold_locales using Q by fast
+
+print_locale! trivial
+
+context trivial begin thm x.Q [where ?x = True] end
+
+sublocale trivial < y: trivial Q Q
+  by unfold_locales
+  (* Succeeds since previous interpretation is more general. *)
+
+print_locale! trivial  (* No instance for y created (subsumed). *)
+
+
+subsection {* Sublocale, then interpretation in theory *}
+
+interpretation int: lgrp "op +" "0" "minus"
+proof unfold_locales
+qed (rule int_assoc int_zero int_minus)+
+
+thm int.assoc int.semi_axioms
+
+interpretation int2: semi "op +"
+  by unfold_locales  (* subsumed, thm int2.assoc not generated *)
+
+thm int.lone int.right.rone
+  (* the latter comes through the sublocale relation *)
+
+
+subsection {* Interpretation in theory, then sublocale *}
+
+interpretation (* fol: *) logic "op +" "minus"
+(* FIXME declaration of qualified names *)
+  by unfold_locales (rule int_assoc int_minus2)+
+
+locale logic2 =
+  fixes land (infixl "&&" 55)
+    and lnot ("-- _" [60] 60)
+  assumes assoc: "(x && y) && z = x && (y && z)"
+    and notnot: "-- (-- x) = x"
+begin
+
+(* FIXME interpretation below fails
+definition lor (infixl "||" 50) where
+  "x || y = --(-- x && -- y)"
+*)
+
+end
+
+sublocale logic < two: logic2
+  by unfold_locales (rule assoc notnot)+
+
+thm two.assoc
+
+
+subsection {* Declarations and sublocale *}
+
+locale logic_a = logic
+locale logic_b = logic
+
+sublocale logic_a < logic_b
+  by unfold_locales
+
+
+subsection {* Equations *}
+
+locale logic_o =
+  fixes land (infixl "&&" 55)
+    and lnot ("-- _" [60] 60)
+  assumes assoc_o: "(x && y) && z <-> x && (y && z)"
+    and notnot_o: "-- (-- x) <-> x"
+begin
+
+definition lor_o (infixl "||" 50) where
+  "x || y <-> --(-- x && -- y)"
+
+end
+
+interpretation x!: logic_o "op &" "Not"
+  where bool_logic_o: "logic_o.lor_o(op &, Not, x, y) <-> x | y"
+proof -
+  show bool_logic_o: "PROP logic_o(op &, Not)" by unfold_locales fast+
+  show "logic_o.lor_o(op &, Not, x, y) <-> x | y"
+    by (unfold logic_o.lor_o_def [OF bool_logic_o]) fast
+qed
+
+thm x.lor_o_def bool_logic_o
+
+lemma lor_triv: "z <-> z" ..
+
+lemma (in logic_o) lor_triv: "x || y <-> x || y" by fast
+
+thm lor_triv [where z = True] (* Check strict prefix. *)
+  x.lor_triv
+
+
+subsection {* Interpretation in proofs *}
+
+lemma True
+proof
+  interpret "local": lgrp "op +" "0" "minus"
+    by unfold_locales  (* subsumed *)
+  {
+    fix zero :: int
+    assume "!!x. zero + x = x" "!!x. (-x) + x = zero"
+    then interpret local_fixed: lgrp "op +" zero "minus"
+      by unfold_locales
+    thm local_fixed.lone
+  }
+  assume "!!x zero. zero + x = x" "!!x zero. (-x) + x = zero"
+  then interpret local_free: lgrp "op +" zero "minus" for zero
+    by unfold_locales
+  thm local_free.lone [where ?zero = 0]
+qed
+
+end
--- a/src/FOL/ex/NewLocaleSetup.thy	Mon Jan 05 19:37:15 2009 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,64 +0,0 @@
-(*  Title:      FOL/ex/NewLocaleSetup.thy
-    Author:     Clemens Ballarin, TU Muenchen
-
-Testing environment for locale expressions --- experimental.
-*)
-
-theory NewLocaleSetup
-imports FOL
-begin
-
-ML {*
-
-local
-
-structure P = OuterParse and K = OuterKeyword;
-val opt_bang = Scan.optional (P.$$$ "!" >> K true) false;
-
-val locale_val =
-  SpecParse.locale_expression --
-    Scan.optional (P.$$$ "+" |-- P.!!! (Scan.repeat1 SpecParse.context_element)) [] ||
-  Scan.repeat1 SpecParse.context_element >> pair ([], []);
-
-in
-
-val _ =
-  OuterSyntax.command "locale" "define named proof context" K.thy_decl
-    (P.name -- Scan.optional (P.$$$ "=" |-- P.!!! locale_val) (([], []), []) -- P.opt_begin
-      >> (fn ((name, (expr, elems)), begin) =>
-          (begin ? Toplevel.print) o Toplevel.begin_local_theory begin
-            (Expression.add_locale_cmd name name expr elems #>
-              (fn ((target, notes), ctxt) => TheoryTarget.begin target ctxt |>
-                fold (fn (kind, facts) => LocalTheory.notes kind facts #> snd) notes))));
-
-val _ =
-  OuterSyntax.improper_command "print_locales" "print locales of this theory" K.diag
-    (Scan.succeed (Toplevel.no_timing o (Toplevel.unknown_theory o
-  Toplevel.keep (NewLocale.print_locales o Toplevel.theory_of))));
-
-val _ = OuterSyntax.improper_command "print_locale" "print named locale in this theory" K.diag
-  (opt_bang -- P.xname >> (Toplevel.no_timing oo (fn (show_facts, name) =>
-   Toplevel.unknown_theory o Toplevel.keep (fn state =>
-     NewLocale.print_locale (Toplevel.theory_of state) show_facts name))));
-
-val _ =
-  OuterSyntax.command "interpretation"
-    "prove interpretation of locale expression in theory" K.thy_goal
-    (P.!!! SpecParse.locale_expression --
-      Scan.optional (P.$$$ "where" |-- P.and_list1 (SpecParse.opt_thm_name ":" -- P.prop)) []
-        >> (fn (expr, mixin) => Toplevel.print o
-            Toplevel.theory_to_proof (Expression.interpretation_cmd expr mixin)));
-
-val _ =
-  OuterSyntax.command "interpret"
-    "prove interpretation of locale expression in proof context"
-    (K.tag_proof K.prf_goal)
-    (P.!!! SpecParse.locale_expression
-        >> (fn expr => Toplevel.print o
-            Toplevel.proof' (fn int => Expression.interpret_cmd expr int)));
-
-end
-
-*}
-
-end
--- a/src/FOL/ex/NewLocaleTest.thy	Mon Jan 05 19:37:15 2009 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,486 +0,0 @@
-(*  Title:      FOL/ex/NewLocaleTest.thy
-    Author:     Clemens Ballarin, TU Muenchen
-
-Testing environment for locale expressions --- experimental.
-*)
-
-theory NewLocaleTest
-imports NewLocaleSetup
-begin
-
-ML_val {* set Toplevel.debug *}
-
-
-typedecl int arities int :: "term"
-consts plus :: "int => int => int" (infixl "+" 60)
-  zero :: int ("0")
-  minus :: "int => int" ("- _")
-
-axioms
-  int_assoc: "(x + y::int) + z = x + (y + z)"
-  int_zero: "0 + x = x"
-  int_minus: "(-x) + x = 0"
-  int_minus2: "-(-x) = x"
-
-section {* Inference of parameter types *}
-
-locale param1 = fixes p
-print_locale! param1
-
-locale param2 = fixes p :: 'b
-print_locale! param2
-
-(*
-locale param_top = param2 r for r :: "'b :: {}"
-  Fails, cannot generalise parameter.
-*)
-
-locale param3 = fixes p (infix ".." 50)
-print_locale! param3
-
-locale param4 = fixes p :: "'a => 'a => 'a" (infix ".." 50)
-print_locale! param4
-
-
-subsection {* Incremental type constraints *}
-
-locale constraint1 =
-  fixes  prod (infixl "**" 65)
-  assumes l_id: "x ** y = x"
-  assumes assoc: "(x ** y) ** z = x ** (y ** z)"
-print_locale! constraint1
-
-locale constraint2 =
-  fixes p and q
-  assumes "p = q"
-print_locale! constraint2
-
-
-section {* Inheritance *}
-
-locale semi =
-  fixes prod (infixl "**" 65)
-  assumes assoc: "(x ** y) ** z = x ** (y ** z)"
-print_locale! semi thm semi_def
-
-locale lgrp = semi +
-  fixes one and inv
-  assumes lone: "one ** x = x"
-    and linv: "inv(x) ** x = one"
-print_locale! lgrp thm lgrp_def lgrp_axioms_def
-
-locale add_lgrp = semi "op ++" for sum (infixl "++" 60) +
-  fixes zero and neg
-  assumes lzero: "zero ++ x = x"
-    and lneg: "neg(x) ++ x = zero"
-print_locale! add_lgrp thm add_lgrp_def add_lgrp_axioms_def
-
-locale rev_lgrp = semi "%x y. y ++ x" for sum (infixl "++" 60)
-print_locale! rev_lgrp thm rev_lgrp_def
-
-locale hom = f: semi f + g: semi g for f and g
-print_locale! hom thm hom_def
-
-locale perturbation = semi + d: semi "%x y. delta(x) ** delta(y)" for delta
-print_locale! perturbation thm perturbation_def
-
-locale pert_hom = d1: perturbation f d1 + d2: perturbation f d2 for f d1 d2
-print_locale! pert_hom thm pert_hom_def
-
-text {* Alternative expression, obtaining nicer names in @{text "semi f"}. *}
-locale pert_hom' = semi f + d1: perturbation f d1 + d2: perturbation f d2 for f d1 d2
-print_locale! pert_hom' thm pert_hom'_def
-
-
-section {* Syntax declarations *}
-
-locale logic =
-  fixes land (infixl "&&" 55)
-    and lnot ("-- _" [60] 60)
-  assumes assoc: "(x && y) && z = x && (y && z)"
-    and notnot: "-- (-- x) = x"
-begin
-
-definition lor (infixl "||" 50) where
-  "x || y = --(-- x && -- y)"
-
-end
-print_locale! logic
-
-locale use_decl = logic + semi "op ||"
-print_locale! use_decl thm use_decl_def
-
-locale extra_type =
-  fixes a :: 'a
-    and P :: "'a => 'b => o"
-begin
-
-definition test :: "'a => o" where
-  "test(x) <-> (ALL b. P(x, b))"
-
-end
-
-term extra_type.test thm extra_type.test_def
-
-interpretation var: extra_type "0" "%x y. x = 0" .
-
-thm var.test_def
-
-
-section {* Foundational versions of theorems *}
-
-thm logic.assoc
-thm logic.lor_def
-
-
-section {* Defines *}
-
-locale logic_def =
-  fixes land (infixl "&&" 55)
-    and lor (infixl "||" 50)
-    and lnot ("-- _" [60] 60)
-  assumes assoc: "(x && y) && z = x && (y && z)"
-    and notnot: "-- (-- x) = x"
-  defines "x || y == --(-- x && -- y)"
-begin
-
-thm lor_def
-(* Can we get rid the the additional hypothesis, caused by LocalTheory.notes? *)
-
-lemma "x || y = --(-- x && --y)"
-  by (unfold lor_def) (rule refl)
-
-end
-
-(* Inheritance of defines *)
-
-locale logic_def2 = logic_def
-begin
-
-lemma "x || y = --(-- x && --y)"
-  by (unfold lor_def) (rule refl)
-
-end
-
-
-section {* Notes *}
-
-(* A somewhat arcane homomorphism example *)
-
-definition semi_hom where
-  "semi_hom(prod, sum, h) <-> (ALL x y. h(prod(x, y)) = sum(h(x), h(y)))"
-
-lemma semi_hom_mult:
-  "semi_hom(prod, sum, h) ==> h(prod(x, y)) = sum(h(x), h(y))"
-  by (simp add: semi_hom_def)
-
-locale semi_hom_loc = prod: semi prod + sum: semi sum
-  for prod and sum and h +
-  assumes semi_homh: "semi_hom(prod, sum, h)"
-  notes semi_hom_mult = semi_hom_mult [OF semi_homh]
-
-thm semi_hom_loc.semi_hom_mult
-(* unspecified, attribute not applied in backgroud theory !!! *)
-
-lemma (in semi_hom_loc) "h(prod(x, y)) = sum(h(x), h(y))"
-  by (rule semi_hom_mult)
-
-(* Referring to facts from within a context specification *)
-
-lemma
-  assumes x: "P <-> P"
-  notes y = x
-  shows True ..
-
-
-section {* Theorem statements *}
-
-lemma (in lgrp) lcancel:
-  "x ** y = x ** z <-> y = z"
-proof
-  assume "x ** y = x ** z"
-  then have "inv(x) ** x ** y = inv(x) ** x ** z" by (simp add: assoc)
-  then show "y = z" by (simp add: lone linv)
-qed simp
-print_locale! lgrp
-
-
-locale rgrp = semi +
-  fixes one and inv
-  assumes rone: "x ** one = x"
-    and rinv: "x ** inv(x) = one"
-begin
-
-lemma rcancel:
-  "y ** x = z ** x <-> y = z"
-proof
-  assume "y ** x = z ** x"
-  then have "y ** (x ** inv(x)) = z ** (x ** inv(x))"
-    by (simp add: assoc [symmetric])
-  then show "y = z" by (simp add: rone rinv)
-qed simp
-
-end
-print_locale! rgrp
-
-
-subsection {* Patterns *}
-
-lemma (in rgrp)
-  assumes "y ** x = z ** x" (is ?a)
-  shows "y = z" (is ?t)
-proof -
-  txt {* Weird proof involving patterns from context element and conclusion. *}
-  {
-    assume ?a
-    then have "y ** (x ** inv(x)) = z ** (x ** inv(x))"
-      by (simp add: assoc [symmetric])
-    then have ?t by (simp add: rone rinv)
-  }
-  note x = this
-  show ?t by (rule x [OF `?a`])
-qed
-
-
-section {* Interpretation between locales: sublocales *}
-
-sublocale lgrp < right: rgrp
-print_facts
-proof unfold_locales
-  {
-    fix x
-    have "inv(x) ** x ** one = inv(x) ** x" by (simp add: linv lone)
-    then show "x ** one = x" by (simp add: assoc lcancel)
-  }
-  note rone = this
-  {
-    fix x
-    have "inv(x) ** x ** inv(x) = inv(x) ** one"
-      by (simp add: linv lone rone)
-    then show "x ** inv(x) = one" by (simp add: assoc lcancel)
-  }
-qed
-
-(* effect on printed locale *)
-
-print_locale! lgrp
-
-(* use of derived theorem *)
-
-lemma (in lgrp)
-  "y ** x = z ** x <-> y = z"
-  apply (rule rcancel)
-  done
-
-(* circular interpretation *)
-
-sublocale rgrp < left: lgrp
-proof unfold_locales
-  {
-    fix x
-    have "one ** (x ** inv(x)) = x ** inv(x)" by (simp add: rinv rone)
-    then show "one ** x = x" by (simp add: assoc [symmetric] rcancel)
-  }
-  note lone = this
-  {
-    fix x
-    have "inv(x) ** (x ** inv(x)) = one ** inv(x)"
-      by (simp add: rinv lone rone)
-    then show "inv(x) ** x = one" by (simp add: assoc [symmetric] rcancel)
-  }
-qed
-
-(* effect on printed locale *)
-
-print_locale! rgrp
-print_locale! lgrp
-
-
-(* Duality *)
-
-locale order =
-  fixes less :: "'a => 'a => o" (infix "<<" 50)
-  assumes refl: "x << x"
-    and trans: "[| x << y; y << z |] ==> x << z"
-
-sublocale order < dual: order "%x y. y << x"
-  apply unfold_locales apply (rule refl) apply (blast intro: trans)
-  done
-
-print_locale! order  (* Only two instances of order. *)
-
-locale order' =
-  fixes less :: "'a => 'a => o" (infix "<<" 50)
-  assumes refl: "x << x"
-    and trans: "[| x << y; y << z |] ==> x << z"
-
-locale order_with_def = order'
-begin
-
-definition greater :: "'a => 'a => o" (infix ">>" 50) where
-  "x >> y <-> y << x"
-
-end
-
-sublocale order_with_def < dual: order' "op >>"
-  apply unfold_locales
-  unfolding greater_def
-  apply (rule refl) apply (blast intro: trans)
-  done
-
-print_locale! order_with_def
-(* Note that decls come after theorems that make use of them. *)
-
-
-(* locale with many parameters ---
-   interpretations generate alternating group A5 *)
-
-
-locale A5 =
-  fixes A and B and C and D and E
-  assumes eq: "A <-> B <-> C <-> D <-> E"
-
-sublocale A5 < 1: A5 _ _ D E C
-print_facts
-  using eq apply (blast intro: A5.intro) done
-
-sublocale A5 < 2: A5 C _ E _ A
-print_facts
-  using eq apply (blast intro: A5.intro) done
-
-sublocale A5 < 3: A5 B C A _ _
-print_facts
-  using eq apply (blast intro: A5.intro) done
-
-(* Any even permutation of parameters is subsumed by the above. *)
-
-print_locale! A5
-
-
-(* Free arguments of instance *)
-
-locale trivial =
-  fixes P and Q :: o
-  assumes Q: "P <-> P <-> Q"
-begin
-
-lemma Q_triv: "Q" using Q by fast
-
-end
-
-sublocale trivial < x: trivial x _
-  apply unfold_locales using Q by fast
-
-print_locale! trivial
-
-context trivial begin thm x.Q [where ?x = True] end
-
-sublocale trivial < y: trivial Q Q
-  by unfold_locales
-  (* Succeeds since previous interpretation is more general. *)
-
-print_locale! trivial  (* No instance for y created (subsumed). *)
-
-
-subsection {* Sublocale, then interpretation in theory *}
-
-interpretation int: lgrp "op +" "0" "minus"
-proof unfold_locales
-qed (rule int_assoc int_zero int_minus)+
-
-thm int.assoc int.semi_axioms
-
-interpretation int2: semi "op +"
-  by unfold_locales  (* subsumed, thm int2.assoc not generated *)
-
-thm int.lone int.right.rone
-  (* the latter comes through the sublocale relation *)
-
-
-subsection {* Interpretation in theory, then sublocale *}
-
-interpretation (* fol: *) logic "op +" "minus"
-(* FIXME declaration of qualified names *)
-  by unfold_locales (rule int_assoc int_minus2)+
-
-locale logic2 =
-  fixes land (infixl "&&" 55)
-    and lnot ("-- _" [60] 60)
-  assumes assoc: "(x && y) && z = x && (y && z)"
-    and notnot: "-- (-- x) = x"
-begin
-
-(* FIXME interpretation below fails
-definition lor (infixl "||" 50) where
-  "x || y = --(-- x && -- y)"
-*)
-
-end
-
-sublocale logic < two: logic2
-  by unfold_locales (rule assoc notnot)+
-
-thm two.assoc
-
-
-subsection {* Declarations and sublocale *}
-
-locale logic_a = logic
-locale logic_b = logic
-
-sublocale logic_a < logic_b
-  by unfold_locales
-
-
-subsection {* Equations *}
-
-locale logic_o =
-  fixes land (infixl "&&" 55)
-    and lnot ("-- _" [60] 60)
-  assumes assoc_o: "(x && y) && z <-> x && (y && z)"
-    and notnot_o: "-- (-- x) <-> x"
-begin
-
-definition lor_o (infixl "||" 50) where
-  "x || y <-> --(-- x && -- y)"
-
-end
-
-interpretation x!: logic_o "op &" "Not"
-  where bool_logic_o: "logic_o.lor_o(op &, Not, x, y) <-> x | y"
-proof -
-  show bool_logic_o: "PROP logic_o(op &, Not)" by unfold_locales fast+
-  show "logic_o.lor_o(op &, Not, x, y) <-> x | y"
-    by (unfold logic_o.lor_o_def [OF bool_logic_o]) fast
-qed
-
-thm x.lor_o_def bool_logic_o
-
-lemma lor_triv: "z <-> z" ..
-
-lemma (in logic_o) lor_triv: "x || y <-> x || y" by fast
-
-thm lor_triv [where z = True] (* Check strict prefix. *)
-  x.lor_triv
-
-
-subsection {* Interpretation in proofs *}
-
-lemma True
-proof
-  interpret "local": lgrp "op +" "0" "minus"
-    by unfold_locales  (* subsumed *)
-  {
-    fix zero :: int
-    assume "!!x. zero + x = x" "!!x. (-x) + x = zero"
-    then interpret local_fixed: lgrp "op +" zero "minus"
-      by unfold_locales
-    thm local_fixed.lone
-  }
-  assume "!!x zero. zero + x = x" "!!x zero. (-x) + x = zero"
-  then interpret local_free: lgrp "op +" zero "minus" for zero
-    by unfold_locales
-  thm local_free.lone [where ?zero = 0]
-qed
-
-end
--- a/src/FOL/ex/ROOT.ML	Mon Jan 05 19:37:15 2009 +0100
+++ b/src/FOL/ex/ROOT.ML	Tue Jan 06 08:50:12 2009 +0100
@@ -29,5 +29,5 @@
 ];
 
 (*regression test for locales -- sets several global flags!*)
-no_document use_thy "NewLocaleTest";
+no_document use_thy "LocaleTest";
 
--- a/src/HOL/Statespace/state_space.ML	Mon Jan 05 19:37:15 2009 +0100
+++ b/src/HOL/Statespace/state_space.ML	Tue Jan 06 08:50:12 2009 +0100
@@ -155,15 +155,13 @@
 fun add_locale name expr elems thy =
   thy 
   |> Expression.add_locale name name expr elems
-  |> (fn ((target, notes), ctxt) => TheoryTarget.begin target ctxt |>
-           fold (fn (kind, facts) => LocalTheory.notes kind facts #> snd) notes)
+  |> snd
   |> LocalTheory.exit;
 
 fun add_locale_cmd name expr elems thy =
   thy 
   |> Expression.add_locale_cmd name name expr elems
-  |> (fn ((target, notes), ctxt) => TheoryTarget.begin target ctxt |>
-           fold (fn (kind, facts) => LocalTheory.notes kind facts #> snd) notes)
+  |> snd
   |> LocalTheory.exit;
 
 type statespace_info =
@@ -265,7 +263,7 @@
       in EVERY [rtac rule i] st
       end
 
-    fun tac ctxt = EVERY [NewLocale.intro_locales_tac true ctxt [],
+    fun tac ctxt = EVERY [Locale.intro_locales_tac true ctxt [],
                           ALLGOALS (SUBGOAL (solve_tac ctxt))]
 
   in thy
@@ -429,7 +427,7 @@
       let
         val expr = ([(pname, (("",false), Expression.Positional rs))],[])
       in prove_interpretation_in
-           (fn ctxt => NewLocale.intro_locales_tac false ctxt [])
+           (fn ctxt => Locale.intro_locales_tac false ctxt [])
            (full_name, expr) end;
 
     fun declare_declinfo updates lthy phi ctxt =
--- a/src/Pure/IsaMakefile	Mon Jan 05 19:37:15 2009 +0100
+++ b/src/Pure/IsaMakefile	Tue Jan 06 08:50:12 2009 +0100
@@ -36,18 +36,18 @@
   General/stack.ML General/symbol.ML General/symbol_pos.ML		\
   General/table.ML General/url.ML General/xml.ML General/yxml.ML	\
   Isar/ROOT.ML Isar/antiquote.ML Isar/args.ML Isar/attrib.ML		\
-  Isar/auto_bind.ML Isar/calculation.ML Isar/class.ML Isar/code.ML	\
+  Isar/auto_bind.ML Isar/calculation.ML Isar/class.ML Isar/class_target.ML Isar/code.ML	\
   Isar/code_unit.ML Isar/constdefs.ML Isar/context_rules.ML		\
   Isar/element.ML Isar/expression.ML Isar/find_theorems.ML		\
-  Isar/instance.ML Isar/isar.ML Isar/isar_cmd.ML Isar/isar_syn.ML	\
+  Isar/isar.ML Isar/isar_cmd.ML Isar/isar_syn.ML	\
   Isar/local_defs.ML Isar/local_syntax.ML Isar/local_theory.ML		\
-  Isar/locale.ML Isar/method.ML Isar/net_rules.ML Isar/new_locale.ML	\
+  Isar/locale.ML Isar/method.ML Isar/net_rules.ML Isar/old_locale.ML	\
   Isar/object_logic.ML Isar/obtain.ML Isar/outer_keyword.ML		\
   Isar/outer_lex.ML Isar/outer_parse.ML Isar/outer_syntax.ML		\
   Isar/overloading.ML Isar/proof.ML Isar/proof_context.ML		\
   Isar/proof_display.ML Isar/proof_node.ML Isar/rule_cases.ML		\
   Isar/rule_insts.ML Isar/session.ML Isar/skip_proof.ML			\
-  Isar/spec_parse.ML Isar/specification.ML Isar/subclass.ML		\
+  Isar/spec_parse.ML Isar/specification.ML		\
   Isar/theory_target.ML Isar/toplevel.ML Isar/value_parse.ML		\
   ML-Systems/alice.ML ML-Systems/exn.ML					\
   ML-Systems/install_pp_polyml.ML ML-Systems/ml_name_space.ML		\
--- a/src/Pure/Isar/ROOT.ML	Mon Jan 05 19:37:15 2009 +0100
+++ b/src/Pure/Isar/ROOT.ML	Tue Jan 06 08:50:12 2009 +0100
@@ -53,13 +53,12 @@
 (*local theories and targets*)
 use "local_theory.ML";
 use "overloading.ML";
+use "old_locale.ML";
 use "locale.ML";
-use "new_locale.ML";
-use "class.ML";
+use "class_target.ML";
 use "theory_target.ML";
 use "expression.ML";
-use "instance.ML";
-use "subclass.ML";
+use "class.ML";
 
 (*complex proof machineries*)
 use "../simplifier.ML";
--- a/src/Pure/Isar/class.ML	Mon Jan 05 19:37:15 2009 +0100
+++ b/src/Pure/Isar/class.ML	Tue Jan 06 08:50:12 2009 +0100
@@ -1,364 +1,33 @@
-(*  Title:      Pure/Isar/class.ML
-    ID:         $Id$
+(*  Title:      Pure/Isar/ML
     Author:     Florian Haftmann, TU Muenchen
 
-Type classes derived from primitive axclasses and locales.
+Type classes derived from primitive axclasses and locales - interfaces
 *)
 
 signature CLASS =
 sig
-  (*classes*)
+  include CLASS_TARGET
+    (*FIXME the split in class_target.ML, theory_target.ML and
+      ML is artificial*)
+
   val class: bstring -> class list -> Element.context_i list
     -> theory -> string * Proof.context
   val class_cmd: bstring -> xstring list -> Element.context list
     -> theory -> string * Proof.context
-
-  val init: class -> theory -> Proof.context
-  val declare: class -> Properties.T
-    -> (string * mixfix) * term -> theory -> theory
-  val abbrev: class -> Syntax.mode -> Properties.T
-    -> (string * mixfix) * term -> theory -> theory
-  val refresh_syntax: class -> Proof.context -> Proof.context
-
-  val intro_classes_tac: thm list -> tactic
-  val default_intro_tac: Proof.context -> thm list -> tactic
-  val prove_subclass: class * class -> thm option -> theory -> theory
-
-  val class_prefix: string -> string
-  val is_class: theory -> class -> bool
-  val these_params: theory -> sort -> (string * (class * (string * typ))) list
-  val print_classes: theory -> unit
-
-  (*instances*)
-  val init_instantiation: string list * (string * sort) list * sort
-    -> theory -> local_theory
-  val instantiation_instance: (local_theory -> local_theory)
-    -> local_theory -> Proof.state
-  val prove_instantiation_instance: (Proof.context -> tactic)
-    -> local_theory -> local_theory
-  val prove_instantiation_exit: (Proof.context -> tactic)
-    -> local_theory -> theory
-  val prove_instantiation_exit_result: (morphism -> 'a -> 'b)
-    -> (Proof.context -> 'b -> tactic) -> 'a -> local_theory -> 'b * theory
-  val conclude_instantiation: local_theory -> local_theory
-  val instantiation_param: local_theory -> string -> string option
-  val confirm_declaration: string -> local_theory -> local_theory
-  val pretty_instantiation: local_theory -> Pretty.T
-  val type_name: string -> string
-
-  (*old axclass layer*)
-  val axclass_cmd: bstring * xstring list
-    -> (Attrib.binding * string list) list
-    -> theory -> class * theory
-  val classrel_cmd: xstring * xstring -> theory -> Proof.state
-
-  (*old instance layer*)
-  val instance_arity: (theory -> theory) -> arity -> theory -> Proof.state
-  val instance_arity_cmd: bstring * xstring list * xstring -> theory -> Proof.state
+  val prove_subclass: tactic -> class -> local_theory -> local_theory
+  val subclass: class -> local_theory -> Proof.state
+  val subclass_cmd: xstring -> local_theory -> Proof.state
 end;
 
 structure Class : CLASS =
 struct
 
-(*temporary adaption code to mediate between old and new locale code*)
-
-structure Old_Locale =
-struct
-
-val intro_locales_tac = Locale.intro_locales_tac; (*already forked!*)
-
-val interpretation = Locale.interpretation;
-val interpretation_in_locale = Locale.interpretation_in_locale;
-val get_interpret_morph = Locale.get_interpret_morph;
-val Locale = Locale.Locale;
-val extern = Locale.extern;
-val intros = Locale.intros;
-val dests = Locale.dests;
-val init = Locale.init;
-val Merge = Locale.Merge;
-val parameters_of_expr = Locale.parameters_of_expr;
-val empty = Locale.empty;
-val cert_expr = Locale.cert_expr;
-val read_expr = Locale.read_expr;
-val parameters_of = Locale.parameters_of;
-val add_locale = Locale.add_locale;
-
-end;
-
-(*structure New_Locale =
-struct
-
-val intro_locales_tac = Locale.intro_locales_tac; (*already forked!*)
-
-val interpretation = Locale.interpretation; (*!*)
-val interpretation_in_locale = Locale.interpretation_in_locale; (*!*)
-val get_interpret_morph = Locale.get_interpret_morph; (*!*)
-fun Locale loc = ([(loc, ("", Expression.Positional []))], []);
-val extern = NewLocale.extern;
-val intros = Locale.intros; (*!*)
-val dests = Locale.dests; (*!*)
-val init = NewLocale.init;
-fun Merge locs = (map (fn loc => (loc, ("", Expression.Positional []))) locs, []);
-val parameters_of_expr = Locale.parameters_of_expr; (*!*)
-val empty = ([], []);
-val cert_expr = Locale.cert_expr; (*!"*)
-val read_expr = Locale.read_expr; (*!"*)
-val parameters_of = NewLocale.params_of; (*why typ option?*)
-val add_locale = Expression.add_locale;
-
-end;*)
-
-structure Locale = Old_Locale;
-
-(*proper code again*)
-
-
-(** auxiliary **)
-
-fun prove_interpretation tac prfx_atts expr inst =
-  Locale.interpretation I prfx_atts expr inst
-  ##> Proof.global_terminal_proof
-      (Method.Basic (fn ctxt => Method.SIMPLE_METHOD (tac ctxt), Position.none), NONE)
-  ##> ProofContext.theory_of;
-
-fun prove_interpretation_in tac after_qed (name, expr) =
-  Locale.interpretation_in_locale
-      (ProofContext.theory after_qed) (name, expr)
-  #> Proof.global_terminal_proof
-      (Method.Basic (K (Method.SIMPLE_METHOD tac), Position.none), NONE)
-  #> ProofContext.theory_of;
-
-val class_prefix = Logic.const_of_class o Sign.base_name;
-
-fun class_name_morphism class =
-  Binding.map_prefix (K (Binding.add_prefix false (class_prefix class)));
-
-fun activate_class_morphism thy class inst morphism =
-  Locale.get_interpret_morph thy (class_name_morphism class) (class, "") morphism class inst;
-
-fun prove_class_interpretation class inst consts hyp_facts def_facts thy =
-  let
-    val constraints = map (fn (class, c) => map_atyps (K (TFree (Name.aT,
-      [class]))) (Sign.the_const_type thy c)) consts;
-    val no_constraints = map (map_atyps (K (TFree (Name.aT, [])))) constraints;
-    fun add_constraint c T = Sign.add_const_constraint (c, SOME T);
-    fun tac ctxt = ALLGOALS (ProofContext.fact_tac (hyp_facts @ def_facts)
-      ORELSE' (fn n => SELECT_GOAL (Locale.intro_locales_tac false ctxt []) n));
-    val prfx = class_prefix class;
-  in
-    thy
-    |> fold2 add_constraint (map snd consts) no_constraints
-    |> prove_interpretation tac (class_name_morphism class) (Locale.Locale class)
-          (map SOME inst, map (pair (Attrib.empty_binding) o Thm.prop_of) def_facts)
-    ||> fold2 add_constraint (map snd consts) constraints
-  end;
-
-
-(** primitive axclass and instance commands **)
-
-fun axclass_cmd (class, raw_superclasses) raw_specs thy =
-  let
-    val ctxt = ProofContext.init thy;
-    val superclasses = map (Sign.read_class thy) raw_superclasses;
-    val name_atts = map ((apsnd o map) (Attrib.attribute thy) o fst)
-      raw_specs;
-    val axiomss = ProofContext.read_propp (ctxt, map (map (rpair []) o snd)
-          raw_specs)
-      |> snd
-      |> (map o map) fst;
-  in
-    AxClass.define_class (class, superclasses) []
-      (name_atts ~~ axiomss) thy
-  end;
-
-local
-
-fun gen_instance mk_prop add_thm after_qed insts thy =
-  let
-    fun after_qed' results =
-      ProofContext.theory ((fold o fold) add_thm results #> after_qed);
-  in
-    thy
-    |> ProofContext.init
-    |> Proof.theorem_i NONE after_qed' ((map (fn t => [(t, [])])
-        o mk_prop thy) insts)
-  end;
-
-in
-
-val instance_arity =
-  gen_instance (Logic.mk_arities oo Sign.cert_arity) AxClass.add_arity;
-val instance_arity_cmd =
-  gen_instance (Logic.mk_arities oo Sign.read_arity) AxClass.add_arity I;
-val classrel =
-  gen_instance (single oo (Logic.mk_classrel oo AxClass.cert_classrel)) AxClass.add_classrel I;
-val classrel_cmd =
-  gen_instance (single oo (Logic.mk_classrel oo AxClass.read_classrel)) AxClass.add_classrel I;
-
-end; (*local*)
-
-
-(** class data **)
-
-datatype class_data = ClassData of {
+open Class_Target;
 
-  (* static part *)
-  consts: (string * string) list
-    (*locale parameter ~> constant name*),
-  base_sort: sort,
-  inst: term list
-    (*canonical interpretation*),
-  morphism: Morphism.morphism * ((typ Vartab.table * typ list) * (term Vartab.table * term list))
-    (*morphism cookie of canonical interpretation*),
-  assm_intro: thm option,
-  of_class: thm,
-  axiom: thm option,
-  
-  (* dynamic part *)
-  defs: thm list,
-  operations: (string * (class * (typ * term))) list
-
-};
-
-fun rep_class_data (ClassData d) = d;
-fun mk_class_data ((consts, base_sort, inst, morphism, assm_intro, of_class, axiom),
-    (defs, operations)) =
-  ClassData { consts = consts, base_sort = base_sort, inst = inst,
-    morphism = morphism, assm_intro = assm_intro, of_class = of_class, axiom = axiom,
-    defs = defs, operations = operations };
-fun map_class_data f (ClassData { consts, base_sort, inst, morphism, assm_intro,
-    of_class, axiom, defs, operations }) =
-  mk_class_data (f ((consts, base_sort, inst, morphism, assm_intro, of_class, axiom),
-    (defs, operations)));
-fun merge_class_data _ (ClassData { consts = consts,
-    base_sort = base_sort, inst = inst, morphism = morphism, assm_intro = assm_intro,
-    of_class = of_class, axiom = axiom, defs = defs1, operations = operations1 },
-  ClassData { consts = _, base_sort = _, inst = _, morphism = _, assm_intro = _,
-    of_class = _, axiom = _, defs = defs2, operations = operations2 }) =
-  mk_class_data ((consts, base_sort, inst, morphism, assm_intro, of_class, axiom),
-    (Thm.merge_thms (defs1, defs2),
-      AList.merge (op =) (K true) (operations1, operations2)));
-
-structure ClassData = TheoryDataFun
-(
-  type T = class_data Graph.T
-  val empty = Graph.empty;
-  val copy = I;
-  val extend = I;
-  fun merge _ = Graph.join merge_class_data;
-);
-
-
-(* queries *)
-
-val lookup_class_data = Option.map rep_class_data oo try o Graph.get_node o ClassData.get;
-
-fun the_class_data thy class = case lookup_class_data thy class
- of NONE => error ("Undeclared class " ^ quote class)
-  | SOME data => data;
-
-val is_class = is_some oo lookup_class_data;
-
-val ancestry = Graph.all_succs o ClassData.get;
-
-fun the_inst thy = #inst o the_class_data thy;
-
-fun these_params thy =
-  let
-    fun params class =
-      let
-        val const_typs = (#params o AxClass.get_info thy) class;
-        val const_names = (#consts o the_class_data thy) class;
-      in
-        (map o apsnd)
-          (fn c => (class, (c, (the o AList.lookup (op =) const_typs) c))) const_names
-      end;
-  in maps params o ancestry thy end;
-
-fun these_assm_intros thy =
-  Graph.fold (fn (_, (data, _)) => fold (insert Thm.eq_thm)
-    ((the_list o #assm_intro o rep_class_data) data)) (ClassData.get thy) [];
-
-fun these_defs thy = maps (these o Option.map #defs o lookup_class_data thy) o ancestry thy;
-
-fun these_operations thy =
-  maps (#operations o the_class_data thy) o ancestry thy;
-
-fun morphism thy class =
-  let
-    val { inst, morphism, ... } = the_class_data thy class;
-  in activate_class_morphism thy class inst morphism end;
-
-fun print_classes thy =
-  let
-    val ctxt = ProofContext.init thy;
-    val algebra = Sign.classes_of thy;
-    val arities =
-      Symtab.empty
-      |> Symtab.fold (fn (tyco, arities) => fold (fn (class, _) =>
-           Symtab.map_default (class, []) (insert (op =) tyco)) arities)
-             ((#arities o Sorts.rep_algebra) algebra);
-    val the_arities = these o Symtab.lookup arities;
-    fun mk_arity class tyco =
-      let
-        val Ss = Sorts.mg_domain algebra tyco [class];
-      in Syntax.pretty_arity ctxt (tyco, Ss, [class]) end;
-    fun mk_param (c, ty) = Pretty.str (Sign.extern_const thy c ^ " :: "
-      ^ setmp show_sorts false (Syntax.string_of_typ ctxt o Type.strip_sorts) ty);
-    fun mk_entry class = (Pretty.block o Pretty.fbreaks o map_filter I) [
-      (SOME o Pretty.str) ("class " ^ Sign.extern_class thy class ^ ":"),
-      (SOME o Pretty.block) [Pretty.str "supersort: ",
-        (Syntax.pretty_sort ctxt o Sign.minimize_sort thy o Sign.super_classes thy) class],
-      if is_class thy class then (SOME o Pretty.str)
-        ("locale: " ^ Locale.extern thy class) else NONE,
-      ((fn [] => NONE | ps => (SOME o Pretty.block o Pretty.fbreaks)
-          (Pretty.str "parameters:" :: ps)) o map mk_param
-        o these o Option.map #params o try (AxClass.get_info thy)) class,
-      (SOME o Pretty.block o Pretty.breaks) [
-        Pretty.str "instances:",
-        Pretty.list "" "" (map (mk_arity class) (the_arities class))
-      ]
-    ]
-  in
-    (Pretty.writeln o Pretty.chunks o separate (Pretty.str "")
-      o map mk_entry o Sorts.all_classes) algebra
-  end;
-
-
-(* updaters *)
-
-fun add_class_data ((class, superclasses),
-    (params, base_sort, inst, phi, axiom, assm_intro, of_class)) thy =
-  let
-    val operations = map (fn (v_ty as (_, ty), (c, _)) =>
-      (c, (class, (ty, Free v_ty)))) params;
-    val add_class = Graph.new_node (class,
-        mk_class_data (((map o pairself) fst params, base_sort,
-          inst, phi, assm_intro, of_class, axiom), ([], operations)))
-      #> fold (curry Graph.add_edge class) superclasses;
-  in ClassData.map add_class thy end;
-
-fun register_operation class (c, (t, some_def)) thy =
-  let
-    val base_sort = (#base_sort o the_class_data thy) class;
-    val prep_typ = map_type_tvar
-      (fn (vi as (v, _), sort) => if Name.aT = v
-        then TFree (v, base_sort) else TVar (vi, sort));
-    val t' = map_types prep_typ t;
-    val ty' = Term.fastype_of t';
-  in
-    thy
-    |> (ClassData.map o Graph.map_node class o map_class_data o apsnd)
-      (fn (defs, operations) =>
-        (fold cons (the_list some_def) defs,
-          (c, (class, (ty', t'))) :: operations))
-  end;
-
-
-(** rule calculation, tactics and methods **)
+(** rule calculation **)
 
 fun calculate_axiom thy sups base_sort assm_axiom param_map class =
-  case Locale.intros thy class
+  case Old_Locale.intros thy class
    of (_, []) => assm_axiom
     | (_, [intro]) =>
       let
@@ -366,7 +35,7 @@
           (base_sort, sort)], map (fn (v, (c, ty)) => pairself (Thm.cterm_of thy)
             (Var ((v, 0), map_atyps (fn _ => TVar ((Name.aT, 0), sort)) ty),
               Const (c, map_atyps (fn _ => TVar ((Name.aT, 0), sort)) ty))) param_map);
-        val axiom_premises = map_filter (#axiom o the_class_data thy) sups
+        val axiom_premises = map_filter (fst o rules thy) sups
           @ the_list assm_axiom;
       in intro
         |> instantiate thy [class]
@@ -383,7 +52,7 @@
         (Var ((v, 0), map_atyps (fn _ => TVar ((Name.aT, 0), sort)) ty),
           Const (c, map_atyps (fn _ => TVar ((Name.aT, 0), sort)) ty))) param_map);
     val defs = these_defs thy sups;
-    val assm_intro = Locale.intros thy class
+    val assm_intro = Old_Locale.intros thy class
       |> fst
       |> map (instantiate thy base_sort)
       |> map (MetaSimplifier.rewrite_rule defs)
@@ -394,8 +63,8 @@
         (TVar ((Name.aT, 0), base_sort), TFree (Name.aT, base_sort))], [])
     val of_class_sups = if null sups
       then map (fixate o Thm.class_triv thy) base_sort
-      else map (fixate o #of_class o the_class_data thy) sups;
-    val locale_dests = map Drule.standard' (Locale.dests thy class);
+      else map (fixate o snd o rules thy) sups;
+    val locale_dests = map Drule.standard' (Old_Locale.dests thy class);
     val num_trivs = case length locale_dests
      of 0 => if is_none axiom then 0 else 1
       | n => n;
@@ -411,23 +80,6 @@
       |> Thm.close_derivation;
   in (assm_intro, of_class) end;
 
-fun prove_subclass (sub, sup) some_thm thy =
-  let
-    val of_class = (#of_class o the_class_data thy) sup;
-    val intro = case some_thm
-     of SOME thm => Drule.standard' (of_class OF [Drule.standard' thm])
-      | NONE => Thm.instantiate ([pairself (Thm.ctyp_of thy o TVar o pair (Name.aT, 0))
-          ([], [sub])], []) of_class;
-    val classrel = (intro OF (the_list o #axiom o the_class_data thy) sub)
-      |> Thm.close_derivation;
-  in
-    thy
-    |> AxClass.add_classrel classrel
-    |> prove_interpretation_in (ALLGOALS (ProofContext.fact_tac (the_list some_thm)))
-         I (sub, Locale.Locale sup)
-    |> ClassData.map (Graph.add_edge (sub, sup))
-  end;
-
 fun note_assm_intro class assm_intro thy =
   thy
   |> Sign.sticky_prefix (class_prefix class ^ "_" ^ AxClass.axiomsN)
@@ -435,147 +87,8 @@
   |> snd
   |> Sign.restore_naming thy;
 
-fun intro_classes_tac facts st =
-  let
-    val thy = Thm.theory_of_thm st;
-    val classes = Sign.all_classes thy;
-    val class_trivs = map (Thm.class_triv thy) classes;
-    val class_intros = map_filter (try (#intro o AxClass.get_info thy)) classes;
-    val assm_intros = these_assm_intros thy;
-  in
-    Method.intros_tac (class_trivs @ class_intros @ assm_intros) facts st
-  end;
 
-fun default_intro_tac ctxt [] =
-      intro_classes_tac [] ORELSE NewLocale.intro_locales_tac true ctxt [] ORELSE
-      Locale.intro_locales_tac true ctxt []
-  | default_intro_tac _ _ = no_tac;
-
-fun default_tac rules ctxt facts =
-  HEADGOAL (Method.some_rule_tac rules ctxt facts) ORELSE
-    default_intro_tac ctxt facts;
-
-val _ = Context.>> (Context.map_theory
-  (Method.add_methods
-   [("intro_classes", Method.no_args (Method.METHOD intro_classes_tac),
-      "back-chain introduction rules of classes"),
-    ("default", Method.thms_ctxt_args (Method.METHOD oo default_tac),
-      "apply some intro/elim rule")]));
-
-
-(** classes and class target **)
-
-(* class context syntax *)
-
-fun synchronize_class_syntax sups base_sort ctxt =
-  let
-    val thy = ProofContext.theory_of ctxt;
-    val algebra = Sign.classes_of thy;
-    val operations = these_operations thy sups;
-    fun subst_class_typ sort = map_type_tfree (K (TVar ((Name.aT, 0), sort)));
-    val primary_constraints =
-      (map o apsnd) (subst_class_typ base_sort o fst o snd) operations;
-    val secondary_constraints =
-      (map o apsnd) (fn (class, (ty, _)) => subst_class_typ [class] ty) operations;
-    fun declare_const (c, _) =
-      let val b = Sign.base_name c
-      in Sign.intern_const thy b = c ? Variable.declare_const (b, c) end;
-    fun improve (c, ty) = (case AList.lookup (op =) primary_constraints c
-     of SOME ty' => (case try (Type.raw_match (ty', ty)) Vartab.empty
-         of SOME tyenv => (case Vartab.lookup tyenv (Name.aT, 0)
-             of SOME (_, ty' as TVar (tvar as (vi, sort))) =>
-                  if TypeInfer.is_param vi
-                    andalso Sorts.sort_le algebra (base_sort, sort)
-                      then SOME (ty', TFree (Name.aT, base_sort))
-                      else NONE
-              | _ => NONE)
-          | NONE => NONE)
-      | NONE => NONE)
-    fun subst (c, ty) = Option.map snd (AList.lookup (op =) operations c);
-    val unchecks = map (fn (c, (_, (ty, t))) => (t, Const (c, ty))) operations;
-  in
-    ctxt
-    |> fold declare_const primary_constraints
-    |> Overloading.map_improvable_syntax (K (((primary_constraints, secondary_constraints),
-        (((improve, subst), true), unchecks)), false))
-    |> Overloading.set_primary_constraints
-  end;
-
-fun refresh_syntax class ctxt =
-  let
-    val thy = ProofContext.theory_of ctxt;
-    val base_sort = (#base_sort o the_class_data thy) class;
-  in synchronize_class_syntax [class] base_sort ctxt end;
-
-fun init_ctxt sups base_sort ctxt =
-  ctxt
-  |> Variable.declare_term
-      (Logic.mk_type (TFree (Name.aT, base_sort)))
-  |> synchronize_class_syntax sups base_sort
-  |> Overloading.add_improvable_syntax;
-
-fun init class thy =
-  thy
-  |> Locale.init class
-  |> init_ctxt [class] ((#base_sort o the_class_data thy) class);
-
-
-(* class target *)
-
-fun declare class pos ((c, mx), dict) thy =
-  let
-    val prfx = class_prefix class;
-    val thy' = thy |> Sign.add_path prfx;
-    val phi = morphism thy' class;
-    val inst = the_inst thy' class;
-    val params = map (apsnd fst o snd) (these_params thy' [class]);
-
-    val c' = Sign.full_bname thy' c;
-    val dict' = Morphism.term phi dict;
-    val dict_def = map_types Logic.unvarifyT dict';
-    val ty' = Term.fastype_of dict_def;
-    val ty'' = Type.strip_sorts ty';
-    val def_eq = Logic.mk_equals (Const (c', ty'), dict_def);
-    fun get_axiom thy = ((Thm.varifyT o Thm.axiom thy) c', thy);
-  in
-    thy'
-    |> Sign.declare_const pos ((Binding.name c, ty''), mx) |> snd
-    |> Thm.add_def false false (c, def_eq)
-    |>> Thm.symmetric
-    ||>> get_axiom
-    |-> (fn (def, def') => prove_class_interpretation class inst params [] [def]
-      #> snd
-        (*assumption: interpretation cookie does not change
-          by adding equations to interpretation*)
-      #> register_operation class (c', (dict', SOME (Thm.symmetric def')))
-      #> PureThy.store_thm (c ^ "_raw", def')
-      #> snd)
-    |> Sign.restore_naming thy
-    |> Sign.add_const_constraint (c', SOME ty')
-  end;
-
-fun abbrev class prmode pos ((c, mx), rhs) thy =
-  let
-    val prfx = class_prefix class;
-    val thy' = thy |> Sign.add_path prfx;
-
-    val unchecks = map (fn (c, (_, (ty, t))) => (t, Const (c, ty)))
-      (these_operations thy [class]);
-    val c' = Sign.full_bname thy' c;
-    val rhs' = Pattern.rewrite_term thy unchecks [] rhs;
-    val rhs'' = map_types Logic.varifyT rhs';
-    val ty' = Term.fastype_of rhs';
-  in
-    thy'
-    |> Sign.add_abbrev (#1 prmode) pos (Binding.name c, map_types Type.strip_sorts rhs'') |> snd
-    |> Sign.add_const_constraint (c', SOME ty')
-    |> Sign.notation true prmode [(Const (c', ty'), mx)]
-    |> not (#1 prmode = PrintMode.input) ? register_operation class (c', (rhs', NONE))
-    |> Sign.restore_naming thy
-  end;
-
-
-(* class definition *)
+(** define classes **)
 
 local
 
@@ -591,11 +104,11 @@
       else ();
     val base_sort = if null sups then supsort else
       foldr1 (Sorts.inter_sort (Sign.classes_of thy))
-        (map (#base_sort o the_class_data thy) sups);
-    val suplocales = map Locale.Locale sups;
-    val supexpr = Locale.Merge suplocales;
-    val supparams = (map fst o Locale.parameters_of_expr thy) supexpr;
-    val mergeexpr = Locale.Merge suplocales;
+        (map (base_sort thy) sups);
+    val suplocales = map Old_Locale.Locale sups;
+    val supexpr = Old_Locale.Merge suplocales;
+    val supparams = (map fst o Old_Locale.parameters_of_expr thy) supexpr;
+    val mergeexpr = Old_Locale.Merge suplocales;
     val constrain = Element.Constrains ((map o apsnd o map_atyps)
       (K (TFree (Name.aT, base_sort))) supparams);
     fun fork_syn (Element.Fixes xs) =
@@ -608,23 +121,23 @@
       in (constrain :: elems', global_syntax) end;
     val (elems, global_syntax) =
       ProofContext.init thy
-      |> Locale.cert_expr supexpr [constrain]
+      |> Old_Locale.cert_expr supexpr [constrain]
       |> snd
-      |> init_ctxt sups base_sort
-      |> process_expr Locale.empty raw_elems
+      |> begin sups base_sort
+      |> process_expr Old_Locale.empty raw_elems
       |> fst
       |> fork_syntax
   in (((sups, supparams), (supsort, base_sort, mergeexpr)), (elems, global_syntax)) end;
 
-val read_class_spec = gen_class_spec Sign.intern_class Locale.read_expr;
-val check_class_spec = gen_class_spec (K I) Locale.cert_expr;
+val read_class_spec = gen_class_spec Sign.intern_class Old_Locale.read_expr;
+val check_class_spec = gen_class_spec (K I) Old_Locale.cert_expr;
 
 fun add_consts bname class base_sort sups supparams global_syntax thy =
   let
     val supconsts = map fst supparams
       |> AList.make (snd o the o AList.lookup (op =) (these_params thy sups))
       |> (map o apsnd o apsnd o map_atyps o K o TFree) (Name.aT, [class]);
-    val all_params = map fst (Locale.parameters_of thy class);
+    val all_params = map fst (Old_Locale.parameters_of thy class);
     val raw_params = (snd o chop (length supparams)) all_params;
     fun add_const (v, raw_ty) thy =
       let
@@ -652,7 +165,7 @@
     fun globalize param_map = map_aterms
       (fn Free (v, ty) => Const ((fst o the o AList.lookup (op =) param_map) v, ty)
         | t => t);
-    val raw_pred = Locale.intros thy class
+    val raw_pred = Old_Locale.intros thy class
       |> fst
       |> map (Logic.unvarify o Logic.strip_imp_concl o Thm.prop_of);
     fun get_axiom thy = case (#axioms o AxClass.get_info thy) class
@@ -678,7 +191,7 @@
     val supconsts = map (apsnd fst o snd) (these_params thy sups);
   in
     thy
-    |> Locale.add_locale "" bname mergeexpr elems
+    |> Old_Locale.add_locale "" bname mergeexpr elems
     |> snd
     |> ProofContext.theory_of
     |> adjungate_axclass bname class base_sort sups supsort supparams global_syntax
@@ -692,8 +205,8 @@
     #-> (fn phi =>
         `(fn thy => calculate_rules thy phi sups base_sort param_map axiom class)
     #-> (fn (assm_intro, of_class) =>
-        add_class_data ((class, sups), (params, base_sort, inst,
-          morphism, axiom, assm_intro, of_class))
+        register class sups params base_sort inst
+          morphism axiom assm_intro of_class
     #> fold (note_assm_intro class) (the_list assm_intro))))))
     |> init class
     |> pair class
@@ -707,196 +220,58 @@
 end; (*local*)
 
 
-
-(** instantiation target **)
-
-(* bookkeeping *)
-
-datatype instantiation = Instantiation of {
-  arities: string list * (string * sort) list * sort,
-  params: ((string * string) * (string * typ)) list
-    (*(instantiation parameter, type constructor), (local instantiation parameter, typ)*)
-}
-
-structure Instantiation = ProofDataFun
-(
-  type T = instantiation
-  fun init _ = Instantiation { arities = ([], [], []), params = [] };
-);
+(** subclass relations **)
 
-fun mk_instantiation (arities, params) =
-  Instantiation { arities = arities, params = params };
-fun get_instantiation lthy = case Instantiation.get (LocalTheory.target_of lthy)
- of Instantiation data => data;
-fun map_instantiation f = (LocalTheory.target o Instantiation.map)
-  (fn Instantiation { arities, params } => mk_instantiation (f (arities, params)));
-
-fun the_instantiation lthy = case get_instantiation lthy
- of { arities = ([], [], []), ... } => error "No instantiation target"
-  | data => data;
-
-val instantiation_params = #params o get_instantiation;
-
-fun instantiation_param lthy v = instantiation_params lthy
-  |> find_first (fn (_, (v', _)) => v = v')
-  |> Option.map (fst o fst);
-
+local
 
-(* syntax *)
-
-fun synchronize_inst_syntax ctxt =
+fun gen_subclass prep_class do_proof raw_sup lthy =
   let
-    val Instantiation { arities = (_, _, sort), params = params } = Instantiation.get ctxt;
-    val thy = ProofContext.theory_of ctxt;
-    fun subst (c, ty) = case AxClass.inst_tyco_of thy (c, ty)
-         of SOME tyco => (case AList.lookup (op =) params (c, tyco)
-             of SOME (v_ty as (_, ty)) => SOME (ty, Free v_ty)
-              | NONE => NONE)
-          | NONE => NONE;
-    val unchecks =
-      map (fn ((c, _), v_ty as (_, ty)) => (Free v_ty, Const (c, ty))) params;
+    val thy = ProofContext.theory_of lthy;
+    val sup = prep_class thy raw_sup;
+    val sub = case TheoryTarget.peek lthy
+     of {is_class = false, ...} => error "Not a class context"
+      | {target, ...} => target;
+    val _ = if Sign.subsort thy ([sup], [sub])
+      then error ("Class " ^ Syntax.string_of_sort lthy [sup]
+        ^ " is subclass of class " ^ Syntax.string_of_sort lthy [sub])
+      else ();
+    val sub_params = map fst (these_params thy [sub]);
+    val sup_params = map fst (these_params thy [sup]);
+    val err_params = subtract (op =) sub_params sup_params;
+    val _ = if null err_params then [] else
+      error ("Class " ^ Syntax.string_of_sort lthy [sub] ^ " lacks parameter(s) " ^
+        commas_quote err_params ^ " of " ^ Syntax.string_of_sort lthy [sup]);
+    val sublocale_prop =
+      Old_Locale.global_asms_of thy sup
+      |> maps snd
+      |> try the_single
+      |> Option.map (ObjectLogic.ensure_propT thy);
+    fun after_qed some_thm =
+      LocalTheory.theory (prove_subclass_relation (sub, sup) some_thm)
+      #> (TheoryTarget.init (SOME sub) o ProofContext.theory_of);
   in
-    ctxt
-    |> Overloading.map_improvable_syntax
-         (fn (((primary_constraints, _), (((improve, _), _), _)), _) =>
-            (((primary_constraints, []), (((improve, subst), false), unchecks)), false))
-  end;
-
-
-(* target *)
-
-val sanatize_name = (*FIXME*)
-  let
-    fun is_valid s = Symbol.is_ascii_letter s orelse Symbol.is_ascii_digit s
-      orelse s = "'" orelse s = "_";
-    val is_junk = not o is_valid andf Symbol.is_regular;
-    val junk = Scan.many is_junk;
-    val scan_valids = Symbol.scanner "Malformed input"
-      ((junk |--
-        (Scan.optional (Scan.one Symbol.is_ascii_letter) "x" ^^ (Scan.many is_valid >> implode)
-        --| junk))
-      ::: Scan.repeat ((Scan.many1 is_valid >> implode) --| junk));
-  in
-    explode #> scan_valids #> implode
+    do_proof after_qed sublocale_prop lthy
   end;
 
-fun type_name "*" = "prod"
-  | type_name "+" = "sum"
-  | type_name s = sanatize_name (NameSpace.base s); (*FIXME*)
-
-fun resort_terms pp algebra consts constraints ts =
-  let
-    fun matchings (Const (c_ty as (c, _))) = (case constraints c
-         of NONE => I
-          | SOME sorts => fold2 (curry (Sorts.meet_sort algebra))
-              (Consts.typargs consts c_ty) sorts)
-      | matchings _ = I
-    val tvartab = (fold o fold_aterms) matchings ts Vartab.empty
-      handle Sorts.CLASS_ERROR e => error (Sorts.class_error pp e);
-    val inst = map_type_tvar
-      (fn (vi, sort) => TVar (vi, the_default sort (Vartab.lookup tvartab vi)));
-  in if Vartab.is_empty tvartab then NONE else SOME ((map o map_types) inst ts) end;
-
-fun init_instantiation (tycos, vs, sort) thy =
-  let
-    val _ = if null tycos then error "At least one arity must be given" else ();
-    val params = these_params thy sort;
-    fun get_param tyco (param, (_, (c, ty))) = if can (AxClass.param_of_inst thy) (c, tyco)
-      then NONE else SOME ((c, tyco),
-        (param ^ "_" ^ type_name tyco, map_atyps (K (Type (tyco, map TFree vs))) ty));
-    val inst_params = map_product get_param tycos params |> map_filter I;
-    val primary_constraints = map (apsnd
-      (map_atyps (K (TVar ((Name.aT, 0), [])))) o snd o snd) params;
-    val pp = Syntax.pp_global thy;
-    val algebra = Sign.classes_of thy
-      |> fold (fn tyco => Sorts.add_arities pp
-            (tyco, map (fn class => (class, map snd vs)) sort)) tycos;
-    val consts = Sign.consts_of thy;
-    val improve_constraints = AList.lookup (op =)
-      (map (fn (_, (class, (c, _))) => (c, [[class]])) params);
-    fun resort_check ts ctxt = case resort_terms pp algebra consts improve_constraints ts
-     of NONE => NONE
-      | SOME ts' => SOME (ts', ctxt);
-    fun improve (c, ty) = case AxClass.inst_tyco_of thy (c, ty)
-     of SOME tyco => (case AList.lookup (op =) inst_params (c, tyco)
-         of SOME (_, ty') => if Type.raw_instance (ty', ty) then SOME (ty, ty') else NONE
-          | NONE => NONE)
-      | NONE => NONE;
-  in
-    thy
-    |> ProofContext.init
-    |> Instantiation.put (mk_instantiation ((tycos, vs, sort), inst_params))
-    |> fold (Variable.declare_typ o TFree) vs
-    |> fold (Variable.declare_names o Free o snd) inst_params
-    |> (Overloading.map_improvable_syntax o apfst)
-         (fn ((_, _), ((_, subst), unchecks)) =>
-            ((primary_constraints, []), (((improve, K NONE), false), [])))
-    |> Overloading.add_improvable_syntax
-    |> Context.proof_map (Syntax.add_term_check 0 "resorting" resort_check)
-    |> synchronize_inst_syntax
-  end;
+fun user_proof after_qed NONE =
+      Proof.theorem_i NONE (K (after_qed NONE)) [[]]
+  | user_proof after_qed (SOME prop) =
+      Proof.theorem_i NONE (after_qed o try the_single o the_single) [[(prop, [])]];
 
-fun confirm_declaration c = (map_instantiation o apsnd)
-  (filter_out (fn (_, (c', _)) => c' = c))
-  #> LocalTheory.target synchronize_inst_syntax
-
-fun gen_instantiation_instance do_proof after_qed lthy =
-  let
-    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 =
-      LocalTheory.theory (fold (AxClass.add_arity o Thm.varifyT) results)
-      #> after_qed;
-  in
-    lthy
-    |> do_proof after_qed' arities_proof
-  end;
-
-val instantiation_instance = gen_instantiation_instance (fn after_qed => fn ts =>
-  Proof.theorem_i NONE (after_qed o map the_single) (map (fn t => [(t, [])]) ts));
-
-fun prove_instantiation_instance tac = gen_instantiation_instance (fn after_qed =>
-  fn ts => fn lthy => after_qed (map (fn t => Goal.prove lthy [] [] t
-    (fn {context, ...} => tac context)) ts) lthy) I;
-
-fun prove_instantiation_exit tac = prove_instantiation_instance tac
-  #> LocalTheory.exit_global;
+fun tactic_proof tac after_qed NONE lthy =
+      after_qed NONE lthy
+  | tactic_proof tac after_qed (SOME prop) lthy =
+      after_qed (SOME (Goal.prove (LocalTheory.target_of lthy) [] [] prop
+        (K tac))) lthy;
 
-fun prove_instantiation_exit_result f tac x lthy =
-  let
-    val phi = ProofContext.export_morphism lthy
-      (ProofContext.init (ProofContext.theory_of lthy));
-    val y = f phi x;
-  in
-    lthy
-    |> prove_instantiation_exit (fn ctxt => tac ctxt y)
-    |> pair y
-  end;
+in
 
-fun conclude_instantiation lthy =
-  let
-    val { arities, params } = the_instantiation lthy;
-    val (tycos, vs, sort) = arities;
-    val thy = ProofContext.theory_of lthy;
-    val _ = map (fn tyco => if Sign.of_sort thy
-        (Type (tyco, map TFree vs), sort)
-      then () else error ("Missing instance proof for type " ^ quote (Sign.extern_type thy tyco)))
-        tycos;
-  in lthy end;
+val subclass = gen_subclass (K I) user_proof;
+fun prove_subclass tac = gen_subclass (K I) (tactic_proof tac);
+val subclass_cmd = gen_subclass Sign.read_class user_proof;
 
-fun pretty_instantiation lthy =
-  let
-    val { arities, params } = the_instantiation lthy;
-    val (tycos, vs, sort) = arities;
-    val thy = ProofContext.theory_of lthy;
-    fun pr_arity tyco = Syntax.pretty_arity lthy (tyco, map snd vs, sort);
-    fun pr_param ((c, _), (v, ty)) =
-      (Pretty.block o Pretty.breaks) [Pretty.str v, Pretty.str "==",
-        (Pretty.str o Sign.extern_const thy) c, Pretty.str "::", Syntax.pretty_typ_global thy ty];
-  in
-    (Pretty.block o Pretty.fbreaks)
-      (Pretty.str "instantiation" :: map pr_arity tycos @ map pr_param params)
-  end;
+end; (*local*)
+
 
 end;
 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/Pure/Isar/class_target.ML	Tue Jan 06 08:50:12 2009 +0100
@@ -0,0 +1,687 @@
+(*  Title:      Pure/Isar/class_target.ML
+    Author:     Florian Haftmann, TU Muenchen
+
+Type classes derived from primitive axclasses and locales - mechanisms.
+*)
+
+signature CLASS_TARGET =
+sig
+  (*classes*)
+  type raw_morphism = morphism * ((typ Vartab.table * typ list) *  (term Vartab.table * term list));
+  val register: class -> class list -> ((string * typ) * (string * typ)) list
+    -> sort -> term list -> raw_morphism
+    -> thm option -> thm option -> thm -> theory -> theory
+
+  val begin: class list -> sort -> Proof.context -> Proof.context
+  val init: class -> theory -> Proof.context
+  val declare: class -> Properties.T
+    -> (string * mixfix) * term -> theory -> theory
+  val abbrev: class -> Syntax.mode -> Properties.T
+    -> (string * mixfix) * term -> theory -> theory
+  val refresh_syntax: class -> Proof.context -> Proof.context
+
+  val intro_classes_tac: thm list -> tactic
+  val default_intro_tac: Proof.context -> thm list -> tactic
+  val activate_class_morphism: theory -> class -> term list
+    -> raw_morphism -> morphism
+  val prove_class_interpretation: class -> term list -> (class * string) list
+    -> thm list -> thm list -> theory -> raw_morphism * theory
+  val prove_subclass_relation: class * class -> thm option -> theory -> theory
+
+  val class_prefix: string -> string
+  val is_class: theory -> class -> bool
+  val these_params: theory -> sort -> (string * (class * (string * typ))) list
+  val these_defs: theory -> sort -> thm list
+  val base_sort: theory -> class -> sort
+  val rules: theory -> class -> thm option * thm
+  val print_classes: theory -> unit
+
+  (*instances*)
+  val init_instantiation: string list * (string * sort) list * sort
+    -> theory -> local_theory
+  val instantiation_instance: (local_theory -> local_theory)
+    -> local_theory -> Proof.state
+  val prove_instantiation_instance: (Proof.context -> tactic)
+    -> local_theory -> local_theory
+  val prove_instantiation_exit: (Proof.context -> tactic)
+    -> local_theory -> theory
+  val prove_instantiation_exit_result: (morphism -> 'a -> 'b)
+    -> (Proof.context -> 'b -> tactic) -> 'a -> local_theory -> 'b * theory
+  val conclude_instantiation: local_theory -> local_theory
+  val instantiation_param: local_theory -> string -> string option
+  val confirm_declaration: string -> local_theory -> local_theory
+  val pretty_instantiation: local_theory -> Pretty.T
+  val type_name: string -> string
+
+  (*old axclass layer*)
+  val axclass_cmd: bstring * xstring list
+    -> (Attrib.binding * string list) list
+    -> theory -> class * theory
+  val classrel_cmd: xstring * xstring -> theory -> Proof.state
+
+  (*old instance layer*)
+  val instance_arity: (theory -> theory) -> arity -> theory -> Proof.state
+  val instance_arity_cmd: bstring * xstring list * xstring -> theory -> Proof.state
+end;
+
+structure Class_Target : CLASS_TARGET =
+struct
+
+(*temporary adaption code to mediate between old and new locale code*)
+
+structure Locale_Layer =
+struct
+
+val init = Old_Locale.init;
+val parameters_of = Old_Locale.parameters_of;
+val intros = Old_Locale.intros;
+val dests = Old_Locale.dests;
+val get_interpret_morph = Old_Locale.get_interpret_morph;
+val Locale = Old_Locale.Locale;
+val extern = Old_Locale.extern;
+val intro_locales_tac = Old_Locale.intro_locales_tac;
+
+fun prove_interpretation tac prfx_atts expr inst =
+  Old_Locale.interpretation I prfx_atts expr inst
+  ##> Proof.global_terminal_proof
+      (Method.Basic (fn ctxt => Method.SIMPLE_METHOD (tac ctxt), Position.none), NONE)
+  ##> ProofContext.theory_of;
+
+fun prove_interpretation_in tac after_qed (name, expr) =
+  Old_Locale.interpretation_in_locale
+      (ProofContext.theory after_qed) (name, expr)
+  #> Proof.global_terminal_proof
+      (Method.Basic (K (Method.SIMPLE_METHOD tac), Position.none), NONE)
+  #> ProofContext.theory_of;
+
+end;
+
+
+(** auxiliary **)
+
+val class_prefix = Logic.const_of_class o Sign.base_name;
+
+fun class_name_morphism class =
+  Binding.map_prefix (K (Binding.add_prefix false (class_prefix class)));
+
+type raw_morphism = morphism * ((typ Vartab.table * typ list) *  (term Vartab.table * term list));
+
+fun activate_class_morphism thy class inst morphism =
+  Locale_Layer.get_interpret_morph thy (class_name_morphism class) (class, "") morphism class inst;
+
+
+(** primitive axclass and instance commands **)
+
+fun axclass_cmd (class, raw_superclasses) raw_specs thy =
+  let
+    val ctxt = ProofContext.init thy;
+    val superclasses = map (Sign.read_class thy) raw_superclasses;
+    val name_atts = map ((apsnd o map) (Attrib.attribute thy) o fst)
+      raw_specs;
+    val axiomss = ProofContext.read_propp (ctxt, map (map (rpair []) o snd)
+          raw_specs)
+      |> snd
+      |> (map o map) fst;
+  in
+    AxClass.define_class (class, superclasses) []
+      (name_atts ~~ axiomss) thy
+  end;
+
+local
+
+fun gen_instance mk_prop add_thm after_qed insts thy =
+  let
+    fun after_qed' results =
+      ProofContext.theory ((fold o fold) add_thm results #> after_qed);
+  in
+    thy
+    |> ProofContext.init
+    |> Proof.theorem_i NONE after_qed' ((map (fn t => [(t, [])])
+        o mk_prop thy) insts)
+  end;
+
+in
+
+val instance_arity =
+  gen_instance (Logic.mk_arities oo Sign.cert_arity) AxClass.add_arity;
+val instance_arity_cmd =
+  gen_instance (Logic.mk_arities oo Sign.read_arity) AxClass.add_arity I;
+val classrel =
+  gen_instance (single oo (Logic.mk_classrel oo AxClass.cert_classrel)) AxClass.add_classrel I;
+val classrel_cmd =
+  gen_instance (single oo (Logic.mk_classrel oo AxClass.read_classrel)) AxClass.add_classrel I;
+
+end; (*local*)
+
+
+(** class data **)
+
+datatype class_data = ClassData of {
+
+  (* static part *)
+  consts: (string * string) list
+    (*locale parameter ~> constant name*),
+  base_sort: sort,
+  inst: term list
+    (*canonical interpretation*),
+  morphism: Morphism.morphism * ((typ Vartab.table * typ list) * (term Vartab.table * term list))
+    (*morphism cookie of canonical interpretation*),
+  assm_intro: thm option,
+  of_class: thm,
+  axiom: thm option,
+  
+  (* dynamic part *)
+  defs: thm list,
+  operations: (string * (class * (typ * term))) list
+
+};
+
+fun rep_class_data (ClassData d) = d;
+fun mk_class_data ((consts, base_sort, inst, morphism, assm_intro, of_class, axiom),
+    (defs, operations)) =
+  ClassData { consts = consts, base_sort = base_sort, inst = inst,
+    morphism = morphism, assm_intro = assm_intro, of_class = of_class, axiom = axiom,
+    defs = defs, operations = operations };
+fun map_class_data f (ClassData { consts, base_sort, inst, morphism, assm_intro,
+    of_class, axiom, defs, operations }) =
+  mk_class_data (f ((consts, base_sort, inst, morphism, assm_intro, of_class, axiom),
+    (defs, operations)));
+fun merge_class_data _ (ClassData { consts = consts,
+    base_sort = base_sort, inst = inst, morphism = morphism, assm_intro = assm_intro,
+    of_class = of_class, axiom = axiom, defs = defs1, operations = operations1 },
+  ClassData { consts = _, base_sort = _, inst = _, morphism = _, assm_intro = _,
+    of_class = _, axiom = _, defs = defs2, operations = operations2 }) =
+  mk_class_data ((consts, base_sort, inst, morphism, assm_intro, of_class, axiom),
+    (Thm.merge_thms (defs1, defs2),
+      AList.merge (op =) (K true) (operations1, operations2)));
+
+structure ClassData = TheoryDataFun
+(
+  type T = class_data Graph.T
+  val empty = Graph.empty;
+  val copy = I;
+  val extend = I;
+  fun merge _ = Graph.join merge_class_data;
+);
+
+
+(* queries *)
+
+val lookup_class_data = Option.map rep_class_data oo try o Graph.get_node o ClassData.get;
+
+fun the_class_data thy class = case lookup_class_data thy class
+ of NONE => error ("Undeclared class " ^ quote class)
+  | SOME data => data;
+
+val is_class = is_some oo lookup_class_data;
+
+val ancestry = Graph.all_succs o ClassData.get;
+
+fun the_inst thy = #inst o the_class_data thy;
+
+fun these_params thy =
+  let
+    fun params class =
+      let
+        val const_typs = (#params o AxClass.get_info thy) class;
+        val const_names = (#consts o the_class_data thy) class;
+      in
+        (map o apsnd)
+          (fn c => (class, (c, (the o AList.lookup (op =) const_typs) c))) const_names
+      end;
+  in maps params o ancestry thy end;
+
+fun these_assm_intros thy =
+  Graph.fold (fn (_, (data, _)) => fold (insert Thm.eq_thm)
+    ((the_list o #assm_intro o rep_class_data) data)) (ClassData.get thy) [];
+
+fun these_defs thy = maps (these o Option.map #defs o lookup_class_data thy) o ancestry thy;
+
+fun these_operations thy =
+  maps (#operations o the_class_data thy) o ancestry thy;
+
+val base_sort = #base_sort oo the_class_data;
+
+fun rules thy class = let
+    val { axiom, of_class, ... } = the_class_data thy class
+  in (axiom, of_class) end;
+
+fun morphism thy class =
+  let
+    val { inst, morphism, ... } = the_class_data thy class;
+  in activate_class_morphism thy class inst morphism end;
+
+fun print_classes thy =
+  let
+    val ctxt = ProofContext.init thy;
+    val algebra = Sign.classes_of thy;
+    val arities =
+      Symtab.empty
+      |> Symtab.fold (fn (tyco, arities) => fold (fn (class, _) =>
+           Symtab.map_default (class, []) (insert (op =) tyco)) arities)
+             ((#arities o Sorts.rep_algebra) algebra);
+    val the_arities = these o Symtab.lookup arities;
+    fun mk_arity class tyco =
+      let
+        val Ss = Sorts.mg_domain algebra tyco [class];
+      in Syntax.pretty_arity ctxt (tyco, Ss, [class]) end;
+    fun mk_param (c, ty) = Pretty.str (Sign.extern_const thy c ^ " :: "
+      ^ setmp show_sorts false (Syntax.string_of_typ ctxt o Type.strip_sorts) ty);
+    fun mk_entry class = (Pretty.block o Pretty.fbreaks o map_filter I) [
+      (SOME o Pretty.str) ("class " ^ Sign.extern_class thy class ^ ":"),
+      (SOME o Pretty.block) [Pretty.str "supersort: ",
+        (Syntax.pretty_sort ctxt o Sign.minimize_sort thy o Sign.super_classes thy) class],
+      if is_class thy class then (SOME o Pretty.str)
+        ("locale: " ^ Locale_Layer.extern thy class) else NONE,
+      ((fn [] => NONE | ps => (SOME o Pretty.block o Pretty.fbreaks)
+          (Pretty.str "parameters:" :: ps)) o map mk_param
+        o these o Option.map #params o try (AxClass.get_info thy)) class,
+      (SOME o Pretty.block o Pretty.breaks) [
+        Pretty.str "instances:",
+        Pretty.list "" "" (map (mk_arity class) (the_arities class))
+      ]
+    ]
+  in
+    (Pretty.writeln o Pretty.chunks o separate (Pretty.str "")
+      o map mk_entry o Sorts.all_classes) algebra
+  end;
+
+
+(* updaters *)
+
+fun register class superclasses params base_sort inst phi
+    axiom assm_intro of_class thy =
+  let
+    val operations = map (fn (v_ty as (_, ty), (c, _)) =>
+      (c, (class, (ty, Free v_ty)))) params;
+    val add_class = Graph.new_node (class,
+        mk_class_data (((map o pairself) fst params, base_sort,
+          inst, phi, assm_intro, of_class, axiom), ([], operations)))
+      #> fold (curry Graph.add_edge class) superclasses;
+  in ClassData.map add_class thy end;
+
+fun register_operation class (c, (t, some_def)) thy =
+  let
+    val base_sort = base_sort thy class;
+    val prep_typ = map_type_tvar
+      (fn (vi as (v, _), sort) => if Name.aT = v
+        then TFree (v, base_sort) else TVar (vi, sort));
+    val t' = map_types prep_typ t;
+    val ty' = Term.fastype_of t';
+  in
+    thy
+    |> (ClassData.map o Graph.map_node class o map_class_data o apsnd)
+      (fn (defs, operations) =>
+        (fold cons (the_list some_def) defs,
+          (c, (class, (ty', t'))) :: operations))
+  end;
+
+
+(** tactics and methods **)
+
+fun prove_class_interpretation class inst consts hyp_facts def_facts thy =
+  let
+    val constraints = map (fn (class, c) => map_atyps (K (TFree (Name.aT,
+      [class]))) (Sign.the_const_type thy c)) consts;
+    val no_constraints = map (map_atyps (K (TFree (Name.aT, [])))) constraints;
+    fun add_constraint c T = Sign.add_const_constraint (c, SOME T);
+    fun tac ctxt = ALLGOALS (ProofContext.fact_tac (hyp_facts @ def_facts)
+      ORELSE' (fn n => SELECT_GOAL (Locale_Layer.intro_locales_tac false ctxt []) n));
+    val prfx = class_prefix class;
+  in
+    thy
+    |> fold2 add_constraint (map snd consts) no_constraints
+    |> Locale_Layer.prove_interpretation tac (class_name_morphism class) (Locale_Layer.Locale class)
+          (map SOME inst, map (pair (Attrib.empty_binding) o Thm.prop_of) def_facts)
+    ||> fold2 add_constraint (map snd consts) constraints
+  end;
+
+fun prove_subclass_relation (sub, sup) some_thm thy =
+  let
+    val of_class = (snd o rules thy) sup;
+    val intro = case some_thm
+     of SOME thm => Drule.standard' (of_class OF [Drule.standard' thm])
+      | NONE => Thm.instantiate ([pairself (Thm.ctyp_of thy o TVar o pair (Name.aT, 0))
+          ([], [sub])], []) of_class;
+    val classrel = (intro OF (the_list o fst o rules thy) sub)
+      |> Thm.close_derivation;
+  in
+    thy
+    |> AxClass.add_classrel classrel
+    |> Locale_Layer.prove_interpretation_in (ALLGOALS (ProofContext.fact_tac (the_list some_thm)))
+         I (sub, Locale_Layer.Locale sup)
+    |> ClassData.map (Graph.add_edge (sub, sup))
+  end;
+
+fun intro_classes_tac facts st =
+  let
+    val thy = Thm.theory_of_thm st;
+    val classes = Sign.all_classes thy;
+    val class_trivs = map (Thm.class_triv thy) classes;
+    val class_intros = map_filter (try (#intro o AxClass.get_info thy)) classes;
+    val assm_intros = these_assm_intros thy;
+  in
+    Method.intros_tac (class_trivs @ class_intros @ assm_intros) facts st
+  end;
+
+fun default_intro_tac ctxt [] =
+      intro_classes_tac [] ORELSE Old_Locale.intro_locales_tac true ctxt [] ORELSE
+      Locale.intro_locales_tac true ctxt []
+  | default_intro_tac _ _ = no_tac;
+
+fun default_tac rules ctxt facts =
+  HEADGOAL (Method.some_rule_tac rules ctxt facts) ORELSE
+    default_intro_tac ctxt facts;
+
+val _ = Context.>> (Context.map_theory
+  (Method.add_methods
+   [("intro_classes", Method.no_args (Method.METHOD intro_classes_tac),
+      "back-chain introduction rules of classes"),
+    ("default", Method.thms_ctxt_args (Method.METHOD oo default_tac),
+      "apply some intro/elim rule")]));
+
+
+(** classes and class target **)
+
+(* class context syntax *)
+
+fun synchronize_class_syntax sups base_sort ctxt =
+  let
+    val thy = ProofContext.theory_of ctxt;
+    val algebra = Sign.classes_of thy;
+    val operations = these_operations thy sups;
+    fun subst_class_typ sort = map_type_tfree (K (TVar ((Name.aT, 0), sort)));
+    val primary_constraints =
+      (map o apsnd) (subst_class_typ base_sort o fst o snd) operations;
+    val secondary_constraints =
+      (map o apsnd) (fn (class, (ty, _)) => subst_class_typ [class] ty) operations;
+    fun declare_const (c, _) =
+      let val b = Sign.base_name c
+      in Sign.intern_const thy b = c ? Variable.declare_const (b, c) end;
+    fun improve (c, ty) = (case AList.lookup (op =) primary_constraints c
+     of SOME ty' => (case try (Type.raw_match (ty', ty)) Vartab.empty
+         of SOME tyenv => (case Vartab.lookup tyenv (Name.aT, 0)
+             of SOME (_, ty' as TVar (tvar as (vi, sort))) =>
+                  if TypeInfer.is_param vi
+                    andalso Sorts.sort_le algebra (base_sort, sort)
+                      then SOME (ty', TFree (Name.aT, base_sort))
+                      else NONE
+              | _ => NONE)
+          | NONE => NONE)
+      | NONE => NONE)
+    fun subst (c, ty) = Option.map snd (AList.lookup (op =) operations c);
+    val unchecks = map (fn (c, (_, (ty, t))) => (t, Const (c, ty))) operations;
+  in
+    ctxt
+    |> fold declare_const primary_constraints
+    |> Overloading.map_improvable_syntax (K (((primary_constraints, secondary_constraints),
+        (((improve, subst), true), unchecks)), false))
+    |> Overloading.set_primary_constraints
+  end;
+
+fun refresh_syntax class ctxt =
+  let
+    val thy = ProofContext.theory_of ctxt;
+    val base_sort = base_sort thy class;
+  in synchronize_class_syntax [class] base_sort ctxt end;
+
+fun begin sups base_sort ctxt =
+  ctxt
+  |> Variable.declare_term
+      (Logic.mk_type (TFree (Name.aT, base_sort)))
+  |> synchronize_class_syntax sups base_sort
+  |> Overloading.add_improvable_syntax;
+
+fun init class thy =
+  thy
+  |> Locale_Layer.init class
+  |> begin [class] (base_sort thy class);
+
+
+(* class target *)
+
+fun declare class pos ((c, mx), dict) thy =
+  let
+    val prfx = class_prefix class;
+    val thy' = thy |> Sign.add_path prfx;
+    val phi = morphism thy' class;
+    val inst = the_inst thy' class;
+    val params = map (apsnd fst o snd) (these_params thy' [class]);
+
+    val c' = Sign.full_bname thy' c;
+    val dict' = Morphism.term phi dict;
+    val dict_def = map_types Logic.unvarifyT dict';
+    val ty' = Term.fastype_of dict_def;
+    val ty'' = Type.strip_sorts ty';
+    val def_eq = Logic.mk_equals (Const (c', ty'), dict_def);
+    fun get_axiom thy = ((Thm.varifyT o Thm.axiom thy) c', thy);
+  in
+    thy'
+    |> Sign.declare_const pos ((Binding.name c, ty''), mx) |> snd
+    |> Thm.add_def false false (c, def_eq)
+    |>> Thm.symmetric
+    ||>> get_axiom
+    |-> (fn (def, def') => prove_class_interpretation class inst params [] [def]
+      #> snd
+        (*assumption: interpretation cookie does not change
+          by adding equations to interpretation*)
+      #> register_operation class (c', (dict', SOME (Thm.symmetric def')))
+      #> PureThy.store_thm (c ^ "_raw", def')
+      #> snd)
+    |> Sign.restore_naming thy
+    |> Sign.add_const_constraint (c', SOME ty')
+  end;
+
+fun abbrev class prmode pos ((c, mx), rhs) thy =
+  let
+    val prfx = class_prefix class;
+    val thy' = thy |> Sign.add_path prfx;
+
+    val unchecks = map (fn (c, (_, (ty, t))) => (t, Const (c, ty)))
+      (these_operations thy [class]);
+    val c' = Sign.full_bname thy' c;
+    val rhs' = Pattern.rewrite_term thy unchecks [] rhs;
+    val rhs'' = map_types Logic.varifyT rhs';
+    val ty' = Term.fastype_of rhs';
+  in
+    thy'
+    |> Sign.add_abbrev (#1 prmode) pos (Binding.name c, map_types Type.strip_sorts rhs'') |> snd
+    |> Sign.add_const_constraint (c', SOME ty')
+    |> Sign.notation true prmode [(Const (c', ty'), mx)]
+    |> not (#1 prmode = PrintMode.input) ? register_operation class (c', (rhs', NONE))
+    |> Sign.restore_naming thy
+  end;
+
+
+(** instantiation target **)
+
+(* bookkeeping *)
+
+datatype instantiation = Instantiation of {
+  arities: string list * (string * sort) list * sort,
+  params: ((string * string) * (string * typ)) list
+    (*(instantiation parameter, type constructor), (local instantiation parameter, typ)*)
+}
+
+structure Instantiation = ProofDataFun
+(
+  type T = instantiation
+  fun init _ = Instantiation { arities = ([], [], []), params = [] };
+);
+
+fun mk_instantiation (arities, params) =
+  Instantiation { arities = arities, params = params };
+fun get_instantiation lthy = case Instantiation.get (LocalTheory.target_of lthy)
+ of Instantiation data => data;
+fun map_instantiation f = (LocalTheory.target o Instantiation.map)
+  (fn Instantiation { arities, params } => mk_instantiation (f (arities, params)));
+
+fun the_instantiation lthy = case get_instantiation lthy
+ of { arities = ([], [], []), ... } => error "No instantiation target"
+  | data => data;
+
+val instantiation_params = #params o get_instantiation;
+
+fun instantiation_param lthy v = instantiation_params lthy
+  |> find_first (fn (_, (v', _)) => v = v')
+  |> Option.map (fst o fst);
+
+
+(* syntax *)
+
+fun synchronize_inst_syntax ctxt =
+  let
+    val Instantiation { arities = (_, _, sort), params = params } = Instantiation.get ctxt;
+    val thy = ProofContext.theory_of ctxt;
+    fun subst (c, ty) = case AxClass.inst_tyco_of thy (c, ty)
+         of SOME tyco => (case AList.lookup (op =) params (c, tyco)
+             of SOME (v_ty as (_, ty)) => SOME (ty, Free v_ty)
+              | NONE => NONE)
+          | NONE => NONE;
+    val unchecks =
+      map (fn ((c, _), v_ty as (_, ty)) => (Free v_ty, Const (c, ty))) params;
+  in
+    ctxt
+    |> Overloading.map_improvable_syntax
+         (fn (((primary_constraints, _), (((improve, _), _), _)), _) =>
+            (((primary_constraints, []), (((improve, subst), false), unchecks)), false))
+  end;
+
+
+(* target *)
+
+val sanatize_name = (*FIXME*)
+  let
+    fun is_valid s = Symbol.is_ascii_letter s orelse Symbol.is_ascii_digit s
+      orelse s = "'" orelse s = "_";
+    val is_junk = not o is_valid andf Symbol.is_regular;
+    val junk = Scan.many is_junk;
+    val scan_valids = Symbol.scanner "Malformed input"
+      ((junk |--
+        (Scan.optional (Scan.one Symbol.is_ascii_letter) "x" ^^ (Scan.many is_valid >> implode)
+        --| junk))
+      ::: Scan.repeat ((Scan.many1 is_valid >> implode) --| junk));
+  in
+    explode #> scan_valids #> implode
+  end;
+
+fun type_name "*" = "prod"
+  | type_name "+" = "sum"
+  | type_name s = sanatize_name (NameSpace.base s); (*FIXME*)
+
+fun resort_terms pp algebra consts constraints ts =
+  let
+    fun matchings (Const (c_ty as (c, _))) = (case constraints c
+         of NONE => I
+          | SOME sorts => fold2 (curry (Sorts.meet_sort algebra))
+              (Consts.typargs consts c_ty) sorts)
+      | matchings _ = I
+    val tvartab = (fold o fold_aterms) matchings ts Vartab.empty
+      handle Sorts.CLASS_ERROR e => error (Sorts.class_error pp e);
+    val inst = map_type_tvar
+      (fn (vi, sort) => TVar (vi, the_default sort (Vartab.lookup tvartab vi)));
+  in if Vartab.is_empty tvartab then NONE else SOME ((map o map_types) inst ts) end;
+
+fun init_instantiation (tycos, vs, sort) thy =
+  let
+    val _ = if null tycos then error "At least one arity must be given" else ();
+    val params = these_params thy sort;
+    fun get_param tyco (param, (_, (c, ty))) = if can (AxClass.param_of_inst thy) (c, tyco)
+      then NONE else SOME ((c, tyco),
+        (param ^ "_" ^ type_name tyco, map_atyps (K (Type (tyco, map TFree vs))) ty));
+    val inst_params = map_product get_param tycos params |> map_filter I;
+    val primary_constraints = map (apsnd
+      (map_atyps (K (TVar ((Name.aT, 0), [])))) o snd o snd) params;
+    val pp = Syntax.pp_global thy;
+    val algebra = Sign.classes_of thy
+      |> fold (fn tyco => Sorts.add_arities pp
+            (tyco, map (fn class => (class, map snd vs)) sort)) tycos;
+    val consts = Sign.consts_of thy;
+    val improve_constraints = AList.lookup (op =)
+      (map (fn (_, (class, (c, _))) => (c, [[class]])) params);
+    fun resort_check ts ctxt = case resort_terms pp algebra consts improve_constraints ts
+     of NONE => NONE
+      | SOME ts' => SOME (ts', ctxt);
+    fun improve (c, ty) = case AxClass.inst_tyco_of thy (c, ty)
+     of SOME tyco => (case AList.lookup (op =) inst_params (c, tyco)
+         of SOME (_, ty') => if Type.raw_instance (ty', ty) then SOME (ty, ty') else NONE
+          | NONE => NONE)
+      | NONE => NONE;
+  in
+    thy
+    |> ProofContext.init
+    |> Instantiation.put (mk_instantiation ((tycos, vs, sort), inst_params))
+    |> fold (Variable.declare_typ o TFree) vs
+    |> fold (Variable.declare_names o Free o snd) inst_params
+    |> (Overloading.map_improvable_syntax o apfst)
+         (fn ((_, _), ((_, subst), unchecks)) =>
+            ((primary_constraints, []), (((improve, K NONE), false), [])))
+    |> Overloading.add_improvable_syntax
+    |> Context.proof_map (Syntax.add_term_check 0 "resorting" resort_check)
+    |> synchronize_inst_syntax
+  end;
+
+fun confirm_declaration c = (map_instantiation o apsnd)
+  (filter_out (fn (_, (c', _)) => c' = c))
+  #> LocalTheory.target synchronize_inst_syntax
+
+fun gen_instantiation_instance do_proof after_qed lthy =
+  let
+    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 =
+      LocalTheory.theory (fold (AxClass.add_arity o Thm.varifyT) results)
+      #> after_qed;
+  in
+    lthy
+    |> do_proof after_qed' arities_proof
+  end;
+
+val instantiation_instance = gen_instantiation_instance (fn after_qed => fn ts =>
+  Proof.theorem_i NONE (after_qed o map the_single) (map (fn t => [(t, [])]) ts));
+
+fun prove_instantiation_instance tac = gen_instantiation_instance (fn after_qed =>
+  fn ts => fn lthy => after_qed (map (fn t => Goal.prove lthy [] [] t
+    (fn {context, ...} => tac context)) ts) lthy) I;
+
+fun prove_instantiation_exit tac = prove_instantiation_instance tac
+  #> LocalTheory.exit_global;
+
+fun prove_instantiation_exit_result f tac x lthy =
+  let
+    val phi = ProofContext.export_morphism lthy
+      (ProofContext.init (ProofContext.theory_of lthy));
+    val y = f phi x;
+  in
+    lthy
+    |> prove_instantiation_exit (fn ctxt => tac ctxt y)
+    |> pair y
+  end;
+
+fun conclude_instantiation lthy =
+  let
+    val { arities, params } = the_instantiation lthy;
+    val (tycos, vs, sort) = arities;
+    val thy = ProofContext.theory_of lthy;
+    val _ = map (fn tyco => if Sign.of_sort thy
+        (Type (tyco, map TFree vs), sort)
+      then () else error ("Missing instance proof for type " ^ quote (Sign.extern_type thy tyco)))
+        tycos;
+  in lthy end;
+
+fun pretty_instantiation lthy =
+  let
+    val { arities, params } = the_instantiation lthy;
+    val (tycos, vs, sort) = arities;
+    val thy = ProofContext.theory_of lthy;
+    fun pr_arity tyco = Syntax.pretty_arity lthy (tyco, map snd vs, sort);
+    fun pr_param ((c, _), (v, ty)) =
+      (Pretty.block o Pretty.breaks) [Pretty.str v, Pretty.str "==",
+        (Pretty.str o Sign.extern_const thy) c, Pretty.str "::", Syntax.pretty_typ_global thy ty];
+  in
+    (Pretty.block o Pretty.fbreaks)
+      (Pretty.str "instantiation" :: map pr_arity tycos @ map pr_param params)
+  end;
+
+end;
+
--- a/src/Pure/Isar/expression.ML	Mon Jan 05 19:37:15 2009 +0100
+++ b/src/Pure/Isar/expression.ML	Tue Jan 06 08:50:12 2009 +0100
@@ -1,15 +1,15 @@
 (*  Title:      Pure/Isar/expression.ML
     Author:     Clemens Ballarin, TU Muenchen
 
-New locale development --- experimental.
+Locale expressions.
 *)
 
 signature EXPRESSION =
 sig
   datatype 'term map = Positional of 'term option list | Named of (string * 'term) list;
   type 'term expr = (string * ((string * bool) * 'term map)) list;
+  type expression_i = term expr * (Binding.T * typ option * mixfix) list;
   type expression = string expr * (Binding.T * string option * mixfix) list;
-  type expression_i = term expr * (Binding.T * typ option * mixfix) list;
 
   (* Processing of context statements *)
   val read_statement: Element.context list -> (string * string list) list list ->
@@ -18,20 +18,20 @@
     Proof.context -> (term * term list) list list * Proof.context;
 
   (* Declaring locales *)
-  val add_locale_cmd: string -> bstring -> expression -> Element.context list -> theory ->
-    (string * (string * (Attrib.binding * (thm list * Attrib.src list) list) list) list) *
-    Proof.context
-  val add_locale: string -> bstring -> expression_i -> Element.context_i list -> theory ->
-    (string * (string * (Attrib.binding * (thm list * Attrib.src list) list) list) list) *
-    Proof.context
+  val add_locale: string -> bstring -> expression_i -> Element.context_i list ->
+    theory -> string * local_theory;
+  val add_locale_cmd: string -> bstring -> expression -> Element.context list ->
+    theory -> string * local_theory;
 
   (* Interpretation *)
+  val sublocale: string -> expression_i -> theory -> Proof.state;
   val sublocale_cmd: string -> expression -> theory -> Proof.state;
-  val sublocale: string -> expression_i -> theory -> Proof.state;
-  val interpretation_cmd: expression -> (Attrib.binding * string) list -> theory -> Proof.state;
-  val interpretation: expression_i -> (Attrib.binding * term) list -> theory -> Proof.state;
+  val interpretation: expression_i -> (Attrib.binding * term) list ->
+    theory -> Proof.state;
+  val interpretation_cmd: expression -> (Attrib.binding * string) list ->
+    theory -> Proof.state;
+  val interpret: expression_i -> bool -> Proof.state -> Proof.state;
   val interpret_cmd: expression -> bool -> Proof.state -> Proof.state;
-  val interpret: expression_i -> bool -> Proof.state -> Proof.state;
 end;
 
 
@@ -55,7 +55,7 @@
 
 (** Internalise locale names in expr **)
 
-fun intern thy instances =  map (apfst (NewLocale.intern thy)) instances;
+fun intern thy instances =  map (apfst (Locale.intern thy)) instances;
 
 
 (** Parameters of expression.
@@ -85,15 +85,15 @@
       (* FIXME: cannot compare bindings for equality. *)
 
     fun params_loc loc =
-          (NewLocale.params_of thy loc |> map (fn (p, _, mx) => (p, mx)), loc);
+          (Locale.params_of thy loc |> map (fn (p, _, mx) => (p, mx)), loc);
     fun params_inst (expr as (loc, (prfx, Positional insts))) =
           let
             val (ps, loc') = params_loc loc;
-	    val d = length ps - length insts;
-	    val insts' =
-	      if d < 0 then error ("More arguments than parameters in instantiation of locale " ^
-                quote (NewLocale.extern thy loc))
-	      else insts @ replicate d NONE;
+            val d = length ps - length insts;
+            val insts' =
+              if d < 0 then error ("More arguments than parameters in instantiation of locale " ^
+                quote (Locale.extern thy loc))
+              else insts @ replicate d NONE;
             val ps' = (ps ~~ insts') |>
               map_filter (fn (p, NONE) => SOME p | (_, SOME _) => NONE);
           in (ps', (loc', (prfx, Positional insts'))) end
@@ -309,7 +309,7 @@
 fun finish_inst ctxt parms do_close (loc, (prfx, inst)) =
   let
     val thy = ProofContext.theory_of ctxt;
-    val (parm_names, parm_types) = NewLocale.params_of thy loc |>
+    val (parm_names, parm_types) = Locale.params_of thy loc |>
       map (fn (b, SOME T, _) => (Binding.base_name b, T)) |> split_list;
     val (morph, _) = inst_morph (parm_names, parm_types) (prfx, inst) ctxt;
   in (loc, morph) end;
@@ -333,15 +333,15 @@
 local
 
 fun prep_full_context_statement parse_typ parse_prop parse_inst prep_vars prep_expr
-    strict do_close context raw_import raw_elems raw_concl =
+    strict do_close raw_import raw_elems raw_concl ctxt1 =
   let
-    val thy = ProofContext.theory_of context;
+    val thy = ProofContext.theory_of ctxt1;
 
     val (raw_insts, fixed) = parameters_of thy strict (apfst (prep_expr thy) raw_import);
 
     fun prep_inst (loc, (prfx, inst)) (i, insts, ctxt) =
       let
-        val (parm_names, parm_types) = NewLocale.params_of thy loc |>
+        val (parm_names, parm_types) = Locale.params_of thy loc |>
           map (fn (b, SOME T, _) => (Binding.base_name b, T)) |> split_list;
         val inst' = parse_inst parm_names inst ctxt;
         val parm_types' = map (TypeInfer.paramify_vars o
@@ -351,7 +351,7 @@
         val (insts'', _, _, ctxt' (* FIXME not used *) ) = check_autofix insts' [] [] ctxt;
         val inst''' = insts'' |> List.last |> snd |> snd;
         val (morph, _) = inst_morph (parm_names, parm_types) (prfx, inst''') ctxt;
-        val ctxt'' = NewLocale.activate_declarations thy (loc, morph) ctxt;
+        val ctxt'' = Locale.activate_declarations thy (loc, morph) ctxt;
       in (i+1, insts', ctxt'') end;
   
     fun prep_elem raw_elem (insts, elems, ctxt) =
@@ -366,22 +366,23 @@
         val concl = parse_concl parse_prop ctxt raw_concl;
       in check_autofix insts elems concl ctxt end;
 
-    val fors = prep_vars fixed context |> fst;
-    val ctxt = context |> ProofContext.add_fixes_i fors |> snd;
-    val (_, insts', ctxt') = fold prep_inst raw_insts (0, [], ctxt);
-    val (_, elems'', ctxt'') = fold prep_elem raw_elems (insts', [], ctxt');
-    val (insts, elems, concl, ctxt) = prep_concl raw_concl (insts', elems'', ctxt'');
+    val fors = prep_vars fixed ctxt1 |> fst;
+    val ctxt2 = ctxt1 |> ProofContext.add_fixes_i fors |> snd;
+    val (_, insts', ctxt3) = fold prep_inst raw_insts (0, [], ctxt2);
+    val (_, elems'', ctxt4) = fold prep_elem raw_elems (insts', [], ctxt3);
+    val (insts, elems, concl, ctxt5) =
+      prep_concl raw_concl (insts', elems'', ctxt4);
 
     (* Retrieve parameter types *)
     val xs = fold (fn Fixes fixes => (fn ps => ps @ map (Binding.base_name o #1) fixes) |
       _ => fn ps => ps) (Fixes fors :: elems) [];
-    val (Ts, ctxt') = fold_map ProofContext.inferred_param xs ctxt; 
+    val (Ts, ctxt6) = fold_map ProofContext.inferred_param xs ctxt5; 
     val parms = xs ~~ Ts;  (* params from expression and elements *)
 
     val Fixes fors' = finish_primitive parms I (Fixes fors);
-    val (deps, elems') = finish ctxt' parms do_close insts elems;
+    val (deps, elems') = finish ctxt6 parms do_close insts elems;
 
-  in ((fors', deps, elems', concl), (parms, ctxt')) end
+  in ((fors', deps, elems', concl), (parms, ctxt6)) end
 
 in
 
@@ -400,7 +401,8 @@
 
 fun prep_statement prep activate raw_elems raw_concl context =
   let
-     val ((_, _, elems, concl), _) = prep true false context ([], []) raw_elems raw_concl;
+     val ((_, _, elems, concl), _) =
+       prep true false ([], []) raw_elems raw_concl context ;
      val (_, context') = activate elems (ProofContext.set_stmt true context);
   in (concl, context') end;
 
@@ -418,11 +420,12 @@
 
 fun prep_declaration prep activate raw_import raw_elems context =
   let
-    val ((fixed, deps, elems, _), (parms, ctxt')) = prep false true context raw_import raw_elems [];
+    val ((fixed, deps, elems, _), (parms, ctxt')) =
+      prep false true raw_import raw_elems [] context ;
     (* Declare parameters and imported facts *)
     val context' = context |>
       ProofContext.add_fixes_i fixed |> snd |>
-      fold NewLocale.activate_local_facts deps;
+      fold Locale.activate_local_facts deps;
     val (elems', _) = activate elems (ProofContext.set_stmt true context');
   in ((fixed, deps, elems'), (parms, ctxt')) end;
 
@@ -440,7 +443,7 @@
 
 fun props_of thy (name, morph) =
   let
-    val (asm, defs) = NewLocale.specification_of thy name;
+    val (asm, defs) = Locale.specification_of thy name;
   in
     (case asm of NONE => defs | SOME asm => asm :: defs) |> map (Morphism.term morph)
   end;
@@ -449,7 +452,8 @@
   let
     val thy = ProofContext.theory_of context;
 
-    val ((fixed, deps, _, _), _) = prep true true context expression [] [];
+    val ((fixed, deps, _, _), _) =
+      prep true true expression [] [] context;
     (* proof obligations *)
     val propss = map (props_of thy) deps;
 
@@ -526,7 +530,7 @@
 fun eval_inst ctxt (loc, morph) text =
   let
     val thy = ProofContext.theory_of ctxt;
-    val (asm, defs) = NewLocale.specification_of thy loc;
+    val (asm, defs) = Locale.specification_of thy loc;
     val asm' = Option.map (Morphism.term morph) asm;
     val defs' = map (Morphism.term morph) defs;
     val text' = text |>
@@ -536,7 +540,7 @@
       (if not (null defs)
         then eval_text ctxt false (Defines (map (fn def => (Attrib.empty_binding, (def, []))) defs'))
         else I)
-(* FIXME clone from new_locale.ML *)
+(* FIXME clone from locale.ML *)
   in text' end;
 
 fun eval_elem ctxt elem text =
@@ -653,7 +657,7 @@
             |> Sign.add_path aname
             |> Sign.no_base_names
             |> PureThy.note_thmss Thm.internalK
-              [((Binding.name introN, []), [([intro], [NewLocale.unfold_attrib])])]
+              [((Binding.name introN, []), [([intro], [Locale.unfold_attrib])])]
             ||> Sign.restore_naming thy';
           in (SOME statement, SOME intro, axioms, thy'') end;
     val (b_pred, b_intro, b_axioms, thy'''') =
@@ -668,7 +672,7 @@
             |> Sign.add_path pname
             |> Sign.no_base_names
             |> PureThy.note_thmss Thm.internalK
-                 [((Binding.name introN, []), [([intro], [NewLocale.intro_attrib])]),
+                 [((Binding.name introN, []), [([intro], [Locale.intro_attrib])]),
                   ((Binding.name axiomsN, []),
                     [(map (Drule.standard o Element.conclude_witness) axioms, [])])]
             ||> Sign.restore_naming thy''';
@@ -690,14 +694,14 @@
 fun defines_to_notes thy (Defines defs) =
       Notes (Thm.definitionK, map (fn (a, (def, _)) =>
         (a, [([Assumption.assume (cterm_of thy def)],
-          [(Attrib.internal o K) NewLocale.witness_attrib])])) defs)
+          [(Attrib.internal o K) Locale.witness_attrib])])) defs)
   | defines_to_notes _ e = e;
 
 fun gen_add_locale prep_decl
     bname predicate_name raw_imprt raw_body thy =
   let
     val name = Sign.full_bname thy bname;
-    val _ = NewLocale.test_locale thy name andalso
+    val _ = Locale.test_locale thy name andalso
       error ("Duplicate definition of locale " ^ quote name);
 
     val ((fixed, deps, body_elems), (parms, ctxt')) =
@@ -718,15 +722,13 @@
       (body_elems |> map_filter (fn Fixes fixes => SOME fixes | _ => NONE) |> flat);
     val asm = if is_some b_statement then b_statement else a_statement;
 
-    (* These are added immediately. *)
     val notes =
         if is_some asm
         then [(Thm.internalK, [((Binding.name (bname ^ "_" ^ axiomsN), []),
           [([Assumption.assume (cterm_of thy' (the asm))],
-            [(Attrib.internal o K) NewLocale.witness_attrib])])])]
+            [(Attrib.internal o K) Locale.witness_attrib])])])]
         else [];
 
-    (* These will be added in the local theory. *)
     val notes' = body_elems |>
       map (defines_to_notes thy') |>
       map (Element.morph_ctxt a_satisfy) |>
@@ -737,13 +739,14 @@
 
     val deps' = map (fn (l, morph) => (l, morph $> b_satisfy)) deps;
 
-    val loc_ctxt = thy' |>
-      NewLocale.register_locale bname (extraTs, params)
-        (asm, rev defs) ([], [])
-        (map (fn n => (n, stamp ())) notes |> rev) (map (fn d => (d, stamp ())) deps' |> rev) |>
-      NewLocale.init name;
+    val loc_ctxt = thy'
+      |> Locale.register_locale bname (extraTs, params)
+          (asm, rev defs) ([], [])
+          (map (fn n => (n, stamp ())) notes |> rev) (map (fn d => (d, stamp ())) deps' |> rev)
+      |> TheoryTarget.init (SOME name)
+      |> fold (fn (kind, facts) => LocalTheory.notes kind facts #> snd) notes';
 
-  in ((name, notes'), loc_ctxt) end;
+  in (name, loc_ctxt) end;
 
 in
 
@@ -771,20 +774,20 @@
     raw_target expression thy =
   let
     val target = intern thy raw_target;
-    val target_ctxt = NewLocale.init target thy;
+    val target_ctxt = Locale.init target thy;
 
     val ((propss, deps, export), goal_ctxt) = prep_expr expression target_ctxt;
     
     fun store_dep ((name, morph), thms) =
-      NewLocale.add_dependency target (name, morph $> Element.satisfy_morphism thms $> export);
+      Locale.add_dependency target (name, morph $> Element.satisfy_morphism thms $> export);
 
     fun after_qed results =
       ProofContext.theory (
         (* store dependencies *)
         fold store_dep (deps ~~ prep_result propss results) #>
         (* propagate registrations *)
-        (fn thy => fold_rev (fn reg => NewLocale.activate_global_facts reg)
-          (NewLocale.get_global_registrations thy) thy));
+        (fn thy => fold_rev (fn reg => Locale.activate_global_facts reg)
+          (Locale.get_global_registrations thy) thy));
   in
     goal_ctxt |>
       Proof.theorem_i NONE after_qed (prep_propp propss) |>
@@ -793,7 +796,7 @@
 
 in
 
-fun sublocale_cmd x = gen_sublocale read_goal_expression NewLocale.intern x;
+fun sublocale_cmd x = gen_sublocale read_goal_expression Locale.intern x;
 fun sublocale x = gen_sublocale cert_goal_expression (K I) x;
 
 end;
@@ -821,11 +824,11 @@
         let
           val thms' = map (Element.morph_witness export') thms;
           val morph' = morph $> Element.satisfy_morphism thms';
-          val add = NewLocale.add_global_registration (name, (morph', export));
+          val add = Locale.add_global_registration (name, (morph', export));
         in ((name, morph') :: regs, add thy) end
       | store (Eqns [], []) (regs, thy) =
         let val add = fold_rev (fn (name, morph) =>
-              NewLocale.activate_global_facts (name, morph $> export)) regs;
+              Locale.activate_global_facts (name, morph $> export)) regs;
         in (regs, add thy) end
       | store (Eqns attns, thms) (regs, thy) =
         let
@@ -839,8 +842,8 @@
           val attns' = map ((apsnd o map) (Attrib.attribute_i thy)) attns;
           val add =
             fold_rev (fn (name, morph) =>
-              NewLocale.amend_global_registration eq_morph (name, morph) #>
-              NewLocale.activate_global_facts (name, morph $> eq_morph $> export)) regs #>
+              Locale.amend_global_registration eq_morph (name, morph) #>
+              Locale.activate_global_facts (name, morph $> eq_morph $> export)) regs #>
             PureThy.note_thmss Thm.lemmaK (attns' ~~ map (fn th => [([th], [])]) thms') #>
             snd
         in (regs, add thy) end;
@@ -880,7 +883,7 @@
       let
         val morph' = morph $> Element.satisfy_morphism thms $> export;
       in
-        NewLocale.activate_local_facts (name, morph')
+        Locale.activate_local_facts (name, morph')
       end;
 
     fun after_qed results =
--- a/src/Pure/Isar/instance.ML	Mon Jan 05 19:37:15 2009 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,28 +0,0 @@
-(*  Title:      Pure/Isar/instance.ML
-    ID:         $Id$
-    Author:     Florian Haftmann, TU Muenchen
-
-Wrapper for instantiation command.
-*)
-
-signature INSTANCE =
-sig
-  val instantiation_cmd: xstring list * sort * xstring -> theory -> local_theory
-end;
-
-structure Instance : INSTANCE =
-struct
-
-fun read_multi_arity thy (raw_tycos, raw_sorts, raw_sort) =
-  let
-    val all_arities = map (fn raw_tyco => Sign.read_arity thy
-      (raw_tyco, raw_sorts, raw_sort)) raw_tycos;
-    val tycos = map #1 all_arities;
-    val (_, sorts, sort) = hd all_arities;
-    val vs = Name.names Name.context Name.aT sorts;
-  in (tycos, vs, sort) end;
-
-fun instantiation_cmd raw_arities thy =
-  TheoryTarget.instantiation (read_multi_arity thy raw_arities) thy;
-
-end;
--- a/src/Pure/Isar/isar_cmd.ML	Mon Jan 05 19:37:15 2009 +0100
+++ b/src/Pure/Isar/isar_cmd.ML	Tue Jan 06 08:50:12 2009 +0100
@@ -354,17 +354,17 @@
 val print_theorems = Toplevel.unknown_context o print_theorems_theory o print_theorems_proof;
 
 val print_locales = Toplevel.unknown_theory o
-  Toplevel.keep (NewLocale.print_locales o Toplevel.theory_of);
+  Toplevel.keep (Locale.print_locales o Toplevel.theory_of);
 
 fun print_locale (show_facts, name) = Toplevel.unknown_theory o
   Toplevel.keep (fn state =>
-    NewLocale.print_locale (Toplevel.theory_of state) show_facts name);
+    Locale.print_locale (Toplevel.theory_of state) show_facts name);
 
 fun print_registrations show_wits name = Toplevel.unknown_context o
   Toplevel.keep (Toplevel.node_case
-      (Context.cases (Locale.print_registrations show_wits name o ProofContext.init)
-        (Locale.print_registrations show_wits name))
-    (Locale.print_registrations show_wits name o Proof.context_of));
+      (Context.cases (Old_Locale.print_registrations show_wits name o ProofContext.init)
+        (Old_Locale.print_registrations show_wits name))
+    (Old_Locale.print_registrations show_wits name o Proof.context_of));
 
 val print_attributes = Toplevel.unknown_theory o
   Toplevel.keep (Attrib.print_attributes o Toplevel.theory_of);
--- a/src/Pure/Isar/isar_syn.ML	Mon Jan 05 19:37:15 2009 +0100
+++ b/src/Pure/Isar/isar_syn.ML	Tue Jan 06 08:50:12 2009 +0100
@@ -1,5 +1,4 @@
 (*  Title:      Pure/Isar/isar_syn.ML
-    ID:         $Id$
     Author:     Markus Wenzel, TU Muenchen
 
 Isar/Pure outer syntax.
@@ -394,9 +393,7 @@
     (P.name -- Scan.optional (P.$$$ "=" |-- P.!!! locale_val) (([], []), []) -- P.opt_begin
       >> (fn ((name, (expr, elems)), begin) =>
           (begin ? Toplevel.print) o Toplevel.begin_local_theory begin
-            (Expression.add_locale_cmd name name expr elems #>
-              (fn ((target, notes), ctxt) => TheoryTarget.begin target ctxt |>
-                fold (fn (kind, facts) => LocalTheory.notes kind facts #> snd) notes))));
+            (Expression.add_locale_cmd name name expr elems #> snd)));
 
 val _ =
   OuterSyntax.command "sublocale"
@@ -430,24 +427,24 @@
 val locale_val =
   SpecParse.locale_expr --
     Scan.optional (P.$$$ "+" |-- P.!!! (Scan.repeat1 SpecParse.context_element)) [] ||
-  Scan.repeat1 SpecParse.context_element >> pair Locale.empty;
+  Scan.repeat1 SpecParse.context_element >> pair Old_Locale.empty;
 
 val _ =
   OuterSyntax.command "class_locale" "define named proof context based on classes" K.thy_decl
-    (P.name -- Scan.optional (P.$$$ "=" |-- P.!!! locale_val) (Locale.empty, []) -- P.opt_begin
+    (P.name -- Scan.optional (P.$$$ "=" |-- P.!!! locale_val) (Old_Locale.empty, []) -- P.opt_begin
       >> (fn ((name, (expr, elems)), begin) =>
           (begin ? Toplevel.print) o Toplevel.begin_local_theory begin
-            (Locale.add_locale_cmd name expr elems #-> TheoryTarget.begin)));
+            (Old_Locale.add_locale_cmd name expr elems #-> TheoryTarget.begin)));
 
 val _ =
   OuterSyntax.command "class_interpretation"
     "prove and register interpretation of locale expression in theory or locale" K.thy_goal
     (P.xname --| (P.$$$ "\\<subseteq>" || P.$$$ "<") -- P.!!! SpecParse.locale_expr
-      >> (Toplevel.print oo (Toplevel.theory_to_proof o Locale.interpretation_in_locale I)) ||
+      >> (Toplevel.print oo (Toplevel.theory_to_proof o Old_Locale.interpretation_in_locale I)) ||
       opt_prefix  -- SpecParse.locale_expr -- SpecParse.locale_insts
         >> (fn ((name, expr), insts) => Toplevel.print o
             Toplevel.theory_to_proof
-              (Locale.interpretation_cmd (Binding.base_name name) expr insts)));
+              (Old_Locale.interpretation_cmd (Binding.base_name name) expr insts)));
 
 val _ =
   OuterSyntax.command "class_interpret"
@@ -456,7 +453,7 @@
     (opt_prefix -- SpecParse.locale_expr -- SpecParse.locale_insts
       >> (fn ((name, expr), insts) => Toplevel.print o
           Toplevel.proof'
-            (fn int => Locale.interpret_cmd (Binding.base_name name) expr insts int)));
+            (fn int => Old_Locale.interpret_cmd (Binding.base_name name) expr insts int)));
 
 end;
 
@@ -477,13 +474,13 @@
 
 val _ =
   OuterSyntax.local_theory_to_proof "subclass" "prove a subclass relation" K.thy_goal
-    (P.xname >> Subclass.subclass_cmd);
+    (P.xname >> Class.subclass_cmd);
 
 val _ =
   OuterSyntax.command "instantiation" "instantiate and prove type arity" K.thy_decl
    (P.multi_arity --| P.begin
      >> (fn arities => Toplevel.print o
-         Toplevel.begin_local_theory true (Instance.instantiation_cmd arities)));
+         Toplevel.begin_local_theory true (TheoryTarget.instantiation_cmd arities)));
 
 val _ =
   OuterSyntax.command "instance" "prove type arity or subclass relation" K.thy_goal
--- a/src/Pure/Isar/locale.ML	Mon Jan 05 19:37:15 2009 +0100
+++ b/src/Pure/Isar/locale.ML	Tue Jan 06 08:50:12 2009 +0100
@@ -1,6 +1,5 @@
 (*  Title:      Pure/Isar/locale.ML
     Author:     Clemens Ballarin, TU Muenchen
-    Author:     Markus Wenzel, LMU/TU Muenchen
 
 Locales -- Isar proof contexts as meta-level predicates, with local
 syntax and implicit structures.
@@ -28,399 +27,131 @@
     pages 31-43, 2006.
 *)
 
-(* TODO:
-- beta-eta normalisation of interpretation parameters
-- dangling type frees in locales
-- test subsumption of interpretations when merging theories
-*)
-
 signature LOCALE =
 sig
-  datatype expr =
-    Locale of string |
-    Rename of expr * (string * mixfix option) option list |
-    Merge of expr list
-  val empty: expr
-
-  val intern: theory -> xstring -> string
-  val intern_expr: theory -> expr -> expr
-  val extern: theory -> string -> xstring
-  val init: string -> theory -> Proof.context
+  type locale
 
-  (* The specification of a locale *)
-  val parameters_of: theory -> string -> ((string * typ) * mixfix) list
-  val parameters_of_expr: theory -> expr -> ((string * typ) * mixfix) list
-  val local_asms_of: theory -> string -> (Attrib.binding * term list) list
-  val global_asms_of: theory -> string -> (Attrib.binding * term list) list
-
-  (* Theorems *)
-  val intros: theory -> string -> thm list * thm list
-  val dests: theory -> string -> thm list
-  (* Not part of the official interface.  DO NOT USE *)
-  val facts_of: theory -> string -> (Attrib.binding * (thm list * Attrib.src list) list) list list
-
-  (* Not part of the official interface.  DO NOT USE *)
-  val declarations_of: theory -> string -> declaration list * declaration list;
+  val test_locale: theory -> string -> bool
+  val register_locale: bstring ->
+    (string * sort) list * (Binding.T * typ option * mixfix) list ->
+    term option * term list ->
+    (declaration * stamp) list * (declaration * stamp) list ->
+    ((string * (Attrib.binding * (thm list * Attrib.src list) list) list) * stamp) list ->
+    ((string * Morphism.morphism) * stamp) list -> theory -> theory
 
-  (* Processing of locale statements *)
-  val read_context_statement: string option -> Element.context list ->
-    (string * string list) list list -> Proof.context ->
-    string option * Proof.context * Proof.context * (term * term list) list list
-  val read_context_statement_cmd: xstring option -> Element.context list ->
-    (string * string list) list list -> Proof.context ->
-    string option * Proof.context * Proof.context * (term * term list) list list
-  val cert_context_statement: string option -> Element.context_i list ->
-    (term * term list) list list -> Proof.context ->
-    string option * Proof.context * Proof.context * (term * term list) list list
-  val read_expr: expr -> Element.context list -> Proof.context ->
-    Element.context_i list * Proof.context
-  val cert_expr: expr -> Element.context_i list -> Proof.context ->
-    Element.context_i list * Proof.context
+  (* Locale name space *)
+  val intern: theory -> xstring -> string
+  val extern: theory -> string -> xstring
 
-  (* Diagnostic functions *)
-  val print_locales: theory -> unit
-  val print_locale: theory -> bool -> expr -> Element.context list -> unit
-  val print_registrations: bool -> string -> Proof.context -> unit
-
-  val add_locale: string -> bstring -> expr -> Element.context_i list -> theory
-    -> string * Proof.context
-  val add_locale_cmd: bstring -> expr -> Element.context list -> theory
-    -> string * Proof.context
-
-  (* Tactics *)
-  val intro_locales_tac: bool -> Proof.context -> thm list -> tactic
+  (* Specification *)
+  val params_of: theory -> string -> (Binding.T * typ option * mixfix) list
+  val instance_of: theory -> string -> Morphism.morphism -> term list
+  val specification_of: theory -> string -> term option * term list
+  val declarations_of: theory -> string -> declaration list * declaration list
 
   (* Storing results *)
-  val global_note_qualified: string ->
-    ((Binding.T * attribute list) * (thm list * attribute list) list) list ->
-    theory -> (string * thm list) list * theory
-  val local_note_qualified: string ->
-    ((Binding.T * attribute list) * (thm list * attribute list) list) list ->
-    Proof.context -> (string * thm list) list * Proof.context
   val add_thmss: string -> string -> (Attrib.binding * (thm list * Attrib.src list) list) list ->
     Proof.context -> Proof.context
   val add_type_syntax: string -> declaration -> Proof.context -> Proof.context
   val add_term_syntax: string -> declaration -> Proof.context -> Proof.context
   val add_declaration: string -> declaration -> Proof.context -> Proof.context
+  val add_dependency: string -> (string * Morphism.morphism) -> theory -> theory
 
-  (* Interpretation *)
-  val get_interpret_morph: theory -> (Binding.T -> Binding.T) -> string * string ->
-    (Morphism.morphism * ((typ Vartab.table * typ list) * (term Vartab.table * term list))) ->
-    string -> term list -> Morphism.morphism
-  val interpretation: (Proof.context -> Proof.context) ->
-    (Binding.T -> Binding.T) -> expr ->
-    term option list * (Attrib.binding * term) list ->
-    theory ->
-    (Morphism.morphism * ((typ Vartab.table * typ list) * (term Vartab.table * term list))) * Proof.state
-  val interpretation_cmd: string -> expr -> string option list * (Attrib.binding * string) list ->
-    theory -> Proof.state
-  val interpretation_in_locale: (Proof.context -> Proof.context) ->
-    xstring * expr -> theory -> Proof.state
-  val interpret: (Proof.state -> Proof.state Seq.seq) ->
-    (Binding.T -> Binding.T) -> expr ->
-    term option list * (Attrib.binding * term) list ->
-    bool -> Proof.state ->
-    (Morphism.morphism * ((typ Vartab.table * typ list) * (term Vartab.table * term list))) * Proof.state
-  val interpret_cmd: string -> expr -> string option list * (Attrib.binding * string) list ->
-    bool -> Proof.state -> Proof.state
+  (* Activation *)
+  val activate_declarations: theory -> string * Morphism.morphism ->
+    Proof.context -> Proof.context
+  val activate_global_facts: string * Morphism.morphism -> theory -> theory
+  val activate_local_facts: string * Morphism.morphism -> Proof.context -> Proof.context
+  val init: string -> theory -> Proof.context
+
+  (* Reasoning about locales *)
+  val witness_attrib: attribute
+  val intro_attrib: attribute
+  val unfold_attrib: attribute
+  val intro_locales_tac: bool -> Proof.context -> thm list -> tactic
+
+  (* Registrations *)
+  val add_global_registration: (string * (Morphism.morphism * Morphism.morphism)) ->
+    theory -> theory
+  val amend_global_registration: Morphism.morphism -> (string * Morphism.morphism) ->
+    theory -> theory
+  val get_global_registrations: theory -> (string * Morphism.morphism) list
+
+  (* Diagnostic *)
+  val print_locales: theory -> unit
+  val print_locale: theory -> bool -> bstring -> unit
 end;
 
+
+(*** Theorem list extensible via attribute --- to control intro_locales_tac ***)
+
+(* FIXME: consider moving named_thms.ML up in the build hierarchy and using that *)
+functor ThmsFun() =
+struct
+
+structure Data = GenericDataFun
+(
+  type T = thm list;
+  val empty = [];
+  val extend = I;
+  fun merge _ = Thm.merge_thms;
+);
+
+val get = Data.get o Context.Proof;
+val add = Thm.declaration_attribute (Data.map o Thm.add_thm);
+
+end;
+
+
 structure Locale: LOCALE =
 struct
 
-(* legacy operations *)
-
-fun merge_lists _ xs [] = xs
-  | merge_lists _ [] ys = ys
-  | merge_lists eq xs ys = xs @ filter_out (member eq xs) ys;
-
-fun merge_alists eq xs = merge_lists (eq_fst eq) xs;
-
-
-(* auxiliary: noting name bindings with qualified base names *)
-
-fun global_note_qualified kind facts thy =
-  thy
-  |> Sign.qualified_names
-  |> PureThy.note_thmss kind facts
-  ||> Sign.restore_naming thy;
-
-fun local_note_qualified kind facts ctxt =
-  ctxt
-  |> ProofContext.qualified_names
-  |> ProofContext.note_thmss_i kind facts
-  ||> ProofContext.restore_naming ctxt;
-
-
-(** locale elements and expressions **)
-
 datatype ctxt = datatype Element.ctxt;
 
-datatype expr =
-  Locale of string |
-  Rename of expr * (string * mixfix option) option list |
-  Merge of expr list;
-
-val empty = Merge [];
-
-datatype 'a element =
-  Elem of 'a | Expr of expr;
-
-fun map_elem f (Elem e) = Elem (f e)
-  | map_elem _ (Expr e) = Expr e;
-
-type decl = declaration * stamp;
-
-type locale =
- {axiom: Element.witness list,
-    (* For locales that define predicates this is [A [A]], where A is the locale
-       specification.  Otherwise [].
-       Only required to generate the right witnesses for locales with predicates. *)
-  elems: (Element.context_i * stamp) list,
-    (* Static content, neither Fixes nor Constrains elements *)
-  params: ((string * typ) * mixfix) list,                        (*all term params*)
-  decls: decl list * decl list,                    (*type/term_syntax declarations*)
-  regs: ((string * string list) * Element.witness list) list,
-    (* Registrations: indentifiers and witnesses of locales interpreted in the locale. *)
-  intros: thm list * thm list,
-    (* Introduction rules: of delta predicate and locale predicate. *)
-  dests: thm list}
-    (* Destruction rules: projections from locale predicate to predicates of fragments. *)
-
-(* CB: an internal (Int) locale element was either imported or included,
-   an external (Ext) element appears directly in the locale text. *)
-
-datatype ('a, 'b) int_ext = Int of 'a | Ext of 'b;
-
-
-
-(** substitutions on Vars -- clone from element.ML **)
-
-(* instantiate types *)
-
-fun var_instT_type env =
-  if Vartab.is_empty env then I
-  else Term.map_type_tvar (fn (x, S) => the_default (TVar (x, S)) (Vartab.lookup env x));
-
-fun var_instT_term env =
-  if Vartab.is_empty env then I
-  else Term.map_types (var_instT_type env);
-
-fun var_inst_term (envT, env) =
-  if Vartab.is_empty env then var_instT_term envT
-  else
-    let
-      val instT = var_instT_type envT;
-      fun inst (Const (x, T)) = Const (x, instT T)
-        | inst (Free (x, T)) = Free(x, instT T)
-        | inst (Var (xi, T)) =
-            (case Vartab.lookup env xi of
-              NONE => Var (xi, instT T)
-            | SOME t => t)
-        | inst (b as Bound _) = b
-        | inst (Abs (x, T, t)) = Abs (x, instT T, inst t)
-        | inst (t $ u) = inst t $ inst u;
-    in Envir.beta_norm o inst end;
-
 
-(** management of registrations in theories and proof contexts **)
-
-type registration =
-  {prfx: (Binding.T -> Binding.T) * (string * string),
-      (* first component: interpretation name morphism;
-         second component: parameter prefix *)
-    exp: Morphism.morphism,
-      (* maps content to its originating context *)
-    imp: (typ Vartab.table * typ list) * (term Vartab.table * term list),
-      (* inverse of exp *)
-    wits: Element.witness list,
-      (* witnesses of the registration *)
-    eqns: thm Termtab.table,
-      (* theorems (equations) interpreting derived concepts and indexed by lhs *)
-    morph: unit
-      (* interpreting morphism *)
-  }
-
-structure Registrations :
-  sig
-    type T
-    val empty: T
-    val join: T * T -> T
-    val dest: theory -> T ->
-      (term list *
-        (((Binding.T -> Binding.T) * (string * string)) *
-         (Morphism.morphism * ((typ Vartab.table * typ list) * (term Vartab.table * term list))) *
-         Element.witness list *
-         thm Termtab.table)) list
-    val test: theory -> T * term list -> bool
-    val lookup: theory ->
-      T * (term list * ((typ Vartab.table * typ list) * (term Vartab.table * term list))) ->
-      (((Binding.T -> Binding.T) * (string * string)) * Element.witness list * thm Termtab.table) option
-    val insert: theory -> term list -> ((Binding.T -> Binding.T) * (string * string)) ->
-      (Morphism.morphism * ((typ Vartab.table * typ list) * (term Vartab.table * term list))) ->
-      T ->
-      T * (term list * (((Binding.T -> Binding.T) * (string * string)) * Element.witness list)) list
-    val add_witness: term list -> Element.witness -> T -> T
-    val add_equation: term list -> thm -> T -> T
-(*
-    val update_morph: term list -> Morphism.morphism -> T -> T
-    val get_morph: theory -> T ->
-      term list * ((typ Vartab.table * typ list) * (term Vartab.table * term list)) ->
-      Morphism.morphism
-*)
-  end =
-struct
-  (* A registration is indexed by parameter instantiation.
-     NB: index is exported whereas content is internalised. *)
-  type T = registration Termtab.table;
-
-  fun mk_reg prfx exp imp wits eqns morph =
-    {prfx = prfx, exp = exp, imp = imp, wits = wits, eqns = eqns, morph = morph};
-
-  fun map_reg f reg =
-    let
-      val {prfx, exp, imp, wits, eqns, morph} = reg;
-      val (prfx', exp', imp', wits', eqns', morph') = f (prfx, exp, imp, wits, eqns, morph);
-    in mk_reg prfx' exp' imp' wits' eqns' morph' end;
-
-  val empty = Termtab.empty;
-
-  (* term list represented as single term, for simultaneous matching *)
-  fun termify ts =
-    Term.list_comb (Const ("", map fastype_of ts ---> propT), ts);
-  fun untermify t =
-    let fun ut (Const _) ts = ts
-          | ut (s $ t) ts = ut s (t::ts)
-    in ut t [] end;
+(*** Basics ***)
 
-  (* joining of registrations:
-     - prefix and morphisms of right theory;
-     - witnesses are equal, no attempt to subsumption testing;
-     - union of equalities, if conflicting (i.e. two eqns with equal lhs)
-       eqn of right theory takes precedence *)
-  fun join (r1, r2) = Termtab.join (fn _ => fn ({eqns = e1, ...}, {prfx = n, exp, imp, wits = w, eqns = e2, morph = m}) =>
-      mk_reg n exp imp w (Termtab.join (fn _ => fn (_, e) => e) (e1, e2)) m) (r1, r2);
-
-  fun dest_transfer thy regs =
-    Termtab.dest regs |> map (apsnd (map_reg (fn (n, e, i, ws, es, m) =>
-      (n, e, i, map (Element.transfer_witness thy) ws, Termtab.map (transfer thy) es, m))));
-
-  fun dest thy regs = dest_transfer thy regs |> map (apfst untermify) |>
-    map (apsnd (fn {prfx, exp, imp, wits, eqns, ...} => (prfx, (exp, imp), wits, eqns)));
-
-  (* registrations that subsume t *)
-  fun subsumers thy t regs =
-    filter (fn (t', _) => Pattern.matches thy (t', t)) (dest_transfer thy regs);
-
-  (* test if registration that subsumes the query is present *)
-  fun test thy (regs, ts) =
-    not (null (subsumers thy (termify ts) regs));
-      
-  (* look up registration, pick one that subsumes the query *)
-  fun lookup thy (regs, (ts, ((impT, _), (imp, _)))) =
-    let
-      val t = termify ts;
-      val subs = subsumers thy t regs;
-    in
-      (case subs of
-        [] => NONE
-        | ((t', {prfx, exp = exp', imp = ((impT', domT'), (imp', dom')), wits, eqns, morph}) :: _) =>
-          let
-            val (tinst, inst) = Pattern.match thy (t', t) (Vartab.empty, Vartab.empty);
-            val tinst' = domT' |> map (fn (T as TFree (x, _)) =>
-                (x, T |> Morphism.typ exp' |> Envir.typ_subst_TVars tinst
-                      |> var_instT_type impT)) |> Symtab.make;
-            val inst' = dom' |> map (fn (t as Free (x, _)) =>
-                (x, t |> Morphism.term exp' |> Envir.subst_vars (tinst, inst)
-                      |> var_inst_term (impT, imp))) |> Symtab.make;
-            val inst'_morph = Element.inst_morphism thy (tinst', inst');
-          in SOME (prfx,
-            map (Element.morph_witness inst'_morph) wits,
-            Termtab.map (Morphism.thm inst'_morph) eqns)
-          end)
-    end;
-
-  (* add registration if not subsumed by ones already present,
-     additionally returns registrations that are strictly subsumed *)
-  fun insert thy ts prfx (exp, imp) regs =
-    let
-      val t = termify ts;
-      val subs = subsumers thy t regs ;
-    in (case subs of
-        [] => let
-                val sups =
-                  filter (fn (t', _) => Pattern.matches thy (t, t')) (dest_transfer thy regs);
-                val sups' = map (apfst untermify) sups |> map (fn (ts, {prfx, wits, ...}) => (ts, (prfx, wits)))
-              in (Termtab.update (t, mk_reg prfx exp imp [] Termtab.empty ()) regs, sups') end
-      | _ => (regs, []))
-    end;
-
-  fun gen_add f ts regs =
-    let
-      val t = termify ts;
-    in
-      Termtab.update (t, map_reg f (the (Termtab.lookup regs t))) regs
-    end;
-
-  (* add witness theorem to registration,
-     only if instantiation is exact, otherwise exception Option raised *)
-  fun add_witness ts wit regs =
-    gen_add (fn (x, e, i, wits, eqns, m) => (x, e, i, Element.close_witness wit :: wits, eqns, m))
-      ts regs;
-
-  (* add equation to registration, replaces previous equation with same lhs;
-     only if instantiation is exact, otherwise exception Option raised;
-     exception TERM raised if not a meta equality *)
-  fun add_equation ts thm regs =
-    gen_add (fn (x, e, i, thms, eqns, m) =>
-      (x, e, i, thms, Termtab.update (thm |> prop_of |> Logic.dest_equals |> fst, Thm.close_derivation thm) eqns, m))
-      ts regs;
-
-end;
+datatype locale = Loc of {
+  (* extensible lists are in reverse order: decls, notes, dependencies *)
+  parameters: (string * sort) list * (Binding.T * typ option * mixfix) list,
+    (* type and term parameters *)
+  spec: term option * term list,
+    (* assumptions (as a single predicate expression) and defines *)
+  decls: (declaration * stamp) list * (declaration * stamp) list,
+    (* type and term syntax declarations *)
+  notes: ((string * (Attrib.binding * (thm list * Attrib.src list) list) list) * stamp) list,
+    (* theorem declarations *)
+  dependencies: ((string * Morphism.morphism) * stamp) list
+    (* locale dependencies (sublocale relation) *)
+}
 
 
-(** theory data : locales **)
+(*** Theory data ***)
 
 structure LocalesData = TheoryDataFun
 (
   type T = NameSpace.T * locale Symtab.table;
-    (* 1st entry: locale namespace,
-       2nd entry: locales of the theory *)
+    (* locale namespace and locales of the theory *)
 
   val empty = NameSpace.empty_table;
   val copy = I;
   val extend = I;
 
   fun join_locales _
-    ({axiom, elems, params, decls = (decls1, decls2), regs, intros, dests}: locale,
-      {elems = elems', decls = (decls1', decls2'), regs = regs', ...}: locale) =
-     {axiom = axiom,
-      elems = merge_lists (eq_snd (op =)) elems elems',
-      params = params,
-      decls =
-       (Library.merge (eq_snd (op =)) (decls1, decls1'),
-        Library.merge (eq_snd (op =)) (decls2, decls2')),
-      regs = merge_alists (op =) regs regs',
-      intros = intros,
-      dests = dests};
+   (Loc {parameters, spec, decls = (decls1, decls2), notes, dependencies},
+    Loc {decls = (decls1', decls2'), notes = notes', dependencies = dependencies', ...}) =
+      Loc {
+        parameters = parameters,
+        spec = spec,
+        decls =
+         (merge (eq_snd op =) (decls1, decls1'),
+          merge (eq_snd op =) (decls2, decls2')),
+        notes = merge (eq_snd op =) (notes, notes'),
+        dependencies = merge (eq_snd op =) (dependencies, dependencies')};
+
   fun merge _ = NameSpace.join_tables join_locales;
 );
 
-
-
-(** context data : registrations **)
-
-structure RegistrationsData = GenericDataFun
-(
-  type T = Registrations.T Symtab.table;  (*registrations, indexed by locale name*)
-  val empty = Symtab.empty;
-  val extend = I;
-  fun merge _ = Symtab.join (K Registrations.join);
-);
-
-
-(** access locales **)
-
 val intern = NameSpace.intern o #1 o LocalesData.get;
 val extern = NameSpace.extern o #1 o LocalesData.get;
 
@@ -430,21 +161,24 @@
  of SOME loc => loc
   | NONE => error ("Unknown locale " ^ quote name);
 
-fun register_locale bname loc thy =
-  thy |> LocalesData.map (NameSpace.bind (Sign.naming_of thy)
-    (Binding.name bname, loc) #> snd);
+fun test_locale thy name = case get_locale thy name
+ of SOME _ => true | NONE => false;
+
+fun register_locale bname parameters spec decls notes dependencies thy =
+  thy |> LocalesData.map (NameSpace.bind (Sign.naming_of thy) (Binding.name bname,
+    Loc {parameters = parameters, spec = spec, decls = decls, notes = notes,
+      dependencies = dependencies}) #> snd);
 
 fun change_locale name f thy =
   let
-    val {axiom, elems, params, decls, regs, intros, dests} =
+    val Loc {parameters, spec, decls, notes, dependencies} =
         the_locale thy name;
-    val (axiom', elems', params', decls', regs', intros', dests') =
-      f (axiom, elems, params, decls, regs, intros, dests);
+    val (parameters', spec', decls', notes', dependencies') =
+      f (parameters, spec, decls, notes, dependencies);
   in
     thy
-    |> (LocalesData.map o apsnd) (Symtab.update (name, {axiom = axiom',
-          elems = elems', params = params',
-          decls = decls', regs = regs', intros = intros', dests = dests'}))
+    |> (LocalesData.map o apsnd) (Symtab.update (name, Loc {parameters = parameters',
+      spec = spec', decls = decls', notes = notes', dependencies = dependencies'}))
   end;
 
 fun print_locales thy =
@@ -454,1273 +188,288 @@
   end;
 
 
-(* access registrations *)
-
-(* retrieve registration from theory or context *)
-
-fun get_registrations ctxt name =
-  case Symtab.lookup (RegistrationsData.get ctxt) name of
-      NONE => []
-    | SOME reg => Registrations.dest (Context.theory_of ctxt) reg;
-
-fun get_global_registrations thy = get_registrations (Context.Theory thy);
-fun get_local_registrations ctxt = get_registrations (Context.Proof ctxt);
-
-
-fun get_registration ctxt imprt (name, ps) =
-  case Symtab.lookup (RegistrationsData.get ctxt) name of
-      NONE => NONE
-    | SOME reg => Registrations.lookup (Context.theory_of ctxt) (reg, (ps, imprt));
-
-fun get_global_registration thy = get_registration (Context.Theory thy);
-fun get_local_registration ctxt = get_registration (Context.Proof ctxt);
-
-
-fun test_registration ctxt (name, ps) =
-  case Symtab.lookup (RegistrationsData.get ctxt) name of
-      NONE => false
-    | SOME reg => Registrations.test (Context.theory_of ctxt) (reg, ps);
-
-fun test_global_registration thy = test_registration (Context.Theory thy);
-fun test_local_registration ctxt = test_registration (Context.Proof ctxt);
-
-
-(* add registration to theory or context, ignored if subsumed *)
+(*** Primitive operations ***)
 
-fun put_registration (name, ps) prfx morphs ctxt =
-  RegistrationsData.map (fn regs =>
-    let
-      val thy = Context.theory_of ctxt;
-      val reg = the_default Registrations.empty (Symtab.lookup regs name);
-      val (reg', sups) = Registrations.insert thy ps prfx morphs reg;
-      val _ = if not (null sups) then warning
-                ("Subsumed interpretation(s) of locale " ^
-                 quote (extern thy name) ^
-                 "\nwith the following prefix(es):" ^
-                  commas_quote (map (fn (_, ((_, (_, s)), _)) => s) sups))
-              else ();
-    in Symtab.update (name, reg') regs end) ctxt;
+fun params_of thy name =
+  let
+    val Loc {parameters = (_, params), ...} = the_locale thy name
+  in params end;
 
-fun put_global_registration id prfx morphs =
-  Context.theory_map (put_registration id prfx morphs);
-fun put_local_registration id prfx morphs =
-  Context.proof_map (put_registration id prfx morphs);
-
-fun put_registration_in_locale name id =
-  change_locale name (fn (axiom, elems, params, decls, regs, intros, dests) =>
-    (axiom, elems, params, decls, regs @ [(id, [])], intros, dests));
-
-
-(* add witness theorem to registration, ignored if registration not present *)
-
-fun add_witness (name, ps) thm =
-  RegistrationsData.map (Symtab.map_entry name (Registrations.add_witness ps thm));
-
-fun add_global_witness id thm = Context.theory_map (add_witness id thm);
-fun add_local_witness id thm = Context.proof_map (add_witness id thm);
-
+fun instance_of thy name morph =
+  params_of thy name |>
+    map ((fn (b, T, _) => Free (Binding.base_name b, the T)) #> Morphism.term morph);
 
-fun add_witness_in_locale name id thm =
-  change_locale name (fn (axiom, elems, params, decls, regs, intros, dests) =>
-    let
-      fun add (id', thms) =
-        if id = id' then (id', thm :: thms) else (id', thms);
-    in (axiom, elems, params, decls, map add regs, intros, dests) end);
-
-
-(* add equation to registration, ignored if registration not present *)
-
-fun add_equation (name, ps) thm =
-  RegistrationsData.map (Symtab.map_entry name (Registrations.add_equation ps thm));
-
-fun add_global_equation id thm = Context.theory_map (add_equation id thm);
-fun add_local_equation id thm = Context.proof_map (add_equation id thm);
-
-(*
-(* update morphism of registration, ignored if registration not present *)
-
-fun update_morph (name, ps) morph =
-  RegistrationsData.map (Symtab.map_entry name (Registrations.update_morph ps morph));
-
-fun update_global_morph id morph = Context.theory_map (update_morph id morph);
-fun update_local_morph id morph = Context.proof_map (update_morph id morph);
-*)
-
-
-(* printing of registrations *)
-
-fun print_registrations show_wits loc ctxt =
+fun specification_of thy name =
   let
-    val thy = ProofContext.theory_of ctxt;
-    val prt_term = Pretty.quote o Syntax.pretty_term ctxt;
-    fun prt_term' t = if !show_types
-          then Pretty.block [prt_term t, Pretty.brk 1, Pretty.str "::",
-            Pretty.brk 1, (Pretty.quote o Syntax.pretty_typ ctxt) (type_of t)]
-          else prt_term t;
-    val prt_thm = prt_term o prop_of;
-    fun prt_inst ts =
-        Pretty.enclose "(" ")" (Pretty.breaks (map prt_term' ts));
-    fun prt_prfx ((false, prfx), param_prfx) = [Pretty.str prfx, Pretty.brk 1, Pretty.str "(optional)", Pretty.brk 1, Pretty.str param_prfx]
-      | prt_prfx ((true, prfx), param_prfx) = [Pretty.str prfx, Pretty.brk 1, Pretty.str param_prfx];
-    fun prt_eqns [] = Pretty.str "no equations."
-      | prt_eqns eqns = Pretty.block (Pretty.str "equations:" :: Pretty.brk 1 ::
-          Pretty.breaks (map prt_thm eqns));
-    fun prt_core ts eqns =
-          [prt_inst ts, Pretty.fbrk, prt_eqns (Termtab.dest eqns |> map snd)];
-    fun prt_witns [] = Pretty.str "no witnesses."
-      | prt_witns witns = Pretty.block (Pretty.str "witnesses:" :: Pretty.brk 1 ::
-          Pretty.breaks (map (Element.pretty_witness ctxt) witns))
-    fun prt_reg (ts, (_, _, witns, eqns)) =
-        if show_wits
-          then Pretty.block (prt_core ts eqns @ [Pretty.fbrk, prt_witns witns])
-          else Pretty.block (prt_core ts eqns)
+    val Loc {spec, ...} = the_locale thy name
+  in spec end;
 
-    val loc_int = intern thy loc;
-    val regs = RegistrationsData.get (Context.Proof ctxt);
-    val loc_regs = Symtab.lookup regs loc_int;
+fun declarations_of thy name =
+  let
+    val Loc {decls, ...} = the_locale thy name
   in
-    (case loc_regs of
-        NONE => Pretty.str ("no interpretations")
-      | SOME r => let
-            val r' = Registrations.dest thy r;
-            val r'' = Library.sort_wrt (fn (_, ((_, (_, prfx)), _, _, _)) => prfx) r';
-          in Pretty.big_list ("interpretations:") (map prt_reg r'') end)
-    |> Pretty.writeln
+    decls |> apfst (map fst) |> apsnd (map fst)
   end;
 
 
-(* diagnostics *)
-
-fun err_in_locale ctxt msg ids =
-  let
-    val thy = ProofContext.theory_of ctxt;
-    fun prt_id (name, parms) =
-      [Pretty.block (Pretty.breaks (map Pretty.str (extern thy name :: parms)))];
-    val prt_ids = flat (separate [Pretty.str " +", Pretty.brk 1] (map prt_id ids));
-    val err_msg =
-      if forall (fn (s, _) => s = "") ids then msg
-      else msg ^ "\n" ^ Pretty.string_of (Pretty.block
-        (Pretty.str "The error(s) above occurred in locale:" :: Pretty.brk 1 :: prt_ids));
-  in error err_msg end;
-
-fun err_in_locale' ctxt msg ids' = err_in_locale ctxt msg (map fst ids');
-
+(*** Activate context elements of locale ***)
 
-fun pretty_ren NONE = Pretty.str "_"
-  | pretty_ren (SOME (x, NONE)) = Pretty.str x
-  | pretty_ren (SOME (x, SOME syn)) =
-      Pretty.block [Pretty.str x, Pretty.brk 1, Syntax.pretty_mixfix syn];
-
-fun pretty_expr thy (Locale name) = Pretty.str (extern thy name)
-  | pretty_expr thy (Rename (expr, xs)) =
-      Pretty.block [pretty_expr thy expr, Pretty.brk 1, Pretty.block (map pretty_ren xs |> Pretty.breaks)]
-  | pretty_expr thy (Merge es) =
-      Pretty.separate "+" (map (pretty_expr thy) es) |> Pretty.block;
-
-fun err_in_expr _ msg (Merge []) = error msg
-  | err_in_expr ctxt msg expr =
-    error (msg ^ "\n" ^ Pretty.string_of (Pretty.block
-      [Pretty.str "The error(s) above occured in locale expression:", Pretty.brk 1,
-       pretty_expr (ProofContext.theory_of ctxt) expr]));
-
-
-(** structured contexts: rename + merge + implicit type instantiation **)
-
-(* parameter types *)
-
-fun frozen_tvars ctxt Ts =
-  #1 (Variable.importT_inst (map Logic.mk_type Ts) ctxt)
-  |> map (fn ((xi, S), T) => (xi, (S, T)));
+(** Identifiers: activated locales in theory or proof context **)
 
-fun unify_frozen ctxt maxidx Ts Us =
-  let
-    fun paramify NONE i = (NONE, i)
-      | paramify (SOME T) i = apfst SOME (TypeInfer.paramify_dummies T i);
-
-    val (Ts', maxidx') = fold_map paramify Ts maxidx;
-    val (Us', maxidx'') = fold_map paramify Us maxidx';
-    val thy = ProofContext.theory_of ctxt;
-
-    fun unify (SOME T, SOME U) env = (Sign.typ_unify thy (U, T) env
-          handle Type.TUNIFY => raise TYPE ("unify_frozen: failed to unify types", [U, T], []))
-      | unify _ env = env;
-    val (unifier, _) = fold unify (Ts' ~~ Us') (Vartab.empty, maxidx'');
-    val Vs = map (Option.map (Envir.norm_type unifier)) Us';
-    val unifier' = fold Vartab.update_new (frozen_tvars ctxt (map_filter I Vs)) unifier;
-  in map (Option.map (Envir.norm_type unifier')) Vs end;
-
-fun params_of elemss =
-  distinct (eq_fst (op = : string * string -> bool)) (maps (snd o fst) elemss);
-
-fun params_of' elemss =
-  distinct (eq_fst (op = : string * string -> bool)) (maps (snd o fst o fst) elemss);
-
-fun param_prefix locale_name params = (NameSpace.base locale_name ^ "_locale", space_implode "_" params);
+type identifiers = (string * term list) list;
 
-
-(* CB: param_types has the following type:
-  ('a * 'b option) list -> ('a * 'b) list *)
-fun param_types ps = map_filter (fn (_, NONE) => NONE | (x, SOME T) => SOME (x, T)) ps;
-
-
-fun merge_syntax ctxt ids ss = Symtab.merge (op = : mixfix * mixfix -> bool) ss
-  handle Symtab.DUP x => err_in_locale ctxt
-    ("Conflicting syntax for parameter: " ^ quote x) (map fst ids);
-
+val empty = ([] : identifiers);
 
-(* Distinction of assumed vs. derived identifiers.
-   The former may have axioms relating assumptions of the context to
-   assumptions of the specification fragment (for locales with
-   predicates).  The latter have witnesses relating assumptions of the
-   specification fragment to assumptions of other (assumed) specification
-   fragments. *)
-
-datatype 'a mode = Assumed of 'a | Derived of 'a;
-
-fun map_mode f (Assumed x) = Assumed (f x)
-  | map_mode f (Derived x) = Derived (f x);
-
-
-(* flatten expressions *)
+fun ident_eq thy ((n: string, ts), (m, ss)) = (m = n) andalso Pattern.matchess thy (ss, ts);
 
 local
 
-fun unify_parms ctxt fixed_parms raw_parmss =
-  let
-    val thy = ProofContext.theory_of ctxt;
-    val maxidx = length raw_parmss;
-    val idx_parmss = (0 upto maxidx - 1) ~~ raw_parmss;
-
-    fun varify i = Term.map_type_tfree (fn (a, S) => TVar ((a, i), S));
-    fun varify_parms (i, ps) = map (apsnd (varify i)) (param_types ps);
-    val parms = fixed_parms @ maps varify_parms idx_parmss;
+datatype 'a delayed = Ready of 'a | ToDo of ('a delayed * 'a delayed);
 
-    fun unify T U envir = Sign.typ_unify thy (U, T) envir
-      handle Type.TUNIFY =>
-        let
-          val T' = Envir.norm_type (fst envir) T;
-          val U' = Envir.norm_type (fst envir) U;
-          val prt = Syntax.string_of_typ ctxt;
-        in
-          raise TYPE ("unify_parms: failed to unify types " ^
-            prt U' ^ " and " ^ prt T', [U', T'], [])
-        end;
-    fun unify_list (T :: Us) = fold (unify T) Us
-      | unify_list [] = I;
-    val (unifier, _) = fold unify_list (map #2 (Symtab.dest (Symtab.make_list parms)))
-      (Vartab.empty, maxidx);
-
-    val parms' = map (apsnd (Envir.norm_type unifier)) (distinct (eq_fst (op =)) parms);
-    val unifier' = fold Vartab.update_new (frozen_tvars ctxt (map #2 parms')) unifier;
-
-    fun inst_parms (i, ps) =
-      List.foldr OldTerm.add_typ_tfrees [] (map_filter snd ps)
-      |> map_filter (fn (a, S) =>
-          let val T = Envir.norm_type unifier' (TVar ((a, i), S))
-          in if T = TFree (a, S) then NONE else SOME (a, T) end)
-      |> Symtab.make;
-  in map inst_parms idx_parmss end;
+structure IdentifiersData = GenericDataFun
+(
+  type T = identifiers delayed;
+  val empty = Ready empty;
+  val extend = I;
+  fun merge _ = ToDo;
+);
 
 in
 
-fun unify_elemss _ _ [] = []
-  | unify_elemss _ [] [elems] = [elems]
-  | unify_elemss ctxt fixed_parms elemss =
-      let
-        val thy = ProofContext.theory_of ctxt;
-        val phis = unify_parms ctxt fixed_parms (map (snd o fst o fst) elemss)
-          |> map (Element.instT_morphism thy);
-        fun inst ((((name, ps), mode), elems), phi) =
-          (((name, map (apsnd (Option.map (Morphism.typ phi))) ps),
-              map_mode (map (Element.morph_witness phi)) mode),
-            map (Element.morph_ctxt phi) elems);
-      in map inst (elemss ~~ phis) end;
-
-
-fun renaming xs parms = zip_options parms xs
-  handle Library.UnequalLengths =>
-    error ("Too many arguments in renaming: " ^
-      commas (map (fn NONE => "_" | SOME x => quote (fst x)) xs));
-
-
-(* params_of_expr:
-   Compute parameters (with types and syntax) of locale expression.
-*)
-
-fun params_of_expr ctxt fixed_params expr (prev_parms, prev_types, prev_syn) =
-  let
-    val thy = ProofContext.theory_of ctxt;
-
-    fun merge_tenvs fixed tenv1 tenv2 =
-        let
-          val [env1, env2] = unify_parms ctxt fixed
-                [tenv1 |> Symtab.dest |> map (apsnd SOME),
-                 tenv2 |> Symtab.dest |> map (apsnd SOME)]
-        in
-          Symtab.merge (op =) (Symtab.map (Element.instT_type env1) tenv1,
-            Symtab.map (Element.instT_type env2) tenv2)
-        end;
-
-    fun merge_syn expr syn1 syn2 =
-        Symtab.merge (op = : mixfix * mixfix -> bool) (syn1, syn2)
-        handle Symtab.DUP x => err_in_expr ctxt
-          ("Conflicting syntax for parameter: " ^ quote x) expr;
-
-    fun params_of (expr as Locale name) =
-          let
-            val {params, ...} = the_locale thy name;
-          in (map (fst o fst) params, params |> map fst |> Symtab.make,
-               params |> map (apfst fst) |> Symtab.make) end
-      | params_of (expr as Rename (e, xs)) =
-          let
-            val (parms', types', syn') = params_of e;
-            val ren = renaming xs parms';
-            (* renaming may reduce number of parameters *)
-            val new_parms = map (Element.rename ren) parms' |> distinct (op =);
-            val ren_syn = syn' |> Symtab.dest |> map (Element.rename_var_name ren);
-            val new_syn = fold (Symtab.insert (op =)) ren_syn Symtab.empty
-                handle Symtab.DUP x =>
-                  err_in_expr ctxt ("Conflicting syntax for parameter: " ^ quote x) expr;
-            val syn_types = map (apsnd (fn mx =>
-                SOME (Type.freeze_type (#1 (TypeInfer.paramify_dummies (Syntax.mixfixT mx) 0)))))
-              (Symtab.dest new_syn);
-            val ren_types = types' |> Symtab.dest |> map (apfst (Element.rename ren));
-            val (env :: _) = unify_parms ctxt []
-                ((ren_types |> map (apsnd SOME)) :: map single syn_types);
-            val new_types = fold (Symtab.insert (op =))
-                (map (apsnd (Element.instT_type env)) ren_types) Symtab.empty;
-          in (new_parms, new_types, new_syn) end
-      | params_of (Merge es) =
-          fold (fn e => fn (parms, types, syn) =>
-                   let
-                     val (parms', types', syn') = params_of e
-                   in
-                     (merge_lists (op =) parms parms', merge_tenvs [] types types',
-                      merge_syn e syn syn')
-                   end)
-            es ([], Symtab.empty, Symtab.empty)
-
-      val (parms, types, syn) = params_of expr;
-    in
-      (merge_lists (op =) prev_parms parms, merge_tenvs fixed_params prev_types types,
-       merge_syn expr prev_syn syn)
-    end;
-
-fun make_params_ids params = [(("", params), ([], Assumed []))];
-fun make_raw_params_elemss (params, tenv, syn) =
-    [((("", map (fn p => (p, Symtab.lookup tenv p)) params), Assumed []),
-      Int [Fixes (map (fn p =>
-        (Binding.name p, Symtab.lookup tenv p, Symtab.lookup syn p |> the)) params)])];
-
-
-(* flatten_expr:
-   Extend list of identifiers by those new in locale expression expr.
-   Compute corresponding list of lists of locale elements (one entry per
-   identifier).
-
-   Identifiers represent locale fragments and are in an extended form:
-     ((name, ps), (ax_ps, axs))
-   (name, ps) is the locale name with all its parameters.
-   (ax_ps, axs) is the locale axioms with its parameters;
-     axs are always taken from the top level of the locale hierarchy,
-     hence axioms may contain additional parameters from later fragments:
-     ps subset of ax_ps.  axs is either singleton or empty.
-
-   Elements are enriched by identifier-like information:
-     (((name, ax_ps), axs), elems)
-   The parameters in ax_ps are the axiom parameters, but enriched by type
-   info: now each entry is a pair of string and typ option.  Axioms are
-   type-instantiated.
-
-*)
-
-fun flatten_expr ctxt ((prev_idents, prev_syntax), expr) =
-  let
-    val thy = ProofContext.theory_of ctxt;
-
-    fun rename_parms top ren ((name, ps), (parms, mode)) =
-        ((name, map (Element.rename ren) ps),
-         if top
-         then (map (Element.rename ren) parms,
-               map_mode (map (Element.morph_witness (Element.rename_morphism ren))) mode)
-         else (parms, mode));
+fun finish thy (ToDo (i1, i2)) = merge (ident_eq thy) (finish thy i1, finish thy i2)
+  | finish _ (Ready ids) = ids;
 
-    (* add (name, pTs) and its registrations, recursively; adjust hyps of witnesses *)
-
-    fun add_with_regs ((name, pTs), mode) (wits, ids, visited) =
-        if member (fn (a, (b, _)) => a = b) visited (name, map #1 pTs)
-        then (wits, ids, visited)
-        else
-          let
-            val {params, regs, ...} = the_locale thy name;
-            val pTs' = map #1 params;
-            val ren = map #1 pTs' ~~ map (fn (x, _) => (x, NONE)) pTs;
-              (* dummy syntax, since required by rename *)
-            val pTs'' = map (fn ((p, _), (_, T)) => (p, T)) (pTs ~~ pTs');
-            val [env] = unify_parms ctxt pTs [map (apsnd SOME) pTs''];
-              (* propagate parameter types, to keep them consistent *)
-            val regs' = map (fn ((name, ps), wits) =>
-                ((name, map (Element.rename ren) ps),
-                 map (Element.transfer_witness thy) wits)) regs;
-            val new_regs = regs';
-            val new_ids = map fst new_regs;
-            val new_idTs =
-              map (apsnd (map (fn p => (p, (the o AList.lookup (op =) pTs) p)))) new_ids;
-
-            val new_wits = new_regs |> map (#2 #> map
-              (Element.morph_witness
-                (Element.instT_morphism thy env $>
-                  Element.rename_morphism ren $>
-                  Element.satisfy_morphism wits)
-                #> Element.close_witness));
-            val new_ids' = map (fn (id, wits) =>
-                (id, ([], Derived wits))) (new_ids ~~ new_wits);
-            val new_idTs' = map (fn ((n, pTs), (_, ([], mode))) =>
-                ((n, pTs), mode)) (new_idTs ~~ new_ids');
-            val new_id = ((name, map #1 pTs), ([], mode));
-            val (wits', ids', visited') = fold add_with_regs new_idTs'
-              (wits @ flat new_wits, ids, visited @ [new_id]);
-          in
-            (wits', ids' @ [new_id], visited')
-          end;
-
-    (* distribute top-level axioms over assumed ids *)
-
-    fun axiomify all_ps ((name, parms), (_, Assumed _)) axioms =
-        let
-          val {elems, ...} = the_locale thy name;
-          val ts = maps
-            (fn (Assumes asms, _) => maps (map #1 o #2) asms
-              | _ => [])
-            elems;
-          val (axs1, axs2) = chop (length ts) axioms;
-        in (((name, parms), (all_ps, Assumed axs1)), axs2) end
-      | axiomify all_ps (id, (_, Derived ths)) axioms =
-          ((id, (all_ps, Derived ths)), axioms);
-
-    (* identifiers of an expression *)
+val _ = Context.>> (Context.map_theory (Theory.at_begin (fn thy =>
+  (case IdentifiersData.get (Context.Theory thy) of
+    Ready _ => NONE |
+    ids => SOME (Context.theory_map (IdentifiersData.put (Ready (finish thy ids))) thy))
+  )));
 
-    fun identify top (Locale name) =
-    (* CB: ids_ax is a list of tuples of the form ((name, ps), axs),
-       where name is a locale name, ps a list of parameter names and axs
-       a list of axioms relating to the identifier, axs is empty unless
-       identify at top level (top = true);
-       parms is accumulated list of parameters *)
-          let
-            val {axiom, params, ...} = the_locale thy name;
-            val ps = map (#1 o #1) params;
-            val (_, ids'', _) = add_with_regs ((name, map #1 params), Assumed []) ([], [], []);
-            val ids_ax = if top then fst (fold_map (axiomify ps) ids'' axiom) else ids'';
-            in (ids_ax, ps) end
-      | identify top (Rename (e, xs)) =
-          let
-            val (ids', parms') = identify top e;
-            val ren = renaming xs parms'
-              handle ERROR msg => err_in_locale' ctxt msg ids';
-
-            val ids'' = distinct (eq_fst (op =)) (map (rename_parms top ren) ids');
-            val parms'' = distinct (op =) (maps (#2 o #1) ids'');
-          in (ids'', parms'') end
-      | identify top (Merge es) =
-          fold (fn e => fn (ids, parms) =>
-                   let
-                     val (ids', parms') = identify top e
-                   in
-                     (merge_alists (op =) ids ids', merge_lists (op =) parms parms')
-                   end)
-            es ([], []);
+fun get_global_idents thy =
+  let val (Ready ids) = (IdentifiersData.get o Context.Theory) thy in ids end;
+val put_global_idents = Context.theory_map o IdentifiersData.put o Ready;
 
-    fun inst_wit all_params (t, th) = let
-         val {hyps, prop, ...} = Thm.rep_thm th;
-         val ps = map (apsnd SOME) (fold Term.add_frees (prop :: hyps) []);
-         val [env] = unify_parms ctxt all_params [ps];
-         val t' = Element.instT_term env t;
-         val th' = Element.instT_thm thy env th;
-       in (t', th') end;
-
-    fun eval all_params tenv syn ((name, params), (locale_params, mode)) =
-      let
-        val {params = ps_mx, elems = elems_stamped, ...} = the_locale thy name;
-        val elems = map fst elems_stamped;
-        val ps = map fst ps_mx;
-        fun lookup_syn x = (case Symtab.lookup syn x of SOME Structure => NONE | opt => opt);
-        val locale_params' = map (fn p => (p, Symtab.lookup tenv p |> the)) locale_params;
-        val mode' = map_mode (map (Element.map_witness (inst_wit all_params))) mode;
-        val ren = map fst ps ~~ map (fn p => (p, lookup_syn p)) params;
-        val [env] = unify_parms ctxt all_params [map (apfst (Element.rename ren) o apsnd SOME) ps];
-        val (lprfx, pprfx) = param_prefix name params;
-        val add_prefices = pprfx <> "" ? Binding.add_prefix false pprfx
-          #> Binding.add_prefix false lprfx;
-        val elem_morphism =
-          Element.rename_morphism ren $>
-          Morphism.binding_morphism add_prefices $>
-          Element.instT_morphism thy env;
-        val elems' = map (Element.morph_ctxt elem_morphism) elems;
-      in (((name, map (apsnd SOME) locale_params'), mode'), elems') end;
-
-    (* parameters, their types and syntax *)
-    val (all_params', tenv, syn) = params_of_expr ctxt [] expr ([], Symtab.empty, Symtab.empty);
-    val all_params = map (fn p => (p, Symtab.lookup tenv p |> the)) all_params';
-    (* compute identifiers and syntax, merge with previous ones *)
-    val (ids, _) = identify true expr;
-    val idents = subtract (eq_fst (op =)) prev_idents ids;
-    val syntax = merge_syntax ctxt ids (syn, prev_syntax);
-    (* type-instantiate elements *)
-    val final_elemss = map (eval all_params tenv syntax) idents;
-  in ((prev_idents @ idents, syntax), final_elemss) end;
+fun get_local_idents ctxt =
+  let val (Ready ids) = (IdentifiersData.get o Context.Proof) ctxt in ids end;
+val put_local_idents = Context.proof_map o IdentifiersData.put o Ready;
 
 end;
 
 
-(* activate elements *)
+(** Resolve locale dependencies in a depth-first fashion **)
 
 local
 
-fun axioms_export axs _ As =
-  (Element.satisfy_thm axs #> Drule.implies_intr_list (Library.drop (length axs, As)), fn t => t);
-
-
-(* NB: derived ids contain only facts at this stage *)
+val roundup_bound = 120;
 
-fun activate_elem _ _ (Fixes fixes) (ctxt, mode) =
-      ([], (ctxt |> ProofContext.add_fixes_i fixes |> snd, mode))
-  | activate_elem _ _ (Constrains _) (ctxt, mode) =
-      ([], (ctxt, mode))
-  | activate_elem ax_in_ctxt _ (Assumes asms) (ctxt, Assumed axs) =
-      let
-        val asms' = Attrib.map_specs (Attrib.attribute_i (ProofContext.theory_of ctxt)) asms;
-        val ts = maps (map #1 o #2) asms';
-        val (ps, qs) = chop (length ts) axs;
-        val (_, ctxt') =
-          ctxt |> fold Variable.auto_fixes ts
-          |> ProofContext.add_assms_i (axioms_export (if ax_in_ctxt then ps else [])) asms';
-      in ([], (ctxt', Assumed qs)) end
-  | activate_elem _ _ (Assumes asms) (ctxt, Derived ths) =
-      ([], (ctxt, Derived ths))
-  | activate_elem _ _ (Defines defs) (ctxt, Assumed axs) =
-      let
-        val defs' = Attrib.map_specs (Attrib.attribute_i (ProofContext.theory_of ctxt)) defs;
-        val asms = defs' |> map (fn ((name, atts), (t, ps)) =>
-            let val ((c, _), t') = LocalDefs.cert_def ctxt t
-            in (t', ((Binding.map_base (Thm.def_name_optional c) name, atts), [(t', ps)])) end);
-        val (_, ctxt') =
-          ctxt |> fold (Variable.auto_fixes o #1) asms
-          |> ProofContext.add_assms_i LocalDefs.def_export (map #2 asms);
-      in ([], (ctxt', Assumed axs)) end
-  | activate_elem _ _ (Defines defs) (ctxt, Derived ths) =
-      ([], (ctxt, Derived ths))
-  | activate_elem _ is_ext (Notes (kind, facts)) (ctxt, mode) =
-      let
-        val facts' = Attrib.map_facts (Attrib.attribute_i (ProofContext.theory_of ctxt)) facts;
-        val (res, ctxt') = ctxt |> local_note_qualified kind facts';
-      in (if is_ext then (map (#1 o #1) facts' ~~ map #2 res) else [], (ctxt', mode)) end;
-
-fun activate_elems ax_in_ctxt (((name, ps), mode), elems) ctxt =
-  let
-    val thy = ProofContext.theory_of ctxt;
-    val (res, (ctxt', _)) = fold_map (activate_elem ax_in_ctxt (name = ""))
-        elems (ProofContext.qualified_names ctxt, mode)
-      handle ERROR msg => err_in_locale ctxt msg [(name, map fst ps)];
-    val ctxt'' = if name = "" then ctxt'
-          else let
-              val ps' = map (fn (n, SOME T) => Free (n, T)) ps;
-            in if test_local_registration ctxt' (name, ps') then ctxt'
-              else let
-                  val ctxt'' = put_local_registration (name, ps') (I, (NameSpace.base name, ""))
-                    (Morphism.identity, ((Vartab.empty, []), (Vartab.empty, []) )) ctxt'
-                in case mode of
-                    Assumed axs =>
-                      fold (add_local_witness (name, ps') o
-                        Element.assume_witness thy o Element.witness_prop) axs ctxt''
-                  | Derived ths =>
-                     fold (add_local_witness (name, ps')) ths ctxt''
-                end
-            end
-  in (ProofContext.restore_naming ctxt ctxt'', res) end;
-
-fun activate_elemss ax_in_ctxt prep_facts =
-    fold_map (fn (((name, ps), mode), raw_elems) => fn ctxt =>
-      let
-        val elems = map (prep_facts ctxt) raw_elems;
-        val (ctxt', res) = apsnd flat
-            (activate_elems ax_in_ctxt (((name, ps), mode), elems) ctxt);
-        val elems' = elems |> map (Element.map_ctxt_attrib Args.closure);
-      in (((((name, ps), mode), elems'), res), ctxt') end);
+fun add thy depth (name, morph) (deps, marked) =
+  if depth > roundup_bound
+  then error "Roundup bound exceeded (sublocale relation probably not terminating)."
+  else
+    let
+      val Loc {parameters = (_, params), dependencies, ...} = the_locale thy name;
+      val instance = instance_of thy name morph;
+    in
+      if member (ident_eq thy) marked (name, instance)
+      then (deps, marked)
+      else
+        let
+          val dependencies' =
+            map (fn ((name, morph'), _) => (name, morph' $>  morph)) dependencies;
+          val marked' = (name, instance) :: marked;
+          val (deps', marked'') = fold_rev (add thy (depth + 1)) dependencies' ([], marked');
+        in
+          ((name, morph) :: deps' @ deps, marked'')
+        end
+    end;
 
 in
 
-(* CB: activate_facts prep_facts elemss ctxt,
-   where elemss is a list of pairs consisting of identifiers and
-   context elements, extends ctxt by the context elements yielding
-   ctxt' and returns ((elemss', facts), ctxt').
-   Identifiers in the argument are of the form ((name, ps), axs) and
-   assumptions use the axioms in the identifiers to set up exporters
-   in ctxt'.  elemss' does not contain identifiers and is obtained
-   from elemss and the intermediate context with prep_facts.
-   If read_facts or cert_facts is used for prep_facts, these also remove
-   the internal/external markers from elemss. *)
-
-fun activate_facts ax_in_ctxt prep_facts args =
-  activate_elemss ax_in_ctxt prep_facts args
-  #>> (apsnd flat o split_list);
+fun roundup thy activate_dep (name, morph) (marked, input) =
+  let
+    (* Find all dependencies incuding new ones (which are dependencies enriching
+      existing registrations). *)
+    val (dependencies, marked') = add thy 0 (name, morph) ([], empty);
+    (* Filter out exisiting fragments. *)
+    val dependencies' = filter_out (fn (name, morph) =>
+      member (ident_eq thy) marked (name, instance_of thy name morph)) dependencies;
+  in
+    (merge (ident_eq thy) (marked, marked'), input |> fold_rev (activate_dep thy) dependencies')
+  end;
 
 end;
 
 
+(* Declarations, facts and entire locale content *)
 
-(** prepare locale elements **)
+fun activate_decls thy (name, morph) ctxt =
+  let
+    val Loc {decls = (typ_decls, term_decls), ...} = the_locale thy name;
+  in
+    ctxt |> fold_rev (fn (decl, _) => Context.proof_map (decl morph)) typ_decls |>
+      fold_rev (fn (decl, _) => Context.proof_map (decl morph)) term_decls
+  end;
 
-(* expressions *)
+fun activate_notes activ_elem transfer thy (name, morph) input =
+  let
+    val Loc {notes, ...} = the_locale thy name;
+    fun activate ((kind, facts), _) input =
+      let
+        val facts' = facts |> Element.facts_map (Element.morph_ctxt (transfer input $> morph))
+      in activ_elem (Notes (kind, facts')) input end;
+  in
+    fold_rev activate notes input
+  end;
 
-fun intern_expr thy (Locale xname) = Locale (intern thy xname)
-  | intern_expr thy (Merge exprs) = Merge (map (intern_expr thy) exprs)
-  | intern_expr thy (Rename (expr, xs)) = Rename (intern_expr thy expr, xs);
+fun activate_all name thy activ_elem transfer (marked, input) =
+  let
+    val Loc {parameters = (_, params), spec = (asm, defs), ...} =
+      the_locale thy name;
+  in
+    input |>
+      (if not (null params) then activ_elem (Fixes params) else I) |>
+      (* FIXME type parameters *)
+      (if is_some asm then activ_elem (Assumes [(Attrib.empty_binding, [(the asm, [])])]) else I) |>
+      (if not (null defs)
+        then activ_elem (Defines (map (fn def => (Attrib.empty_binding, (def, []))) defs))
+        else I) |>
+      pair marked |> roundup thy (activate_notes activ_elem transfer) (name, Morphism.identity)
+  end;
 
 
-(* propositions and bindings *)
-
-(* flatten (ctxt, prep_expr) ((ids, syn), expr)
-   normalises expr (which is either a locale
-   expression or a single context element) wrt.
-   to the list ids of already accumulated identifiers.
-   It returns ((ids', syn'), elemss) where ids' is an extension of ids
-   with identifiers generated for expr, and elemss is the list of
-   context elements generated from expr.
-   syn and syn' are symtabs mapping parameter names to their syntax.  syn'
-   is an extension of syn.
-   For details, see flatten_expr.
-
-   Additionally, for a locale expression, the elems are grouped into a single
-   Int; individual context elements are marked Ext.  In this case, the
-   identifier-like information of the element is as follows:
-   - for Fixes: (("", ps), []) where the ps have type info NONE
-   - for other elements: (("", []), []).
-   The implementation of activate_facts relies on identifier names being
-   empty strings for external elements.
-*)
-
-fun flatten (ctxt, _) ((ids, syn), Elem (Fixes fixes)) = let
-        val ids' = ids @ [(("", map (Binding.base_name o #1) fixes), ([], Assumed []))]
-      in
-        ((ids',
-         merge_syntax ctxt ids'
-           (syn, Symtab.make (map (fn fx => (Binding.base_name (#1 fx), #3 fx)) fixes))
-           handle Symtab.DUP x => err_in_locale ctxt
-             ("Conflicting syntax for parameter: " ^ quote x)
-             (map #1 ids')),
-         [((("", map (rpair NONE o Binding.base_name o #1) fixes), Assumed []), Ext (Fixes fixes))])
-      end
-  | flatten _ ((ids, syn), Elem elem) =
-      ((ids @ [(("", []), ([], Assumed []))], syn), [((("", []), Assumed []), Ext elem)])
-  | flatten (ctxt, prep_expr) ((ids, syn), Expr expr) =
-      apsnd (map (apsnd Int)) (flatten_expr ctxt ((ids, syn), prep_expr expr));
-
-local
-
-local
-
-fun declare_int_elem (Fixes fixes) ctxt =
-      ([], ctxt |> ProofContext.add_fixes_i (map (fn (x, T, mx) =>
-        (x, Option.map (Term.map_type_tfree (TypeInfer.param 0)) T, mx)) fixes) |> snd)
-  | declare_int_elem _ ctxt = ([], ctxt);
-
-fun declare_ext_elem prep_vars (Fixes fixes) ctxt =
-      let val (vars, _) = prep_vars fixes ctxt
-      in ([], ctxt |> ProofContext.add_fixes_i vars |> snd) end
-  | declare_ext_elem prep_vars (Constrains csts) ctxt =
-      let val (_, ctxt') = prep_vars (map (fn (x, T) => (Binding.name x, SOME T, NoSyn)) csts) ctxt
-      in ([], ctxt') end
-  | declare_ext_elem _ (Assumes asms) ctxt = (map #2 asms, ctxt)
-  | declare_ext_elem _ (Defines defs) ctxt = (map (fn (_, (t, ps)) => [(t, ps)]) defs, ctxt)
-  | declare_ext_elem _ (Notes _) ctxt = ([], ctxt);
-
-fun declare_elems prep_vars (((name, ps), Assumed _), elems) ctxt = ((case elems
-     of Int es => fold_map declare_int_elem es ctxt
-      | Ext e => declare_ext_elem prep_vars e ctxt |>> single)
-          handle ERROR msg => err_in_locale ctxt msg [(name, map fst ps)])
-  | declare_elems _ ((_, Derived _), elems) ctxt = ([], ctxt);
-
-in
-
-fun declare_elemss prep_vars fixed_params raw_elemss ctxt =
-  let
-    (* CB: fix of type bug of goal in target with context elements.
-       Parameters new in context elements must receive types that are
-       distinct from types of parameters in target (fixed_params).  *)
-    val ctxt_with_fixed = 
-      fold Variable.declare_term (map Free fixed_params) ctxt;
-    val int_elemss =
-      raw_elemss
-      |> map_filter (fn (id, Int es) => SOME (id, es) | _ => NONE)
-      |> unify_elemss ctxt_with_fixed fixed_params;
-    val (raw_elemss', _) =
-      fold_map (curry (fn ((id, Int _), (_, es) :: elemss) => ((id, Int es), elemss) | x => x))
-        raw_elemss int_elemss;
-  in fold_map (declare_elems prep_vars) raw_elemss' ctxt end;
-
-end;
+(** Public activation functions **)
 
 local
 
-val norm_term = Envir.beta_norm oo Term.subst_atomic;
-
-fun abstract_thm thy eq =
-  Thm.assume (Thm.cterm_of thy eq) |> Drule.gen_all |> Drule.abs_def;
-
-fun bind_def ctxt (name, ps) eq (xs, env, ths) =
-  let
-    val ((y, T), b) = LocalDefs.abs_def eq;
-    val b' = norm_term env b;
-    val th = abstract_thm (ProofContext.theory_of ctxt) eq;
-    fun err msg = err_in_locale ctxt (msg ^ ": " ^ quote y) [(name, map fst ps)];
-  in
-    exists (fn (x, _) => x = y) xs andalso
-      err "Attempt to define previously specified variable";
-    exists (fn (Free (y', _), _) => y = y' | _ => false) env andalso
-      err "Attempt to redefine variable";
-    (Term.add_frees b' xs, (Free (y, T), b') :: env, th :: ths)
-  end;
-
-
-(* CB: for finish_elems (Int and Ext),
-   extracts specification, only of assumed elements *)
-
-fun eval_text _ _ _ (Fixes _) text = text
-  | eval_text _ _ _ (Constrains _) text = text
-  | eval_text _ (_, Assumed _) is_ext (Assumes asms)
-        (((exts, exts'), (ints, ints')), (xs, env, defs)) =
+fun init_global_elem (Notes (kind, facts)) thy =
       let
-        val ts = maps (map #1 o #2) asms;
-        val ts' = map (norm_term env) ts;
-        val spec' =
-          if is_ext then ((exts @ ts, exts' @ ts'), (ints, ints'))
-          else ((exts, exts'), (ints @ ts, ints' @ ts'));
-      in (spec', (fold Term.add_frees ts' xs, env, defs)) end
-  | eval_text _ (_, Derived _) _ (Assumes _) text = text
-  | eval_text ctxt (id, Assumed _) _ (Defines defs) (spec, binds) =
-      (spec, fold (bind_def ctxt id o #1 o #2) defs binds)
-  | eval_text _ (_, Derived _) _ (Defines _) text = text
-  | eval_text _ _ _ (Notes _) text = text;
-
-
-(* for finish_elems (Int),
-   remove redundant elements of derived identifiers,
-   turn assumptions and definitions into facts,
-   satisfy hypotheses of facts *)
-
-fun finish_derived _ _ (Assumed _) (Fixes fixes) = SOME (Fixes fixes)
-  | finish_derived _ _ (Assumed _) (Constrains csts) = SOME (Constrains csts)
-  | finish_derived _ _ (Assumed _) (Assumes asms) = SOME (Assumes asms)
-  | finish_derived _ _ (Assumed _) (Defines defs) = SOME (Defines defs)
+        val facts' = Attrib.map_facts (Attrib.attribute_i thy) facts
+      in Old_Locale.global_note_qualified kind facts' thy |> snd end
 
-  | finish_derived _ _ (Derived _) (Fixes _) = NONE
-  | finish_derived _ _ (Derived _) (Constrains _) = NONE
-  | finish_derived sign satisfy (Derived _) (Assumes asms) = asms
-      |> map (apsnd (map (fn (a, _) => ([Thm.assume (cterm_of sign a)], []))))
-      |> pair Thm.assumptionK |> Notes
-      |> Element.morph_ctxt satisfy |> SOME
-  | finish_derived sign satisfy (Derived _) (Defines defs) = defs
-      |> map (apsnd (fn (d, _) => [([Thm.assume (cterm_of sign d)], [])]))
-      |> pair Thm.definitionK |> Notes
-      |> Element.morph_ctxt satisfy |> SOME
-
-  | finish_derived _ satisfy _ (Notes facts) = Notes facts
-      |> Element.morph_ctxt satisfy |> SOME;
-
-(* CB: for finish_elems (Ext) *)
-
-fun closeup _ false elem = elem
-  | closeup ctxt true elem =
+fun init_local_elem (Fixes fixes) ctxt = ctxt |>
+      ProofContext.add_fixes_i fixes |> snd
+  | init_local_elem (Assumes assms) ctxt =
       let
-        fun close_frees t =
-          let
-            val rev_frees =
-              Term.fold_aterms (fn Free (x, T) =>
-                if Variable.is_fixed ctxt x then I else insert (op =) (x, T) | _ => I) t [];
-          in Term.list_all_free (rev rev_frees, t) end;
-
-        fun no_binds [] = []
-          | no_binds _ = error "Illegal term bindings in locale element";
+        val assms' = Attrib.map_specs (Attrib.attribute_i (ProofContext.theory_of ctxt)) assms
       in
-        (case elem of
-          Assumes asms => Assumes (asms |> map (fn (a, propps) =>
-            (a, map (fn (t, ps) => (close_frees t, no_binds ps)) propps)))
-        | Defines defs => Defines (defs |> map (fn (a, (t, ps)) =>
-            (a, (close_frees (#2 (LocalDefs.cert_def ctxt t)), no_binds ps))))
-        | e => e)
-      end;
-
-
-fun finish_ext_elem parms _ (Fixes fixes, _) = Fixes (map (fn (b, _, mx) =>
-      let val x = Binding.base_name b
-      in (b, AList.lookup (op =) parms x, mx) end) fixes)
-  | finish_ext_elem parms _ (Constrains _, _) = Constrains []
-  | finish_ext_elem _ close (Assumes asms, propp) =
-      close (Assumes (map #1 asms ~~ propp))
-  | finish_ext_elem _ close (Defines defs, propp) =
-      close (Defines (map #1 defs ~~ map (fn [(t, ps)] => (t, ps)) propp))
-  | finish_ext_elem _ _ (Notes facts, _) = Notes facts;
-
+        ctxt |> fold Variable.auto_fixes (maps (map fst o snd) assms') |>
+          ProofContext.add_assms_i Assumption.assume_export assms' |> snd
+     end
+  | init_local_elem (Defines defs) ctxt =
+      let
+        val defs' = Attrib.map_specs (Attrib.attribute_i (ProofContext.theory_of ctxt)) defs
+      in
+        ctxt |> fold Variable.auto_fixes (map (fst o snd) defs') |>
+          ProofContext.add_assms_i LocalDefs.def_export (map (fn (attn, t) => (attn, [t])) defs') |>
+          snd
+      end
+  | init_local_elem (Notes (kind, facts)) ctxt =
+      let
+        val facts' = Attrib.map_facts (Attrib.attribute_i (ProofContext.theory_of ctxt)) facts
+      in Old_Locale.local_note_qualified kind facts' ctxt |> snd end
 
-(* CB: finish_parms introduces type info from parms to identifiers *)
-(* CB: only needed for types that have been NONE so far???
-   If so, which are these??? *)
-
-fun finish_parms parms (((name, ps), mode), elems) =
-  (((name, map (fn (x, _) => (x, AList.lookup (op = : string * string -> bool) parms x)) ps), mode), elems);
-
-fun finish_elems ctxt parms _ ((text, wits), ((id, Int e), _)) =
-      let
-        val [(id' as (_, mode), es)] = unify_elemss ctxt parms [(id, e)];
-        val wits' = case mode of Assumed _ => wits | Derived ths => wits @ ths;
-        val text' = fold (eval_text ctxt id' false) es text;
-        val es' = map_filter
-          (finish_derived (ProofContext.theory_of ctxt) (Element.satisfy_morphism wits') mode) es;
-      in ((text', wits'), (id', map Int es')) end
-  | finish_elems ctxt parms do_close ((text, wits), ((id, Ext e), [propp])) =
-      let
-        val e' = finish_ext_elem parms (closeup ctxt do_close) (e, propp);
-        val text' = eval_text ctxt id true e' text;
-      in ((text', wits), (id, [Ext e'])) end
+fun cons_elem false (Notes notes) elems = elems
+  | cons_elem _ elem elems = elem :: elems
 
 in
 
-(* CB: only called by prep_elemss *)
+fun activate_declarations thy dep ctxt =
+  roundup thy activate_decls dep (get_local_idents ctxt, ctxt) |> uncurry put_local_idents;
+
+fun activate_global_facts dep thy =
+  roundup thy (activate_notes init_global_elem Element.transfer_morphism)
+    dep (get_global_idents thy, thy) |>
+  uncurry put_global_idents;
+
+fun activate_local_facts dep ctxt =
+  roundup (ProofContext.theory_of ctxt)
+  (activate_notes init_local_elem (Element.transfer_morphism o ProofContext.theory_of)) dep
+    (get_local_idents ctxt, ctxt) |>
+  uncurry put_local_idents;
 
-fun finish_elemss ctxt parms do_close =
-  foldl_map (apsnd (finish_parms parms) o finish_elems ctxt parms do_close);
+fun init name thy =
+  activate_all name thy init_local_elem (Element.transfer_morphism o ProofContext.theory_of)
+    (empty, ProofContext.init thy) |>
+  uncurry put_local_idents;
+
+fun print_locale thy show_facts name =
+  let
+    val name' = intern thy name;
+    val ctxt = init name' thy
+  in
+    Pretty.big_list "locale elements:"
+      (activate_all name' thy (cons_elem show_facts) (K (Element.transfer_morphism thy))
+        (empty, []) |> snd |> rev |>
+        map (Element.pretty_ctxt ctxt) |> map Pretty.chunks) |> Pretty.writeln
+  end
 
 end;
 
 
-(* Remove duplicate Defines elements: temporary workaround to fix Afp/Category. *)
-
-fun defs_ord (defs1, defs2) =
-    list_ord (fn ((_, (d1, _)), (_, (d2, _))) =>
-      TermOrd.fast_term_ord (d1, d2)) (defs1, defs2);
-structure Defstab =
-    TableFun(type key = (Attrib.binding * (term * term list)) list val ord = defs_ord);
-
-fun rem_dup_defs es ds =
-    fold_map (fn e as (Defines defs) => (fn ds =>
-                 if Defstab.defined ds defs
-                 then (Defines [], ds)
-                 else (e, Defstab.update (defs, ()) ds))
-               | e => (fn ds => (e, ds))) es ds;
-fun rem_dup_elemss (Int es) ds = apfst Int (rem_dup_defs es ds)
-  | rem_dup_elemss (Ext e) ds = (Ext e, ds);
-fun rem_dup_defines raw_elemss =
-    fold_map (fn (id as (_, (Assumed _)), es) => (fn ds =>
-                     apfst (pair id) (rem_dup_elemss es ds))
-               | (id as (_, (Derived _)), es) => (fn ds =>
-                     ((id, es), ds))) raw_elemss Defstab.empty |> #1;
-
-(* CB: type inference and consistency checks for locales.
-
-   Works by building a context (through declare_elemss), extracting the
-   required information and adjusting the context elements (finish_elemss).
-   Can also universally close free vars in assms and defs.  This is only
-   needed for Ext elements and controlled by parameter do_close.
-
-   Only elements of assumed identifiers are considered.
-*)
+(*** Registrations: interpretations in theories ***)
 
-fun prep_elemss prep_vars prepp do_close context fixed_params raw_elemss raw_concl =
-  let
-    (* CB: contexts computed in the course of this function are discarded.
-       They are used for type inference and consistency checks only. *)
-    (* CB: fixed_params are the parameters (with types) of the target locale,
-       empty list if there is no target. *)
-    (* CB: raw_elemss are list of pairs consisting of identifiers and
-       context elements, the latter marked as internal or external. *)
-    val raw_elemss = rem_dup_defines raw_elemss;
-    val (raw_proppss, raw_ctxt) = declare_elemss prep_vars fixed_params raw_elemss context;
-    (* CB: raw_ctxt is context with additional fixed variables derived from
-       the fixes elements in raw_elemss,
-       raw_proppss contains assumptions and definitions from the
-       external elements in raw_elemss. *)
-    fun prep_prop raw_propp (raw_ctxt, raw_concl)  =
-      let
-        (* CB: add type information from fixed_params to context (declare_term) *)
-        (* CB: process patterns (conclusion and external elements only) *)
-        val (ctxt, all_propp) =
-          prepp (fold Variable.declare_term (map Free fixed_params) raw_ctxt, raw_concl @ raw_propp);
-        (* CB: add type information from conclusion and external elements to context *)
-        val ctxt = fold Variable.declare_term (maps (map fst) all_propp) ctxt;
-        (* CB: resolve schematic variables (patterns) in conclusion and external elements. *)
-        val all_propp' = map2 (curry (op ~~))
-          (#1 (#2 (ProofContext.bind_propp_schematic_i (ctxt, all_propp)))) (map (map snd) all_propp);
-        val (concl, propp) = chop (length raw_concl) all_propp';
-      in (propp, (ctxt, concl)) end
+(* FIXME only global variant needed *)
+structure RegistrationsData = GenericDataFun
+(
+  type T = ((string * (Morphism.morphism * Morphism.morphism)) * stamp) list;
+(* FIXME mixins need to be stamped *)
+    (* registrations, in reverse order of declaration *)
+  val empty = [];
+  val extend = I;
+  fun merge _ data : T = Library.merge (eq_snd op =) data;
+    (* FIXME consolidate with dependencies, consider one data slot only *)
+);
 
-    val (proppss, (ctxt, concl)) =
-      (fold_burrow o fold_burrow) prep_prop raw_proppss (raw_ctxt, raw_concl);
-
-    (* CB: obtain all parameters from identifier part of raw_elemss *)
-    val xs = map #1 (params_of' raw_elemss);
-    val typing = unify_frozen ctxt 0
-      (map (Variable.default_type raw_ctxt) xs)
-      (map (Variable.default_type ctxt) xs);
-    val parms = param_types (xs ~~ typing);
-    (* CB: parms are the parameters from raw_elemss, with correct typing. *)
+val get_global_registrations =
+  Context.Theory #> RegistrationsData.get #> map fst #> map (apsnd op $>);
 
-    (* CB: extract information from assumes and defines elements
-       (fixes, constrains and notes in raw_elemss don't have an effect on
-       text and elemss), compute final form of context elements. *)
-    val ((text, _), elemss) = finish_elemss ctxt parms do_close
-      ((((([], []), ([], [])), ([], [], [])), []), raw_elemss ~~ proppss);
-    (* CB: text has the following structure:
-           (((exts, exts'), (ints, ints')), (xs, env, defs))
-       where
-         exts: external assumptions (terms in external assumes elements)
-         exts': dito, normalised wrt. env
-         ints: internal assumptions (terms in internal assumes elements)
-         ints': dito, normalised wrt. env
-         xs: the free variables in exts' and ints' and rhss of definitions,
-           this includes parameters except defined parameters
-         env: list of term pairs encoding substitutions, where the first term
-           is a free variable; substitutions represent defines elements and
-           the rhs is normalised wrt. the previous env
-         defs: theorems representing the substitutions from defines elements
-           (thms are normalised wrt. env).
-       elemss is an updated version of raw_elemss:
-         - type info added to Fixes and modified in Constrains
-         - axiom and definition statement replaced by corresponding one
-           from proppss in Assumes and Defines
-         - Facts unchanged
-       *)
-  in ((parms, elemss, concl), text) end;
+fun add_global reg =
+  (Context.theory_map o RegistrationsData.map) (cons (reg, stamp ()));
 
-in
-
-fun read_elemss x = prep_elemss ProofContext.read_vars ProofContext.read_propp_schematic x;
-fun cert_elemss x = prep_elemss ProofContext.cert_vars ProofContext.cert_propp_schematic x;
-
-end;
-
+fun add_global_registration (name, (base_morph, export)) thy =
+  roundup thy (fn _ => fn (name', morph') => fn thy => add_global (name', (morph', export)) thy)
+    (name, base_morph) (get_global_idents thy, thy) |>
+    snd (* FIXME ?? uncurry put_global_idents *);
 
-(* facts and attributes *)
-
-local
-
-fun check_name name =
-  if NameSpace.is_qualified name then error ("Illegal qualified name: " ^ quote name)
-  else name;
-
-fun prep_facts _ _ _ ctxt (Int elem) = elem
-      |> Element.morph_ctxt (Morphism.thm_morphism (Thm.transfer (ProofContext.theory_of ctxt)))
-  | prep_facts prep_name get intern ctxt (Ext elem) = elem |> Element.map_ctxt
-     {var = I, typ = I, term = I,
-      binding = Binding.map_base prep_name,
-      fact = get ctxt,
-      attrib = Args.assignable o intern (ProofContext.theory_of ctxt)};
-
-in
-
-fun read_facts x = prep_facts check_name ProofContext.get_fact Attrib.intern_src x;
-fun cert_facts x = prep_facts I (K I) (K I) x;
-
-end;
-
-
-(* Get the specification of a locale *)
-
-(*The global specification is made from the parameters and global
-  assumptions, the local specification from the parameters and the
-  local assumptions.*)
-
-local
-
-fun gen_asms_of get thy name =
+fun amend_global_registration morph (name, base_morph) thy =
   let
-    val ctxt = ProofContext.init thy;
-    val (_, raw_elemss) = flatten (ctxt, I) (([], Symtab.empty), Expr (Locale name));
-    val ((_, elemss, _), _) = read_elemss false ctxt [] raw_elemss [];
+    val regs = (Context.Theory #> RegistrationsData.get #> map fst) thy;
+    val base = instance_of thy name base_morph;
+    fun match (name', (morph', _)) =
+      name = name' andalso eq_list (op aconv) (base, instance_of thy name' morph');
+    val i = find_index match (rev regs);
+    val _ = if i = ~1 then error ("No interpretation of locale " ^
+        quote (extern thy name) ^ " and parameter instantiation " ^
+        space_implode " " (map (quote o Syntax.string_of_term_global thy) base) ^ " available.")
+      else ();
   in
-    elemss |> get
-      |> maps (fn (_, es) => map (fn Int e => e) es)
-      |> maps (fn Assumes asms => asms | _ => [])
-      |> map (apsnd (map fst))
-  end;
-
-in
-
-fun parameters_of thy = #params o the_locale thy;
-
-fun intros thy = #intros o the_locale thy;
-  (*returns introduction rule for delta predicate and locale predicate
-    as a pair of singleton lists*)
-
-fun dests thy = #dests o the_locale thy;
-
-fun facts_of thy = map_filter (fn (Element.Notes (_, facts), _) => SOME facts
-  | _ => NONE) o #elems o the_locale thy;
-
-fun parameters_of_expr thy expr =
-  let
-    val ctxt = ProofContext.init thy;
-    val pts = params_of_expr ctxt [] (intern_expr thy expr)
-        ([], Symtab.empty, Symtab.empty);
-    val raw_params_elemss = make_raw_params_elemss pts;
-    val ((_, syn), raw_elemss) = flatten (ctxt, intern_expr thy)
-        (([], Symtab.empty), Expr expr);
-    val ((parms, _, _), _) =
-        read_elemss false ctxt [] (raw_params_elemss @ raw_elemss) [];
-  in map (fn p as (n, _) => (p, Symtab.lookup syn n |> the)) parms end;
-
-fun local_asms_of thy name =
-  gen_asms_of (single o Library.last_elem) thy name;
-
-fun global_asms_of thy name =
-  gen_asms_of I thy name;
-
-end;
-
-
-(* full context statements: imports + elements + conclusion *)
-
-local
-
-fun prep_context_statement prep_expr prep_elemss prep_facts
-    do_close fixed_params imports elements raw_concl context =
-  let
-    val thy = ProofContext.theory_of context;
-
-    val (import_params, import_tenv, import_syn) =
-      params_of_expr context fixed_params (prep_expr thy imports)
-        ([], Symtab.empty, Symtab.empty);
-    val includes = map_filter (fn Expr e => SOME e | Elem _ => NONE) elements;
-    val (incl_params, incl_tenv, incl_syn) = fold (params_of_expr context fixed_params)
-      (map (prep_expr thy) includes) (import_params, import_tenv, import_syn);
-
-    val ((import_ids, _), raw_import_elemss) =
-      flatten (context, prep_expr thy) (([], Symtab.empty), Expr imports);
-    (* CB: normalise "includes" among elements *)
-    val ((ids, syn), raw_elemsss) = foldl_map (flatten (context, prep_expr thy))
-      ((import_ids, incl_syn), elements);
-
-    val raw_elemss = flat raw_elemsss;
-    (* CB: raw_import_elemss @ raw_elemss is the normalised list of
-       context elements obtained from import and elements. *)
-    (* Now additional elements for parameters are inserted. *)
-    val import_params_ids = make_params_ids import_params;
-    val incl_params_ids =
-        make_params_ids (incl_params \\ import_params);
-    val raw_import_params_elemss =
-        make_raw_params_elemss (import_params, incl_tenv, incl_syn);
-    val raw_incl_params_elemss =
-        make_raw_params_elemss (incl_params \\ import_params, incl_tenv, incl_syn);
-    val ((parms, all_elemss, concl), (spec, (_, _, defs))) = prep_elemss do_close
-      context fixed_params
-      (raw_import_params_elemss @ raw_import_elemss @ raw_incl_params_elemss @ raw_elemss) raw_concl;
-
-    (* replace extended ids (for axioms) by ids *)
-    val (import_ids', incl_ids) = chop (length import_ids) ids;
-    val all_ids = import_params_ids @ import_ids' @ incl_params_ids @ incl_ids;
-    val all_elemss' = map (fn (((_, ps), _), (((n, ps'), mode), elems)) =>
-        (((n, map (fn p => (p, (the o AList.lookup (op =) ps') p)) ps), mode), elems))
-      (all_ids ~~ all_elemss);
-    (* CB: all_elemss and parms contain the correct parameter types *)
-
-    val (ps, qs) = chop (length raw_import_params_elemss + length raw_import_elemss) all_elemss';
-    val ((import_elemss, _), import_ctxt) =
-      activate_facts false prep_facts ps context;
-
-    val ((elemss, _), ctxt) =
-      activate_facts false prep_facts qs (ProofContext.set_stmt true import_ctxt);
-  in
-    ((((import_ctxt, import_elemss), (ctxt, elemss, syn)),
-      (parms, spec, defs)), concl)
-  end;
-
-fun prep_statement prep_locale prep_ctxt raw_locale elems concl ctxt =
-  let
-    val thy = ProofContext.theory_of ctxt;
-    val locale = Option.map (prep_locale thy) raw_locale;
-    val (fixed_params, imports) =
-      (case locale of
-        NONE => ([], empty)
-      | SOME name =>
-          let val {params = ps, ...} = the_locale thy name
-          in (map fst ps, Locale name) end);
-    val ((((locale_ctxt, _), (elems_ctxt, _, _)), _), concl') =
-      prep_ctxt false fixed_params imports (map Elem elems) concl ctxt;
-  in (locale, locale_ctxt, elems_ctxt, concl') end;
-
-fun prep_expr prep imports body ctxt =
-  let
-    val (((_, import_elemss), (ctxt', elemss, _)), _) = prep imports body ctxt;
-    val all_elems = maps snd (import_elemss @ elemss);
-  in (all_elems, ctxt') end;
-
-in
-
-val read_ctxt = prep_context_statement intern_expr read_elemss read_facts;
-val cert_ctxt = prep_context_statement (K I) cert_elemss cert_facts;
-
-fun read_context imports body ctxt = #1 (read_ctxt true [] imports (map Elem body) [] ctxt);
-fun cert_context imports body ctxt = #1 (cert_ctxt true [] imports (map Elem body) [] ctxt);
-
-val read_expr = prep_expr read_context;
-val cert_expr = prep_expr cert_context;
-
-fun read_context_statement loc = prep_statement (K I) read_ctxt loc;
-fun read_context_statement_cmd loc = prep_statement intern read_ctxt loc;
-fun cert_context_statement loc = prep_statement (K I) cert_ctxt loc;
-
-end;
-
-
-(* init *)
-
-fun init loc =
-  ProofContext.init
-  #> #2 o cert_context_statement (SOME loc) [] [];
-
-
-(* print locale *)
-
-fun print_locale thy show_facts imports body =
-  let val (all_elems, ctxt) = read_expr imports body (ProofContext.init thy) in
-    Pretty.big_list "locale elements:" (all_elems
-      |> (if show_facts then I else filter (fn Notes _ => false | _ => true))
-      |> map (Element.pretty_ctxt ctxt) |> filter_out null
-      |> map Pretty.chunks)
-    |> Pretty.writeln
+    (Context.theory_map o RegistrationsData.map) (nth_map (length regs - 1 - i)
+      (fn ((name, (base, export)), stamp) => ((name, (base $> morph, export)), stamp))) thy
   end;
 
 
-
-(** store results **)
-
-(* join equations of an id with already accumulated ones *)
-
-fun join_eqns get_reg id eqns =
-  let
-    val eqns' = case get_reg id
-      of NONE => eqns
-        | SOME (_, _, eqns') => Termtab.join (fn _ => fn (_, e) => e) (eqns, eqns')
-            (* prefer equations from eqns' *)
-  in ((id, eqns'), eqns') end;
-
-
-(* collect witnesses and equations up to a particular target for a
-   registration; requires parameters and flattened list of identifiers
-   instead of recomputing it from the target *)
-
-fun collect_witnesses ctxt (imprt as ((impT, _), (imp, _))) parms ids ext_ts = let
-
-    val thy = ProofContext.theory_of ctxt;
-
-    val ts = map (var_inst_term (impT, imp)) ext_ts;
-    val (parms, parmTs) = split_list parms;
-    val parmvTs = map Logic.varifyT parmTs;
-    val vtinst = fold (Sign.typ_match thy) (parmvTs ~~ map Term.fastype_of ts) Vartab.empty;
-    val tinst = Vartab.dest vtinst |> map (fn ((x, 0), (_, T)) => (x, T))
-        |> Symtab.make;
-    val inst = Symtab.make (parms ~~ ts);
-
-    (* instantiate parameter names in ids *)
-    val ext_inst = Symtab.make (parms ~~ ext_ts);
-    fun ext_inst_names ps = map (the o Symtab.lookup ext_inst) ps;
-    val inst_ids = map (apfst (apsnd ext_inst_names)) ids;
-    val assumed_ids = map_filter (fn (id, (_, Assumed _)) => SOME id | _ => NONE) inst_ids;
-    val wits = maps (#2 o the o get_local_registration ctxt imprt) assumed_ids;
-    val eqns =
-      fold_map (join_eqns (get_local_registration ctxt imprt))
-        (map fst inst_ids) Termtab.empty |> snd |> Termtab.dest |> map snd;
-  in ((tinst, inst), wits, eqns) end;
-
-
-(* compute and apply morphism *)
-
-fun name_morph phi_name (lprfx, pprfx) b =
-  b
-  |> (if not (Binding.is_empty b) andalso pprfx <> ""
-        then Binding.add_prefix false pprfx else I)
-  |> (if not (Binding.is_empty b)
-        then Binding.add_prefix false lprfx else I)
-  |> phi_name;
+(*** Storing results ***)
 
-fun inst_morph thy phi_name param_prfx insts prems eqns export =
-  let
-    (* standardise export morphism *)
-    val exp_fact = Drule.zero_var_indexes_list o map Thm.strip_shyps o Morphism.fact export;
-    val exp_term = TermSubst.zero_var_indexes o Morphism.term export;
-      (* FIXME sync with exp_fact *)
-    val exp_typ = Logic.type_map exp_term;
-    val export' =
-      Morphism.morphism {binding = I, var = I, typ = exp_typ, term = exp_term, fact = exp_fact};
-  in
-    Morphism.binding_morphism (name_morph phi_name param_prfx) $>
-      Element.inst_morphism thy insts $>
-      Element.satisfy_morphism prems $>
-      Morphism.term_morphism (MetaSimplifier.rewrite_term thy eqns []) $>
-      Morphism.thm_morphism (MetaSimplifier.rewrite_rule eqns) $>
-      export'
-  end;
-
-fun activate_note thy phi_name param_prfx attrib insts prems eqns exp =
-  (Element.facts_map o Element.morph_ctxt)
-      (inst_morph thy phi_name param_prfx insts prems eqns exp)
-  #> Attrib.map_facts attrib;
-
-
-(* public interface to interpretation morphism *)
-
-fun get_interpret_morph thy phi_name param_prfx (exp, imp) target ext_ts =
-  let
-    val parms = the_locale thy target |> #params |> map fst;
-    val ids = flatten (ProofContext.init thy, intern_expr thy)
-      (([], Symtab.empty), Expr (Locale target)) |> fst |> fst;
-    val (insts, prems, eqns) = collect_witnesses (ProofContext.init thy) imp parms ids ext_ts;
-  in
-    inst_morph thy phi_name param_prfx insts prems eqns exp
-  end;
-
-(* store instantiations of args for all registered interpretations
-   of the theory *)
-
-fun note_thmss_registrations target (kind, args) thy =
-  let
-    val parms = the_locale thy target |> #params |> map fst;
-    val ids = flatten (ProofContext.init thy, intern_expr thy)
-      (([], Symtab.empty), Expr (Locale target)) |> fst |> fst;
-
-    val regs = get_global_registrations thy target;
-    (* add args to thy for all registrations *)
-
-    fun activate (ext_ts, ((phi_name, param_prfx), (exp, imp), _, _)) thy =
-      let
-        val (insts, prems, eqns) = collect_witnesses (ProofContext.init thy) imp parms ids ext_ts;
-        val args' = args
-          |> activate_note thy phi_name param_prfx
-               (Attrib.attribute_i thy) insts prems eqns exp;
-      in
-        thy
-        |> global_note_qualified kind args'
-        |> snd
-      end;
-  in fold activate regs thy end;
-
-
-(* locale results *)
+(* Theorems *)
 
 fun add_thmss loc kind args ctxt =
   let
-    val (([(_, [Notes args'])], _), ctxt') =
-      activate_facts true cert_facts
-        [((("", []), Assumed []), [Ext (Notes (kind, args))])] ctxt;
-    val ctxt'' = ctxt' |> ProofContext.theory
-      (change_locale loc
-        (fn (axiom, elems, params, decls, regs, intros, dests) =>
-          (axiom, elems @ [(Notes args', stamp ())],
-            params, decls, regs, intros, dests))
-      #> note_thmss_registrations loc args');
+    val ([Notes args'], ctxt') = Element.activate_i [Notes (kind, args)] ctxt;
+    val ctxt'' = ctxt' |> ProofContext.theory (
+      change_locale loc
+        (fn (parameters, spec, decls, notes, dependencies) =>
+          (parameters, spec, decls, (args', stamp ()) :: notes, dependencies)) #>
+      (* Registrations *)
+      (fn thy => fold_rev (fn (name, morph) =>
+            let
+              val args'' = snd args' |> Element.facts_map (Element.morph_ctxt morph) |>
+                Attrib.map_facts (Attrib.attribute_i thy)
+            in Old_Locale.global_note_qualified kind args'' #> snd end)
+        (get_global_registrations thy |> filter (fn (name, _) => name = loc)) thy))
   in ctxt'' end;
 
 
-(* declarations *)
+(* Declarations *)
 
 local
 
@@ -1728,8 +477,8 @@
 
 fun add_decls add loc decl =
   ProofContext.theory (change_locale loc
-    (fn (axiom, elems, params, decls, regs, intros, dests) =>
-      (axiom, elems, params, add (decl, stamp ()) decls, regs, intros, dests))) #>
+    (fn (parameters, spec, decls, notes, dependencies) =>
+      (parameters, spec, add (decl, stamp ()) decls, notes, dependencies))) #>
   add_thmss loc Thm.internalK
     [((Binding.empty, [Attrib.internal (decl_attrib decl)]), [([Drule.dummy_thm], [])])];
 
@@ -1739,747 +488,44 @@
 val add_term_syntax = add_decls (apsnd o cons);
 val add_declaration = add_decls (K I);
 
-fun declarations_of thy loc =
-  the_locale thy loc |> #decls |> apfst (map fst) |> apsnd (map fst);
-
 end;
 
+(* Dependencies *)
+
+fun add_dependency loc dep =
+  change_locale loc
+    (fn (parameters, spec, decls, notes, dependencies) =>
+      (parameters, spec, decls, notes, (dep, stamp ()) :: dependencies));
 
 
-(** define locales **)
-
-(* predicate text *)
-(* CB: generate locale predicates and delta predicates *)
-
-local
-
-(* introN: name of theorems for introduction rules of locale and
-     delta predicates;
-   axiomsN: name of theorem set with destruct rules for locale predicates,
-     also name suffix of delta predicates. *)
-
-val introN = "intro";
-val axiomsN = "axioms";
-
-fun atomize_spec thy ts =
-  let
-    val t = Logic.mk_conjunction_balanced ts;
-    val body = ObjectLogic.atomize_term thy t;
-    val bodyT = Term.fastype_of body;
-  in
-    if bodyT = propT then (t, propT, Thm.reflexive (Thm.cterm_of thy t))
-    else (body, bodyT, ObjectLogic.atomize (Thm.cterm_of thy t))
-  end;
+(*** Reasoning about locales ***)
 
-fun aprop_tr' n c = (Syntax.constN ^ c, fn ctxt => fn args =>
-  if length args = n then
-    Syntax.const "_aprop" $
-      Term.list_comb (Syntax.free (Consts.extern (ProofContext.consts_of ctxt) c), args)
-  else raise Match);
-
-(* CB: define one predicate including its intro rule and axioms
-   - bname: predicate name
-   - parms: locale parameters
-   - defs: thms representing substitutions from defines elements
-   - ts: terms representing locale assumptions (not normalised wrt. defs)
-   - norm_ts: terms representing locale assumptions (normalised wrt. defs)
-   - thy: the theory
-*)
-
-fun def_pred bname parms defs ts norm_ts thy =
-  let
-    val name = Sign.full_bname thy bname;
-
-    val (body, bodyT, body_eq) = atomize_spec thy norm_ts;
-    val env = Term.add_free_names body [];
-    val xs = filter (member (op =) env o #1) parms;
-    val Ts = map #2 xs;
-    val extraTs =
-      (Term.add_tfrees body [] \\ fold Term.add_tfreesT Ts [])
-      |> Library.sort_wrt #1 |> map TFree;
-    val predT = map Term.itselfT extraTs ---> Ts ---> bodyT;
-
-    val args = map Logic.mk_type extraTs @ map Free xs;
-    val head = Term.list_comb (Const (name, predT), args);
-    val statement = ObjectLogic.ensure_propT thy head;
+(** Storage for witnesses, intro and unfold rules **)
 
-    val ([pred_def], defs_thy) =
-      thy
-      |> bodyT = propT ? Sign.add_advanced_trfuns ([], [], [aprop_tr' (length args) name], [])
-      |> Sign.declare_const [] ((Binding.name bname, predT), NoSyn) |> snd
-      |> PureThy.add_defs false
-        [((Thm.def_name bname, Logic.mk_equals (head, body)), [Thm.kind_internal])];
-    val defs_ctxt = ProofContext.init defs_thy |> Variable.declare_term head;
-
-    val cert = Thm.cterm_of defs_thy;
-
-    val intro = Goal.prove_global defs_thy [] norm_ts statement (fn _ =>
-      MetaSimplifier.rewrite_goals_tac [pred_def] THEN
-      Tactic.compose_tac (false, body_eq RS Drule.equal_elim_rule1, 1) 1 THEN
-      Tactic.compose_tac (false,
-        Conjunction.intr_balanced (map (Thm.assume o cert) norm_ts), 0) 1);
-
-    val conjuncts =
-      (Drule.equal_elim_rule2 OF [body_eq,
-        MetaSimplifier.rewrite_rule [pred_def] (Thm.assume (cert statement))])
-      |> Conjunction.elim_balanced (length ts);
-    val axioms = ts ~~ conjuncts |> map (fn (t, ax) =>
-      Element.prove_witness defs_ctxt t
-       (MetaSimplifier.rewrite_goals_tac defs THEN
-        Tactic.compose_tac (false, ax, 0) 1));
-  in ((statement, intro, axioms), defs_thy) end;
-
-fun assumes_to_notes (Assumes asms) axms =
-      fold_map (fn (a, spec) => fn axs =>
-          let val (ps, qs) = chop (length spec) axs
-          in ((a, [(ps, [])]), qs) end) asms axms
-      |> apfst (curry Notes Thm.assumptionK)
-  | assumes_to_notes e axms = (e, axms);
-
-(* CB: the following two change only "new" elems, these have identifier ("", _). *)
-
-(* turn Assumes into Notes elements *)
-
-fun change_assumes_elemss axioms elemss =
-  let
-    val satisfy = Element.morph_ctxt (Element.satisfy_morphism axioms);
-    fun change (id as ("", _), es) =
-          fold_map assumes_to_notes (map satisfy es)
-          #-> (fn es' => pair (id, es'))
-      | change e = pair e;
-  in
-    fst (fold_map change elemss (map Element.conclude_witness axioms))
-  end;
-
-(* adjust hyps of Notes elements *)
-
-fun change_elemss_hyps axioms elemss =
-  let
-    val satisfy = Element.morph_ctxt (Element.satisfy_morphism axioms);
-    fun change (id as ("", _), es) = (id, map (fn e as Notes _ => satisfy e | e => e) es)
-      | change e = e;
-  in map change elemss end;
-
-in
-
-(* CB: main predicate definition function *)
+structure Witnesses = ThmsFun();
+structure Intros = ThmsFun();
+structure Unfolds = ThmsFun();
 
-fun define_preds pname (parms, ((exts, exts'), (ints, ints')), defs) elemss thy =
-  let
-    val ((elemss', more_ts), a_elem, a_intro, thy'') =
-      if null exts then ((elemss, []), [], [], thy)
-      else
-        let
-          val aname = if null ints then pname else pname ^ "_" ^ axiomsN;
-          val ((statement, intro, axioms), thy') =
-            thy
-            |> def_pred aname parms defs exts exts';
-          val elemss' = change_assumes_elemss axioms elemss;
-          val a_elem = [(("", []),
-            [Assumes [((Binding.name (pname ^ "_" ^ axiomsN), []), [(statement, [])])]])];
-          val (_, thy'') =
-            thy'
-            |> Sign.add_path aname
-            |> Sign.no_base_names
-            |> PureThy.note_thmss Thm.internalK [((Binding.name introN, []), [([intro], [])])]
-            ||> Sign.restore_naming thy';
-        in ((elemss', [statement]), a_elem, [intro], thy'') end;
-    val (predicate, stmt', elemss'', b_intro, thy'''') =
-      if null ints then (([], []), more_ts, elemss' @ a_elem, [], thy'')
-      else
-        let
-          val ((statement, intro, axioms), thy''') =
-            thy''
-            |> def_pred pname parms defs (ints @ more_ts) (ints' @ more_ts);
-          val cstatement = Thm.cterm_of thy''' statement;
-          val elemss'' = change_elemss_hyps axioms elemss';
-          val b_elem = [(("", []),
-               [Assumes [((Binding.name (pname ^ "_" ^ axiomsN), []), [(statement, [])])]])];
-          val (_, thy'''') =
-            thy'''
-            |> Sign.add_path pname
-            |> Sign.no_base_names
-            |> PureThy.note_thmss Thm.internalK
-                 [((Binding.name introN, []), [([intro], [])]),
-                  ((Binding.name axiomsN, []),
-                    [(map (Drule.standard o Element.conclude_witness) axioms, [])])]
-            ||> Sign.restore_naming thy''';
-        in (([cstatement], axioms), [statement], elemss'' @ b_elem, [intro], thy'''') end;
-  in (((elemss'', predicate, stmt'), (a_intro, b_intro)), thy'''') end;
-
-end;
-
-
-(* add_locale(_i) *)
-
-local
-
-(* turn Defines into Notes elements, accumulate definition terms *)
-
-fun defines_to_notes is_ext thy (Defines defs) defns =
-    let
-      val defs' = map (fn (_, (def, _)) => (Attrib.empty_binding, (def, []))) defs
-      val notes = map (fn (a, (def, _)) =>
-        (a, [([assume (cterm_of thy def)], [])])) defs
-    in
-      (if is_ext then SOME (Notes (Thm.definitionK, notes)) else NONE, defns @ [Defines defs'])
-    end
-  | defines_to_notes _ _ e defns = (SOME e, defns);
-
-fun change_defines_elemss thy elemss defns =
-  let
-    fun change (id as (n, _), es) defns =
-        let
-          val (es', defns') = fold_map (defines_to_notes (n="") thy) es defns
-        in ((id, map_filter I es'), defns') end
-  in fold_map change elemss defns end;
+val witness_attrib = Witnesses.add;
+val intro_attrib = Intros.add;
+val unfold_attrib = Unfolds.add;
 
-fun gen_add_locale prep_ctxt prep_expr
-    predicate_name bname raw_imports raw_body thy =
-    (* predicate_name: "" - locale with predicate named as locale
-        "name" - locale with predicate named "name" *)
-  let
-    val thy_ctxt = ProofContext.init thy;
-    val name = Sign.full_bname thy bname;
-    val _ = is_some (get_locale thy name) andalso
-      error ("Duplicate definition of locale " ^ quote name);
-
-    val (((import_ctxt, import_elemss), (body_ctxt, body_elemss, syn)),
-      text as (parms, ((_, exts'), _), defs)) =
-        prep_ctxt raw_imports raw_body thy_ctxt;
-    val elemss = import_elemss @ body_elemss |>
-      map_filter (fn ((id, Assumed axs), elems) => SOME (id, elems) | _ => NONE);
-
-    val extraTs = List.foldr OldTerm.add_term_tfrees [] exts' \\
-      List.foldr OldTerm.add_typ_tfrees [] (map snd parms);
-    val _ = if null extraTs then ()
-      else warning ("Additional type variable(s) in locale specification " ^ quote bname);
+(** Tactic **)
 
-    val predicate_name' = case predicate_name of "" => bname | _ => predicate_name;
-    val (elemss', defns) = change_defines_elemss thy elemss [];
-    val elemss'' = elemss' @ [(("", []), defns)];
-    val (((elemss''', predicate as (pred_statement, pred_axioms), stmt'), intros), thy') =
-      define_preds predicate_name' text elemss'' thy;
-    val regs = pred_axioms
-      |> fold_map (fn (id, elems) => fn wts => let
-             val ts = flat (map_filter (fn (Assumes asms) =>
-               SOME (maps (map #1 o #2) asms) | _ => NONE) elems);
-             val (wts1, wts2) = chop (length ts) wts;
-           in ((apsnd (map fst) id, wts1), wts2) end) elemss'''
-      |> fst
-      |> map_filter (fn (("", _), _) => NONE | e => SOME e);
-    fun axiomify axioms elemss =
-      (axioms, elemss) |> foldl_map (fn (axs, (id, elems)) => let
-                   val ts = flat (map_filter (fn (Assumes asms) =>
-                     SOME (maps (map #1 o #2) asms) | _ => NONE) elems);
-                   val (axs1, axs2) = chop (length ts) axs;
-                 in (axs2, ((id, Assumed axs1), elems)) end)
-      |> snd;
-    val ((_, facts), ctxt) = activate_facts true (K I)
-      (axiomify pred_axioms elemss''') (ProofContext.init thy');
-    val view_ctxt = Assumption.add_view thy_ctxt pred_statement ctxt;
-    val export = Thm.close_derivation o Goal.norm_result o
-      singleton (ProofContext.export view_ctxt thy_ctxt);
-    val facts' = facts |> map (fn (a, ths) => ((a, []), [(map export ths, [])]));
-    val elems' = maps #2 (filter (fn ((s, _), _) => s = "") elemss''');
-    val elems'' = map_filter (fn (Fixes _) => NONE | e => SOME e) elems';
-    val axs' = map (Element.assume_witness thy') stmt';
-    val loc_ctxt = thy'
-      |> Sign.add_path bname
-      |> Sign.no_base_names
-      |> PureThy.note_thmss Thm.assumptionK facts' |> snd
-      |> Sign.restore_naming thy'
-      |> register_locale bname {axiom = axs',
-        elems = map (fn e => (e, stamp ())) elems'',
-        params = params_of elemss''' |> map (fn (x, SOME T) => ((x, T), the (Symtab.lookup syn x))),
-        decls = ([], []),
-        regs = regs,
-        intros = intros,
-        dests = map Element.conclude_witness pred_axioms}
-      |> init name;
-  in (name, loc_ctxt) end;
-
-in
-
-val add_locale = gen_add_locale cert_context (K I);
-val add_locale_cmd = gen_add_locale read_context intern_expr "";
-
-end;
+fun intro_locales_tac eager ctxt facts st =
+  Method.intros_tac
+    (Witnesses.get ctxt @ Intros.get ctxt @ (if eager then Unfolds.get ctxt else [])) facts st;
 
 val _ = Context.>> (Context.map_theory
- (add_locale "" "var" empty [Fixes [(Binding.name (Name.internal "x"), NONE, NoSyn)]] #>
-  snd #> ProofContext.theory_of #>
-  add_locale "" "struct" empty [Fixes [(Binding.name (Name.internal "S"), NONE, Structure)]] #>
-  snd #> ProofContext.theory_of));
-
-
-
-
-(** Normalisation of locale statements ---
-    discharges goals implied by interpretations **)
-
-local
-
-fun locale_assm_intros thy =
-  Symtab.fold (fn (_, {intros = (a, _), ...}) => fn intros => (a @ intros))
-    (#2 (LocalesData.get thy)) [];
-fun locale_base_intros thy =
-  Symtab.fold (fn (_, {intros = (_, b), ...}) => fn intros => (b @ intros))
-    (#2 (LocalesData.get thy)) [];
-
-fun all_witnesses ctxt =
-  let
-    val thy = ProofContext.theory_of ctxt;
-    fun get registrations = Symtab.fold (fn (_, regs) => fn thms =>
-        (Registrations.dest thy regs |> map (fn (_, (_, (exp, _), wits, _)) =>
-          map (Element.conclude_witness #> Morphism.thm exp) wits) |> flat) @ thms)
-      registrations [];
-  in get (RegistrationsData.get (Context.Proof ctxt)) end;
-
-in
-
-fun intro_locales_tac eager ctxt facts st =
-  let
-    val wits = all_witnesses ctxt;
-    val thy = ProofContext.theory_of ctxt;
-    val intros = locale_base_intros thy @ (if eager then locale_assm_intros thy else []);
-  in
-    Method.intros_tac (wits @ intros) facts st
-  end;
+  (Method.add_methods
+    [("intro_locales",
+      Method.ctxt_args (fn ctxt => Method.METHOD (intro_locales_tac false ctxt ORELSE'
+        Old_Locale.intro_locales_tac false ctxt)),
+      "back-chain introduction rules of locales without unfolding predicates"),
+     ("unfold_locales",
+      Method.ctxt_args (fn ctxt => Method.METHOD (intro_locales_tac true ctxt ORELSE'
+        Old_Locale.intro_locales_tac true ctxt)),
+      "back-chain all introduction rules of locales")]));
 
 end;
 
-
-(** Interpretation commands **)
-
-local
-
-(* extract proof obligations (assms and defs) from elements *)
-
-fun extract_asms_elems ((id, Assumed _), elems) = (id, maps Element.prems_of elems)
-  | extract_asms_elems ((id, Derived _), _) = (id, []);
-
-
-(* activate instantiated facts in theory or context *)
-
-fun gen_activate_facts_elemss mk_ctxt note attrib put_reg add_wit add_eqn
-        phi_name all_elemss pss propss eq_attns (exp, imp) thmss thy_ctxt =
-  let
-    val ctxt = mk_ctxt thy_ctxt;
-    fun get_reg thy_ctxt = get_local_registration (mk_ctxt thy_ctxt);
-    fun test_reg thy_ctxt = test_local_registration (mk_ctxt thy_ctxt);
-
-    val (all_propss, eq_props) = chop (length all_elemss) propss;
-    val (all_thmss, eq_thms) = chop (length all_elemss) thmss;
-
-    (* Filter out fragments already registered. *)
-
-    val (new_elemss, xs) = split_list (filter_out (fn (((id, _), _), _) =>
-          test_reg thy_ctxt id) (all_elemss ~~ (pss ~~ (all_propss ~~ all_thmss))));
-    val (new_pss, ys) = split_list xs;
-    val (new_propss, new_thmss) = split_list ys;
-
-    val thy_ctxt' = thy_ctxt
-      (* add registrations *)
-      |> fold2 (fn ((id as (loc, _), _), _) => fn ps => put_reg id (phi_name, param_prefix loc ps) (exp, imp))
-           new_elemss new_pss
-      (* add witnesses of Assumed elements (only those generate proof obligations) *)
-      |> fold2 (fn (id, _) => fold (add_wit id)) new_propss new_thmss
-      (* add equations *)
-      |> fold2 (fn (id, _) => fold (add_eqn id)) eq_props
-          ((map o map) (Drule.abs_def o LocalDefs.meta_rewrite_rule ctxt o
-            Element.conclude_witness) eq_thms);
-
-    val prems = flat (map_filter
-          (fn ((id, Assumed _), _) => Option.map #2 (get_reg thy_ctxt' imp id)
-            | ((_, Derived _), _) => NONE) all_elemss);
-
-    val thy_ctxt'' = thy_ctxt'
-      (* add witnesses of Derived elements *)
-      |> fold (fn (id, thms) => fold
-           (add_wit id o Element.morph_witness (Element.satisfy_morphism prems)) thms)
-         (map_filter (fn ((_, Assumed _), _) => NONE
-            | ((id, Derived thms), _) => SOME (id, thms)) new_elemss)
-
-    fun activate_elem phi_name param_prfx insts prems eqns exp (Notes (kind, facts)) thy_ctxt =
-        let
-          val ctxt = mk_ctxt thy_ctxt;
-          val thy = ProofContext.theory_of ctxt;
-          val facts' = facts
-            |> activate_note thy phi_name param_prfx
-                 (attrib thy_ctxt) insts prems eqns exp;
-        in 
-          thy_ctxt
-          |> note kind facts'
-          |> snd
-        end
-      | activate_elem _ _ _ _ _ _ _ thy_ctxt = thy_ctxt;
-
-    fun activate_elems (((loc, ext_ts), _), _) ps thy_ctxt =
-      let
-        val ctxt = mk_ctxt thy_ctxt;
-        val thy = ProofContext.theory_of ctxt;
-        val {params, elems, ...} = the_locale thy loc;
-        val parms = map fst params;
-        val param_prfx = param_prefix loc ps;
-        val ids = flatten (ProofContext.init thy, intern_expr thy)
-          (([], Symtab.empty), Expr (Locale loc)) |> fst |> fst;
-        val (insts, prems, eqns) = collect_witnesses ctxt imp parms ids ext_ts;
-      in
-        thy_ctxt
-        |> fold (activate_elem phi_name param_prfx insts prems eqns exp o fst) elems
-      end;
-
-  in
-    thy_ctxt''
-    (* add equations as lemmas to context *)
-    |> (fold2 o fold2) (fn attn => fn thm => snd o yield_singleton (note Thm.lemmaK)
-         ((apsnd o map) (attrib thy_ctxt'') attn, [([Element.conclude_witness thm], [])]))
-            (unflat eq_thms eq_attns) eq_thms
-    (* add interpreted facts *)
-    |> fold2 activate_elems new_elemss new_pss
-  end;
-
-fun global_activate_facts_elemss x = gen_activate_facts_elemss
-  ProofContext.init
-  global_note_qualified
-  Attrib.attribute_i
-  put_global_registration
-  add_global_witness
-  add_global_equation
-  x;
-
-fun local_activate_facts_elemss x = gen_activate_facts_elemss
-  I
-  local_note_qualified
-  (Attrib.attribute_i o ProofContext.theory_of)
-  put_local_registration
-  add_local_witness
-  add_local_equation
-  x;
-
-fun prep_instantiations parse_term parse_prop ctxt parms (insts, eqns) =
-  let
-    (* parameters *)
-    val (parm_names, parm_types) = parms |> split_list
-      ||> map (TypeInfer.paramify_vars o Logic.varifyT);
-    val type_parms = fold Term.add_tvarsT parm_types [] |> map (Logic.mk_type o TVar);
-    val type_parm_names = fold Term.add_tfreesT (map snd parms) [] |> map fst;
-
-    (* parameter instantiations *)
-    val d = length parms - length insts;
-    val insts =
-      if d < 0 then error "More arguments than parameters in instantiation."
-      else insts @ replicate d NONE;
-    val (given_ps, given_insts) =
-      ((parm_names ~~ parm_types) ~~ insts) |> map_filter
-          (fn (_, NONE) => NONE
-            | ((n, T), SOME inst) => SOME ((n, T), inst))
-        |> split_list;
-    val (given_parm_names, given_parm_types) = given_ps |> split_list;
-
-    (* parse insts / eqns *)
-    val given_insts' = map (parse_term ctxt) given_insts;
-    val eqns' = map (parse_prop ctxt) eqns;
-
-    (* type inference and contexts *)
-    val arg = type_parms @ map2 TypeInfer.constrain given_parm_types given_insts' @ eqns';
-    val res = Syntax.check_terms ctxt arg;
-    val ctxt' = ctxt |> fold Variable.auto_fixes res;
-
-    (* instantiation *)
-    val (type_parms'', res') = chop (length type_parms) res;
-    val (given_insts'', eqns'') = chop (length given_insts) res';
-    val instT = Symtab.make (type_parm_names ~~ map Logic.dest_type type_parms'');
-    val inst = Symtab.make (given_parm_names ~~ given_insts'');
-
-    (* export from eigencontext *)
-    val export = Variable.export_morphism ctxt' ctxt;
-
-    (* import, its inverse *)
-    val domT = fold Term.add_tfrees res [] |> map TFree;
-    val importT = domT |> map (fn x => (Morphism.typ export x, x))
-      |> map_filter (fn (TFree _, _) => NONE  (* fixed point of export *)
-               | (TVar y, x) => SOME (fst y, x)
-               | _ => error "internal: illegal export in interpretation")
-      |> Vartab.make;
-    val dom = fold Term.add_frees res [] |> map Free;
-    val imprt = dom |> map (fn x => (Morphism.term export x, x))
-      |> map_filter (fn (Free _, _) => NONE  (* fixed point of export *)
-               | (Var y, x) => SOME (fst y, x)
-               | _ => error "internal: illegal export in interpretation")
-      |> Vartab.make;
-  in (((instT, inst), eqns''), (export, ((importT, domT), (imprt, dom)))) end;
-
-val read_instantiations = prep_instantiations Syntax.parse_term Syntax.parse_prop;
-val check_instantiations = prep_instantiations (K I) (K I);
-
-fun gen_prep_registration mk_ctxt test_reg activate
-    prep_attr prep_expr prep_insts
-    thy_ctxt phi_name raw_expr raw_insts =
-  let
-    val ctxt = mk_ctxt thy_ctxt;
-    val thy = ProofContext.theory_of ctxt;
-    val ctxt' = ProofContext.init thy;
-    fun prep_attn attn = (apsnd o map)
-      (Attrib.crude_closure ctxt o Args.assignable o prep_attr thy) attn;
-
-    val expr = prep_expr thy raw_expr;
-
-    val pts = params_of_expr ctxt' [] expr ([], Symtab.empty, Symtab.empty);
-    val params_ids = make_params_ids (#1 pts);
-    val raw_params_elemss = make_raw_params_elemss pts;
-    val ((ids, _), raw_elemss) = flatten (ctxt', I) (([], Symtab.empty), Expr expr);
-    val ((parms, all_elemss, _), (_, (_, defs, _))) =
-      read_elemss false ctxt' [] (raw_params_elemss @ raw_elemss) [];
-
-    (** compute instantiation **)
-
-    (* consistency check: equations need to be stored in a particular locale,
-       therefore if equations are present locale expression must be a name *)
-
-    val _ = case (expr, snd raw_insts) of
-        (Locale _, _) => () | (_, []) => ()
-      | (_, _) => error "Interpretations with `where' only permitted if locale expression is a name.";
-
-    (* read or certify instantiation *)
-    val (raw_insts', raw_eqns) = raw_insts;
-    val (raw_eq_attns, raw_eqns') = split_list raw_eqns;
-    val (((instT, inst1), eqns), morphs) = prep_insts ctxt parms (raw_insts', raw_eqns');
-    val eq_attns = map prep_attn raw_eq_attns;
-
-    (* defined params without given instantiation *)
-    val not_given = filter_out (Symtab.defined inst1 o fst) parms;
-    fun add_def (p, pT) inst =
-      let
-        val (t, T) = case find_first (fn (Free (a, _), _) => a = p) defs of
-               NONE => error ("Instance missing for parameter " ^ quote p)
-             | SOME (Free (_, T), t) => (t, T);
-        val d = Element.inst_term (instT, inst) t;
-      in Symtab.update_new (p, d) inst end;
-    val inst2 = fold add_def not_given inst1;
-    val inst_morphism = Element.inst_morphism thy (instT, inst2);
-    (* Note: insts contain no vars. *)
-
-    (** compute proof obligations **)
-
-    (* restore "small" ids *)
-    val ids' = map (fn ((n, ps), (_, mode)) =>
-          ((n, map (fn p => Free (p, (the o AList.lookup (op =) parms) p)) ps), mode))
-        ids;
-    val (_, all_elemss') = chop (length raw_params_elemss) all_elemss
-    (* instantiate ids and elements *)
-    val inst_elemss = (ids' ~~ all_elemss') |> map (fn (((n, ps), _), ((_, mode), elems)) =>
-      ((n, map (Morphism.term (inst_morphism $> fst morphs)) ps),
-        map (fn Int e => Element.morph_ctxt inst_morphism e) elems)
-      |> apfst (fn id => (id, map_mode (map (Element.morph_witness inst_morphism)) mode)));
-
-    (* equations *)
-    val eqn_elems = if null eqns then []
-      else [(Library.last_elem inst_elemss |> fst |> fst, eqns)];
-
-    val propss = map extract_asms_elems inst_elemss @ eqn_elems;
-
-  in
-    (propss, activate phi_name inst_elemss (map (snd o fst) ids) propss eq_attns morphs, morphs)
-  end;
-
-fun gen_prep_global_registration mk_ctxt = gen_prep_registration ProofContext.init
-  test_global_registration
-  global_activate_facts_elemss mk_ctxt;
-
-fun gen_prep_local_registration mk_ctxt = gen_prep_registration I
-  test_local_registration
-  local_activate_facts_elemss mk_ctxt;
-
-val prep_global_registration = gen_prep_global_registration
-  (K I) (K I) check_instantiations;
-val prep_global_registration_cmd = gen_prep_global_registration
-  Attrib.intern_src intern_expr read_instantiations;
-
-val prep_local_registration = gen_prep_local_registration
-  (K I) (K I) check_instantiations;
-val prep_local_registration_cmd = gen_prep_local_registration
-  Attrib.intern_src intern_expr read_instantiations;
-
-fun prep_registration_in_locale target expr thy =
-  (* target already in internal form *)
-  let
-    val ctxt = ProofContext.init thy;
-    val ((raw_target_ids, target_syn), _) = flatten (ctxt, I)
-        (([], Symtab.empty), Expr (Locale target));
-    val fixed = the_locale thy target |> #params |> map #1;
-    val ((all_ids, syn), raw_elemss) = flatten (ctxt, intern_expr thy)
-        ((raw_target_ids, target_syn), Expr expr);
-    val (target_ids, ids) = chop (length raw_target_ids) all_ids;
-    val ((parms, elemss, _), _) = read_elemss false ctxt fixed raw_elemss [];
-
-    (** compute proof obligations **)
-
-    (* restore "small" ids, with mode *)
-    val ids' = map (apsnd snd) ids;
-    (* remove Int markers *)
-    val elemss' = map (fn (_, es) =>
-        map (fn Int e => e) es) elemss
-    (* extract assumptions and defs *)
-    val ids_elemss = ids' ~~ elemss';
-    val propss = map extract_asms_elems ids_elemss;
-
-    (** activation function:
-        - add registrations to the target locale
-        - add induced registrations for all global registrations of
-          the target, unless already present
-        - add facts of induced registrations to theory **)
-
-    fun activate thmss thy =
-      let
-        val satisfy = Element.satisfy_thm (flat thmss);
-        val ids_elemss_thmss = ids_elemss ~~ thmss;
-        val regs = get_global_registrations thy target;
-
-        fun activate_id (((id, Assumed _), _), thms) thy =
-            thy |> put_registration_in_locale target id
-                |> fold (add_witness_in_locale target id) thms
-          | activate_id _ thy = thy;
-
-        fun activate_reg (ext_ts, ((phi_name, param_prfx), (exp, imp), _, _)) thy =
-          let
-            val (insts, wits, _) = collect_witnesses (ProofContext.init thy) imp fixed target_ids ext_ts;
-            val inst_parms = map (the o AList.lookup (op =) (map #1 fixed ~~ ext_ts));
-            val disch = Element.satisfy_thm wits;
-            val new_elemss = filter (fn (((name, ps), _), _) =>
-                not (test_global_registration thy (name, inst_parms ps))) (ids_elemss);
-            fun activate_assumed_id (((_, Derived _), _), _) thy = thy
-              | activate_assumed_id ((((name, ps), Assumed _), _), thms) thy = let
-                val ps' = inst_parms ps;
-              in
-                if test_global_registration thy (name, ps')
-                then thy
-                else thy
-                  |> put_global_registration (name, ps') (phi_name, param_prefix name ps) (exp, imp)
-                  |> fold (fn witn => fn thy => add_global_witness (name, ps')
-                     (Element.morph_witness (Element.inst_morphism thy insts) witn) thy) thms
-              end;
-
-            fun activate_derived_id ((_, Assumed _), _) thy = thy
-              | activate_derived_id (((name, ps), Derived ths), _) thy = let
-                val ps' = inst_parms ps;
-              in
-                if test_global_registration thy (name, ps')
-                then thy
-                else thy
-                  |> put_global_registration (name, ps') (phi_name, param_prefix name ps) (exp, imp)
-                  |> fold (fn witn => fn thy => add_global_witness (name, ps')
-                       (witn |> Element.map_witness (fn (t, th) =>  (* FIXME *)
-                       (Element.inst_term insts t,
-                        disch (Element.inst_thm thy insts (satisfy th))))) thy) ths
-              end;
-
-            fun activate_elem (loc, ps) (Notes (kind, facts)) thy =
-                let
-                  val att_morphism =
-                    Morphism.binding_morphism (name_morph phi_name param_prfx) $>
-                    Morphism.thm_morphism satisfy $>
-                    Element.inst_morphism thy insts $>
-                    Morphism.thm_morphism disch;
-                  val facts' = facts
-                    |> Attrib.map_facts (Attrib.attribute_i thy o Args.morph_values att_morphism)
-                    |> (map o apsnd o map o apfst o map) (disch o Element.inst_thm thy insts o satisfy)
-                    |> (map o apfst o apfst) (name_morph phi_name param_prfx);
-                in
-                  thy
-                  |> global_note_qualified kind facts'
-                  |> snd
-                end
-              | activate_elem _ _ thy = thy;
-
-            fun activate_elems ((id, _), elems) thy = fold (activate_elem id) elems thy;
-
-          in thy |> fold activate_assumed_id ids_elemss_thmss
-                 |> fold activate_derived_id ids_elemss
-                 |> fold activate_elems new_elemss end;
-      in
-        thy |> fold activate_id ids_elemss_thmss
-            |> fold activate_reg regs
-      end;
-
-  in (propss, activate) end;
-
-fun prep_propp propss = propss |> map (fn (_, props) =>
-  map (rpair [] o Element.mark_witness) props);
-
-fun prep_result propps thmss =
-  ListPair.map (fn ((_, props), thms) => map2 Element.make_witness props thms) (propps, thmss);
-
-fun gen_interpretation prep_registration after_qed prfx raw_expr raw_insts thy =
-  let
-    val (propss, activate, morphs) = prep_registration thy prfx raw_expr raw_insts;
-    fun after_qed' results =
-      ProofContext.theory (activate (prep_result propss results))
-      #> after_qed;
-  in
-    thy
-    |> ProofContext.init
-    |> Proof.theorem_i NONE after_qed' (prep_propp propss)
-    |> Element.refine_witness
-    |> Seq.hd
-    |> pair morphs
-  end;
-
-fun gen_interpret prep_registration after_qed name_morph expr insts int state =
-  let
-    val _ = Proof.assert_forward_or_chain state;
-    val ctxt = Proof.context_of state;
-    val (propss, activate, morphs) = prep_registration ctxt name_morph expr insts;
-    fun after_qed' results =
-      Proof.map_context (K (ctxt |> activate (prep_result propss results)))
-      #> Proof.put_facts NONE
-      #> after_qed;
-  in
-    state
-    |> Proof.local_goal (ProofDisplay.print_results int) (K I) ProofContext.bind_propp_i
-      "interpret" NONE after_qed' (map (pair (Binding.empty, [])) (prep_propp propss))
-    |> Element.refine_witness |> Seq.hd
-    |> pair morphs
-  end;
-
-fun standard_name_morph interp_prfx b =
-  if Binding.is_empty b then b
-  else Binding.map_prefix (fn ((lprfx, _) :: pprfx) =>
-    fold (Binding.add_prefix false o fst) pprfx
-    #> interp_prfx <> "" ? Binding.add_prefix true interp_prfx
-    #> Binding.add_prefix false lprfx
-  ) b;
-
-in
-
-val interpretation = gen_interpretation prep_global_registration;
-fun interpretation_cmd interp_prfx = snd ooo gen_interpretation prep_global_registration_cmd
-  I (standard_name_morph interp_prfx);
-
-fun interpretation_in_locale after_qed (raw_target, expr) thy =
-  let
-    val target = intern thy raw_target;
-    val (propss, activate) = prep_registration_in_locale target expr thy;
-    val raw_propp = prep_propp propss;
-
-    val (_, _, goal_ctxt, propp) = thy
-      |> ProofContext.init
-      |> cert_context_statement (SOME target) [] raw_propp;
-
-    fun after_qed' results =
-      ProofContext.theory (activate (prep_result propss results))
-      #> after_qed;
-  in
-    goal_ctxt
-    |> Proof.theorem_i NONE after_qed' propp
-    |> Element.refine_witness |> Seq.hd
-  end;
-
-val interpret = gen_interpret prep_local_registration;
-fun interpret_cmd interp_prfx = snd oooo gen_interpret prep_local_registration_cmd
-  Seq.single (standard_name_morph interp_prfx);
-
-end;
-
-end;
--- a/src/Pure/Isar/new_locale.ML	Mon Jan 05 19:37:15 2009 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,508 +0,0 @@
-(*  Title:      Pure/Isar/new_locale.ML
-    Author:     Clemens Ballarin, TU Muenchen
-
-New locale development --- experimental.
-*)
-
-signature NEW_LOCALE =
-sig
-  type locale
-
-  val test_locale: theory -> string -> bool
-  val register_locale: bstring ->
-    (string * sort) list * (Binding.T * typ option * mixfix) list ->
-    term option * term list ->
-    (declaration * stamp) list * (declaration * stamp) list ->
-    ((string * (Attrib.binding * (thm list * Attrib.src list) list) list) * stamp) list ->
-    ((string * Morphism.morphism) * stamp) list -> theory -> theory
-
-  (* Locale name space *)
-  val intern: theory -> xstring -> string
-  val extern: theory -> string -> xstring
-
-  (* Specification *)
-  val params_of: theory -> string -> (Binding.T * typ option * mixfix) list
-  val instance_of: theory -> string -> Morphism.morphism -> term list
-  val specification_of: theory -> string -> term option * term list
-  val declarations_of: theory -> string -> declaration list * declaration list
-
-  (* Storing results *)
-  val add_thmss: string -> string -> (Attrib.binding * (thm list * Attrib.src list) list) list ->
-    Proof.context -> Proof.context
-  val add_type_syntax: string -> declaration -> Proof.context -> Proof.context
-  val add_term_syntax: string -> declaration -> Proof.context -> Proof.context
-  val add_declaration: string -> declaration -> Proof.context -> Proof.context
-  val add_dependency: string -> (string * Morphism.morphism) -> theory -> theory
-
-  (* Activation *)
-  val activate_declarations: theory -> string * Morphism.morphism ->
-    Proof.context -> Proof.context
-  val activate_global_facts: string * Morphism.morphism -> theory -> theory
-  val activate_local_facts: string * Morphism.morphism -> Proof.context -> Proof.context
-  val init: string -> theory -> Proof.context
-
-  (* Reasoning about locales *)
-  val witness_attrib: attribute
-  val intro_attrib: attribute
-  val unfold_attrib: attribute
-  val intro_locales_tac: bool -> Proof.context -> thm list -> tactic
-
-  (* Registrations *)
-  val add_global_registration: (string * (Morphism.morphism * Morphism.morphism)) ->
-    theory -> theory
-  val amend_global_registration: Morphism.morphism -> (string * Morphism.morphism) ->
-    theory -> theory
-  val get_global_registrations: theory -> (string * Morphism.morphism) list
-
-  (* Diagnostic *)
-  val print_locales: theory -> unit
-  val print_locale: theory -> bool -> bstring -> unit
-end;
-
-
-(*** Theorem list extensible via attribute --- to control intro_locales_tac ***)
-
-(* FIXME: consider moving named_thms.ML up in the build hierarchy and using that *)
-functor ThmsFun() =
-struct
-
-structure Data = GenericDataFun
-(
-  type T = thm list;
-  val empty = [];
-  val extend = I;
-  fun merge _ = Thm.merge_thms;
-);
-
-val get = Data.get o Context.Proof;
-val add = Thm.declaration_attribute (Data.map o Thm.add_thm);
-
-end;
-
-
-structure NewLocale: NEW_LOCALE =
-struct
-
-datatype ctxt = datatype Element.ctxt;
-
-
-(*** Basics ***)
-
-datatype locale = Loc of {
-  (* extensible lists are in reverse order: decls, notes, dependencies *)
-  parameters: (string * sort) list * (Binding.T * typ option * mixfix) list,
-    (* type and term parameters *)
-  spec: term option * term list,
-    (* assumptions (as a single predicate expression) and defines *)
-  decls: (declaration * stamp) list * (declaration * stamp) list,
-    (* type and term syntax declarations *)
-  notes: ((string * (Attrib.binding * (thm list * Attrib.src list) list) list) * stamp) list,
-    (* theorem declarations *)
-  dependencies: ((string * Morphism.morphism) * stamp) list
-    (* locale dependencies (sublocale relation) *)
-}
-
-
-(*** Theory data ***)
-
-structure LocalesData = TheoryDataFun
-(
-  type T = NameSpace.T * locale Symtab.table;
-    (* locale namespace and locales of the theory *)
-
-  val empty = NameSpace.empty_table;
-  val copy = I;
-  val extend = I;
-
-  fun join_locales _
-   (Loc {parameters, spec, decls = (decls1, decls2), notes, dependencies},
-    Loc {decls = (decls1', decls2'), notes = notes', dependencies = dependencies', ...}) =
-      Loc {
-        parameters = parameters,
-        spec = spec,
-        decls =
-         (merge (eq_snd op =) (decls1, decls1'),
-          merge (eq_snd op =) (decls2, decls2')),
-        notes = merge (eq_snd op =) (notes, notes'),
-        dependencies = merge (eq_snd op =) (dependencies, dependencies')};
-
-  fun merge _ = NameSpace.join_tables join_locales;
-);
-
-val intern = NameSpace.intern o #1 o LocalesData.get;
-val extern = NameSpace.extern o #1 o LocalesData.get;
-
-fun get_locale thy name = Symtab.lookup (#2 (LocalesData.get thy)) name;
-
-fun the_locale thy name = case get_locale thy name
- of SOME loc => loc
-  | NONE => error ("Unknown locale " ^ quote name);
-
-fun test_locale thy name = case get_locale thy name
- of SOME _ => true | NONE => false;
-
-fun register_locale bname parameters spec decls notes dependencies thy =
-  thy |> LocalesData.map (NameSpace.bind (Sign.naming_of thy) (Binding.name bname,
-    Loc {parameters = parameters, spec = spec, decls = decls, notes = notes,
-      dependencies = dependencies}) #> snd);
-
-fun change_locale name f thy =
-  let
-    val Loc {parameters, spec, decls, notes, dependencies} =
-        the_locale thy name;
-    val (parameters', spec', decls', notes', dependencies') =
-      f (parameters, spec, decls, notes, dependencies);
-  in
-    thy
-    |> (LocalesData.map o apsnd) (Symtab.update (name, Loc {parameters = parameters',
-      spec = spec', decls = decls', notes = notes', dependencies = dependencies'}))
-  end;
-
-fun print_locales thy =
-  let val (space, locs) = LocalesData.get thy in
-    Pretty.strs ("locales:" :: map #1 (NameSpace.extern_table (space, locs)))
-    |> Pretty.writeln
-  end;
-
-
-(*** Primitive operations ***)
-
-fun params_of thy name =
-  let
-    val Loc {parameters = (_, params), ...} = the_locale thy name
-  in params end;
-
-fun instance_of thy name morph =
-  params_of thy name |>
-    map ((fn (b, T, _) => Free (Binding.base_name b, the T)) #> Morphism.term morph);
-
-fun specification_of thy name =
-  let
-    val Loc {spec, ...} = the_locale thy name
-  in spec end;
-
-fun declarations_of thy name =
-  let
-    val Loc {decls, ...} = the_locale thy name
-  in
-    decls |> apfst (map fst) |> apsnd (map fst)
-  end;
-
-
-(*** Activate context elements of locale ***)
-
-(** Identifiers: activated locales in theory or proof context **)
-
-type identifiers = (string * term list) list;
-
-val empty = ([] : identifiers);
-
-fun ident_eq thy ((n: string, ts), (m, ss)) = (m = n) andalso Pattern.matchess thy (ss, ts);
-
-local
-
-datatype 'a delayed = Ready of 'a | ToDo of ('a delayed * 'a delayed);
-
-structure IdentifiersData = GenericDataFun
-(
-  type T = identifiers delayed;
-  val empty = Ready empty;
-  val extend = I;
-  fun merge _ = ToDo;
-);
-
-in
-
-fun finish thy (ToDo (i1, i2)) = merge (ident_eq thy) (finish thy i1, finish thy i2)
-  | finish _ (Ready ids) = ids;
-
-val _ = Context.>> (Context.map_theory (Theory.at_begin (fn thy =>
-  (case IdentifiersData.get (Context.Theory thy) of
-    Ready _ => NONE |
-    ids => SOME (Context.theory_map (IdentifiersData.put (Ready (finish thy ids))) thy))
-  )));
-
-fun get_global_idents thy =
-  let val (Ready ids) = (IdentifiersData.get o Context.Theory) thy in ids end;
-val put_global_idents = Context.theory_map o IdentifiersData.put o Ready;
-
-fun get_local_idents ctxt =
-  let val (Ready ids) = (IdentifiersData.get o Context.Proof) ctxt in ids end;
-val put_local_idents = Context.proof_map o IdentifiersData.put o Ready;
-
-end;
-
-
-(** Resolve locale dependencies in a depth-first fashion **)
-
-local
-
-val roundup_bound = 120;
-
-fun add thy depth (name, morph) (deps, marked) =
-  if depth > roundup_bound
-  then error "Roundup bound exceeded (sublocale relation probably not terminating)."
-  else
-    let
-      val Loc {parameters = (_, params), dependencies, ...} = the_locale thy name;
-      val instance = instance_of thy name morph;
-    in
-      if member (ident_eq thy) marked (name, instance)
-      then (deps, marked)
-      else
-        let
-          val dependencies' =
-            map (fn ((name, morph'), _) => (name, morph' $>  morph)) dependencies;
-          val marked' = (name, instance) :: marked;
-          val (deps', marked'') = fold_rev (add thy (depth + 1)) dependencies' ([], marked');
-        in
-          ((name, morph) :: deps' @ deps, marked'')
-        end
-    end;
-
-in
-
-fun roundup thy activate_dep (name, morph) (marked, input) =
-  let
-    (* Find all dependencies incuding new ones (which are dependencies enriching
-      existing registrations). *)
-    val (dependencies, marked') = add thy 0 (name, morph) ([], empty);
-    (* Filter out exisiting fragments. *)
-    val dependencies' = filter_out (fn (name, morph) =>
-      member (ident_eq thy) marked (name, instance_of thy name morph)) dependencies;
-  in
-    (merge (ident_eq thy) (marked, marked'), input |> fold_rev (activate_dep thy) dependencies')
-  end;
-
-end;
-
-
-(* Declarations, facts and entire locale content *)
-
-fun activate_decls thy (name, morph) ctxt =
-  let
-    val Loc {decls = (typ_decls, term_decls), ...} = the_locale thy name;
-  in
-    ctxt |> fold_rev (fn (decl, _) => Context.proof_map (decl morph)) typ_decls |>
-      fold_rev (fn (decl, _) => Context.proof_map (decl morph)) term_decls
-  end;
-
-fun activate_notes activ_elem transfer thy (name, morph) input =
-  let
-    val Loc {notes, ...} = the_locale thy name;
-    fun activate ((kind, facts), _) input =
-      let
-        val facts' = facts |> Element.facts_map (Element.morph_ctxt (transfer input $> morph))
-      in activ_elem (Notes (kind, facts')) input end;
-  in
-    fold_rev activate notes input
-  end;
-
-fun activate_all name thy activ_elem transfer (marked, input) =
-  let
-    val Loc {parameters = (_, params), spec = (asm, defs), ...} =
-      the_locale thy name;
-  in
-    input |>
-      (if not (null params) then activ_elem (Fixes params) else I) |>
-      (* FIXME type parameters *)
-      (if is_some asm then activ_elem (Assumes [(Attrib.empty_binding, [(the asm, [])])]) else I) |>
-      (if not (null defs)
-        then activ_elem (Defines (map (fn def => (Attrib.empty_binding, (def, []))) defs))
-        else I) |>
-      pair marked |> roundup thy (activate_notes activ_elem transfer) (name, Morphism.identity)
-  end;
-
-
-(** Public activation functions **)
-
-local
-
-fun init_global_elem (Notes (kind, facts)) thy =
-      let
-        val facts' = Attrib.map_facts (Attrib.attribute_i thy) facts
-      in Locale.global_note_qualified kind facts' thy |> snd end
-
-fun init_local_elem (Fixes fixes) ctxt = ctxt |>
-      ProofContext.add_fixes_i fixes |> snd
-  | init_local_elem (Assumes assms) ctxt =
-      let
-        val assms' = Attrib.map_specs (Attrib.attribute_i (ProofContext.theory_of ctxt)) assms
-      in
-        ctxt |> fold Variable.auto_fixes (maps (map fst o snd) assms') |>
-          ProofContext.add_assms_i Assumption.assume_export assms' |> snd
-     end
-  | init_local_elem (Defines defs) ctxt =
-      let
-        val defs' = Attrib.map_specs (Attrib.attribute_i (ProofContext.theory_of ctxt)) defs
-      in
-        ctxt |> fold Variable.auto_fixes (map (fst o snd) defs') |>
-          ProofContext.add_assms_i LocalDefs.def_export (map (fn (attn, t) => (attn, [t])) defs') |>
-          snd
-      end
-  | init_local_elem (Notes (kind, facts)) ctxt =
-      let
-        val facts' = Attrib.map_facts (Attrib.attribute_i (ProofContext.theory_of ctxt)) facts
-      in Locale.local_note_qualified kind facts' ctxt |> snd end
-
-fun cons_elem false (Notes notes) elems = elems
-  | cons_elem _ elem elems = elem :: elems
-
-in
-
-fun activate_declarations thy dep ctxt =
-  roundup thy activate_decls dep (get_local_idents ctxt, ctxt) |> uncurry put_local_idents;
-
-fun activate_global_facts dep thy =
-  roundup thy (activate_notes init_global_elem Element.transfer_morphism)
-    dep (get_global_idents thy, thy) |>
-  uncurry put_global_idents;
-
-fun activate_local_facts dep ctxt =
-  roundup (ProofContext.theory_of ctxt)
-  (activate_notes init_local_elem (Element.transfer_morphism o ProofContext.theory_of)) dep
-    (get_local_idents ctxt, ctxt) |>
-  uncurry put_local_idents;
-
-fun init name thy =
-  activate_all name thy init_local_elem (Element.transfer_morphism o ProofContext.theory_of)
-    (empty, ProofContext.init thy) |>
-  uncurry put_local_idents;
-
-fun print_locale thy show_facts name =
-  let
-    val name' = intern thy name;
-    val ctxt = init name' thy
-  in
-    Pretty.big_list "locale elements:"
-      (activate_all name' thy (cons_elem show_facts) (K (Element.transfer_morphism thy))
-        (empty, []) |> snd |> rev |>
-        map (Element.pretty_ctxt ctxt) |> map Pretty.chunks) |> Pretty.writeln
-  end
-
-end;
-
-
-(*** Registrations: interpretations in theories ***)
-
-(* FIXME only global variant needed *)
-structure RegistrationsData = GenericDataFun
-(
-  type T = ((string * (Morphism.morphism * Morphism.morphism)) * stamp) list;
-(* FIXME mixins need to be stamped *)
-    (* registrations, in reverse order of declaration *)
-  val empty = [];
-  val extend = I;
-  fun merge _ data : T = Library.merge (eq_snd op =) data;
-    (* FIXME consolidate with dependencies, consider one data slot only *)
-);
-
-val get_global_registrations =
-  Context.Theory #> RegistrationsData.get #> map fst #> map (apsnd op $>);
-
-fun add_global reg =
-  (Context.theory_map o RegistrationsData.map) (cons (reg, stamp ()));
-
-fun add_global_registration (name, (base_morph, export)) thy =
-  roundup thy (fn _ => fn (name', morph') => fn thy => add_global (name', (morph', export)) thy)
-    (name, base_morph) (get_global_idents thy, thy) |>
-    snd (* FIXME ?? uncurry put_global_idents *);
-
-fun amend_global_registration morph (name, base_morph) thy =
-  let
-    val regs = (Context.Theory #> RegistrationsData.get #> map fst) thy;
-    val base = instance_of thy name base_morph;
-    fun match (name', (morph', _)) =
-      name = name' andalso eq_list (op aconv) (base, instance_of thy name' morph');
-    val i = find_index match (rev regs);
-    val _ = if i = ~1 then error ("No interpretation of locale " ^
-        quote (extern thy name) ^ " and parameter instantiation " ^
-        space_implode " " (map (quote o Syntax.string_of_term_global thy) base) ^ " available.")
-      else ();
-  in
-    (Context.theory_map o RegistrationsData.map) (nth_map (length regs - 1 - i)
-      (fn ((name, (base, export)), stamp) => ((name, (base $> morph, export)), stamp))) thy
-  end;
-
-
-(*** Storing results ***)
-
-(* Theorems *)
-
-fun add_thmss loc kind args ctxt =
-  let
-    val ([Notes args'], ctxt') = Element.activate_i [Notes (kind, args)] ctxt;
-    val ctxt'' = ctxt' |> ProofContext.theory (
-      change_locale loc
-        (fn (parameters, spec, decls, notes, dependencies) =>
-          (parameters, spec, decls, (args', stamp ()) :: notes, dependencies)) #>
-      (* Registrations *)
-      (fn thy => fold_rev (fn (name, morph) =>
-            let
-              val args'' = snd args' |> Element.facts_map (Element.morph_ctxt morph) |>
-                Attrib.map_facts (Attrib.attribute_i thy)
-            in Locale.global_note_qualified kind args'' #> snd end)
-        (get_global_registrations thy |> filter (fn (name, _) => name = loc)) thy))
-  in ctxt'' end;
-
-
-(* Declarations *)
-
-local
-
-fun decl_attrib decl phi = Thm.declaration_attribute (K (decl phi));
-
-fun add_decls add loc decl =
-  ProofContext.theory (change_locale loc
-    (fn (parameters, spec, decls, notes, dependencies) =>
-      (parameters, spec, add (decl, stamp ()) decls, notes, dependencies))) #>
-  add_thmss loc Thm.internalK
-    [((Binding.empty, [Attrib.internal (decl_attrib decl)]), [([Drule.dummy_thm], [])])];
-
-in
-
-val add_type_syntax = add_decls (apfst o cons);
-val add_term_syntax = add_decls (apsnd o cons);
-val add_declaration = add_decls (K I);
-
-end;
-
-(* Dependencies *)
-
-fun add_dependency loc dep =
-  change_locale loc
-    (fn (parameters, spec, decls, notes, dependencies) =>
-      (parameters, spec, decls, notes, (dep, stamp ()) :: dependencies));
-
-
-(*** Reasoning about locales ***)
-
-(** Storage for witnesses, intro and unfold rules **)
-
-structure Witnesses = ThmsFun();
-structure Intros = ThmsFun();
-structure Unfolds = ThmsFun();
-
-val witness_attrib = Witnesses.add;
-val intro_attrib = Intros.add;
-val unfold_attrib = Unfolds.add;
-
-(** Tactic **)
-
-fun intro_locales_tac eager ctxt facts st =
-  Method.intros_tac
-    (Witnesses.get ctxt @ Intros.get ctxt @ (if eager then Unfolds.get ctxt else [])) facts st;
-
-val _ = Context.>> (Context.map_theory
-  (Method.add_methods
-    [("intro_locales",
-      Method.ctxt_args (fn ctxt => Method.METHOD (intro_locales_tac false ctxt ORELSE'
-        Locale.intro_locales_tac false ctxt)),
-      "back-chain introduction rules of locales without unfolding predicates"),
-     ("unfold_locales",
-      Method.ctxt_args (fn ctxt => Method.METHOD (intro_locales_tac true ctxt ORELSE'
-        Locale.intro_locales_tac true ctxt)),
-      "back-chain all introduction rules of locales")]));
-
-end;
-
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/Pure/Isar/old_locale.ML	Tue Jan 06 08:50:12 2009 +0100
@@ -0,0 +1,2485 @@
+(*  Title:      Pure/Isar/locale.ML
+    Author:     Clemens Ballarin, TU Muenchen
+    Author:     Markus Wenzel, LMU/TU Muenchen
+
+Locales -- Isar proof contexts as meta-level predicates, with local
+syntax and implicit structures.
+
+Draws basic ideas from Florian Kammueller's original version of
+locales, but uses the richer infrastructure of Isar instead of the raw
+meta-logic.  Furthermore, structured import of contexts (with merge
+and rename operations) are provided, as well as type-inference of the
+signature parts, and predicate definitions of the specification text.
+
+Interpretation enables the reuse of theorems of locales in other
+contexts, namely those defined by theories, structured proofs and
+locales themselves.
+
+See also:
+
+[1] Clemens Ballarin. Locales and Locale Expressions in Isabelle/Isar.
+    In Stefano Berardi et al., Types for Proofs and Programs: International
+    Workshop, TYPES 2003, Torino, Italy, LNCS 3085, pages 34-50, 2004.
+[2] Clemens Ballarin. Interpretation of Locales in Isabelle: Managing
+    Dependencies between Locales. Technical Report TUM-I0607, Technische
+    Universitaet Muenchen, 2006.
+[3] Clemens Ballarin. Interpretation of Locales in Isabelle: Theories and
+    Proof Contexts. In J.M. Borwein and W.M. Farmer, MKM 2006, LNAI 4108,
+    pages 31-43, 2006.
+*)
+
+(* TODO:
+- beta-eta normalisation of interpretation parameters
+- dangling type frees in locales
+- test subsumption of interpretations when merging theories
+*)
+
+signature OLD_LOCALE =
+sig
+  datatype expr =
+    Locale of string |
+    Rename of expr * (string * mixfix option) option list |
+    Merge of expr list
+  val empty: expr
+
+  val intern: theory -> xstring -> string
+  val intern_expr: theory -> expr -> expr
+  val extern: theory -> string -> xstring
+  val init: string -> theory -> Proof.context
+
+  (* The specification of a locale *)
+  val parameters_of: theory -> string -> ((string * typ) * mixfix) list
+  val parameters_of_expr: theory -> expr -> ((string * typ) * mixfix) list
+  val local_asms_of: theory -> string -> (Attrib.binding * term list) list
+  val global_asms_of: theory -> string -> (Attrib.binding * term list) list
+
+  (* Theorems *)
+  val intros: theory -> string -> thm list * thm list
+  val dests: theory -> string -> thm list
+  (* Not part of the official interface.  DO NOT USE *)
+  val facts_of: theory -> string -> (Attrib.binding * (thm list * Attrib.src list) list) list list
+
+  (* Not part of the official interface.  DO NOT USE *)
+  val declarations_of: theory -> string -> declaration list * declaration list;
+
+  (* Processing of locale statements *)
+  val read_context_statement: string option -> Element.context list ->
+    (string * string list) list list -> Proof.context ->
+    string option * Proof.context * Proof.context * (term * term list) list list
+  val read_context_statement_cmd: xstring option -> Element.context list ->
+    (string * string list) list list -> Proof.context ->
+    string option * Proof.context * Proof.context * (term * term list) list list
+  val cert_context_statement: string option -> Element.context_i list ->
+    (term * term list) list list -> Proof.context ->
+    string option * Proof.context * Proof.context * (term * term list) list list
+  val read_expr: expr -> Element.context list -> Proof.context ->
+    Element.context_i list * Proof.context
+  val cert_expr: expr -> Element.context_i list -> Proof.context ->
+    Element.context_i list * Proof.context
+
+  (* Diagnostic functions *)
+  val print_locales: theory -> unit
+  val print_locale: theory -> bool -> expr -> Element.context list -> unit
+  val print_registrations: bool -> string -> Proof.context -> unit
+
+  val add_locale: string -> bstring -> expr -> Element.context_i list -> theory
+    -> string * Proof.context
+  val add_locale_cmd: bstring -> expr -> Element.context list -> theory
+    -> string * Proof.context
+
+  (* Tactics *)
+  val intro_locales_tac: bool -> Proof.context -> thm list -> tactic
+
+  (* Storing results *)
+  val global_note_qualified: string ->
+    ((Binding.T * attribute list) * (thm list * attribute list) list) list ->
+    theory -> (string * thm list) list * theory
+  val local_note_qualified: string ->
+    ((Binding.T * attribute list) * (thm list * attribute list) list) list ->
+    Proof.context -> (string * thm list) list * Proof.context
+  val add_thmss: string -> string -> (Attrib.binding * (thm list * Attrib.src list) list) list ->
+    Proof.context -> Proof.context
+  val add_type_syntax: string -> declaration -> Proof.context -> Proof.context
+  val add_term_syntax: string -> declaration -> Proof.context -> Proof.context
+  val add_declaration: string -> declaration -> Proof.context -> Proof.context
+
+  (* Interpretation *)
+  val get_interpret_morph: theory -> (Binding.T -> Binding.T) -> string * string ->
+    (Morphism.morphism * ((typ Vartab.table * typ list) * (term Vartab.table * term list))) ->
+    string -> term list -> Morphism.morphism
+  val interpretation: (Proof.context -> Proof.context) ->
+    (Binding.T -> Binding.T) -> expr ->
+    term option list * (Attrib.binding * term) list ->
+    theory ->
+    (Morphism.morphism * ((typ Vartab.table * typ list) * (term Vartab.table * term list))) * Proof.state
+  val interpretation_cmd: string -> expr -> string option list * (Attrib.binding * string) list ->
+    theory -> Proof.state
+  val interpretation_in_locale: (Proof.context -> Proof.context) ->
+    xstring * expr -> theory -> Proof.state
+  val interpret: (Proof.state -> Proof.state Seq.seq) ->
+    (Binding.T -> Binding.T) -> expr ->
+    term option list * (Attrib.binding * term) list ->
+    bool -> Proof.state ->
+    (Morphism.morphism * ((typ Vartab.table * typ list) * (term Vartab.table * term list))) * Proof.state
+  val interpret_cmd: string -> expr -> string option list * (Attrib.binding * string) list ->
+    bool -> Proof.state -> Proof.state
+end;
+
+structure Old_Locale: OLD_LOCALE =
+struct
+
+(* legacy operations *)
+
+fun merge_lists _ xs [] = xs
+  | merge_lists _ [] ys = ys
+  | merge_lists eq xs ys = xs @ filter_out (member eq xs) ys;
+
+fun merge_alists eq xs = merge_lists (eq_fst eq) xs;
+
+
+(* auxiliary: noting name bindings with qualified base names *)
+
+fun global_note_qualified kind facts thy =
+  thy
+  |> Sign.qualified_names
+  |> PureThy.note_thmss kind facts
+  ||> Sign.restore_naming thy;
+
+fun local_note_qualified kind facts ctxt =
+  ctxt
+  |> ProofContext.qualified_names
+  |> ProofContext.note_thmss_i kind facts
+  ||> ProofContext.restore_naming ctxt;
+
+
+(** locale elements and expressions **)
+
+datatype ctxt = datatype Element.ctxt;
+
+datatype expr =
+  Locale of string |
+  Rename of expr * (string * mixfix option) option list |
+  Merge of expr list;
+
+val empty = Merge [];
+
+datatype 'a element =
+  Elem of 'a | Expr of expr;
+
+fun map_elem f (Elem e) = Elem (f e)
+  | map_elem _ (Expr e) = Expr e;
+
+type decl = declaration * stamp;
+
+type locale =
+ {axiom: Element.witness list,
+    (* For locales that define predicates this is [A [A]], where A is the locale
+       specification.  Otherwise [].
+       Only required to generate the right witnesses for locales with predicates. *)
+  elems: (Element.context_i * stamp) list,
+    (* Static content, neither Fixes nor Constrains elements *)
+  params: ((string * typ) * mixfix) list,                        (*all term params*)
+  decls: decl list * decl list,                    (*type/term_syntax declarations*)
+  regs: ((string * string list) * Element.witness list) list,
+    (* Registrations: indentifiers and witnesses of locales interpreted in the locale. *)
+  intros: thm list * thm list,
+    (* Introduction rules: of delta predicate and locale predicate. *)
+  dests: thm list}
+    (* Destruction rules: projections from locale predicate to predicates of fragments. *)
+
+(* CB: an internal (Int) locale element was either imported or included,
+   an external (Ext) element appears directly in the locale text. *)
+
+datatype ('a, 'b) int_ext = Int of 'a | Ext of 'b;
+
+
+
+(** substitutions on Vars -- clone from element.ML **)
+
+(* instantiate types *)
+
+fun var_instT_type env =
+  if Vartab.is_empty env then I
+  else Term.map_type_tvar (fn (x, S) => the_default (TVar (x, S)) (Vartab.lookup env x));
+
+fun var_instT_term env =
+  if Vartab.is_empty env then I
+  else Term.map_types (var_instT_type env);
+
+fun var_inst_term (envT, env) =
+  if Vartab.is_empty env then var_instT_term envT
+  else
+    let
+      val instT = var_instT_type envT;
+      fun inst (Const (x, T)) = Const (x, instT T)
+        | inst (Free (x, T)) = Free(x, instT T)
+        | inst (Var (xi, T)) =
+            (case Vartab.lookup env xi of
+              NONE => Var (xi, instT T)
+            | SOME t => t)
+        | inst (b as Bound _) = b
+        | inst (Abs (x, T, t)) = Abs (x, instT T, inst t)
+        | inst (t $ u) = inst t $ inst u;
+    in Envir.beta_norm o inst end;
+
+
+(** management of registrations in theories and proof contexts **)
+
+type registration =
+  {prfx: (Binding.T -> Binding.T) * (string * string),
+      (* first component: interpretation name morphism;
+         second component: parameter prefix *)
+    exp: Morphism.morphism,
+      (* maps content to its originating context *)
+    imp: (typ Vartab.table * typ list) * (term Vartab.table * term list),
+      (* inverse of exp *)
+    wits: Element.witness list,
+      (* witnesses of the registration *)
+    eqns: thm Termtab.table,
+      (* theorems (equations) interpreting derived concepts and indexed by lhs *)
+    morph: unit
+      (* interpreting morphism *)
+  }
+
+structure Registrations :
+  sig
+    type T
+    val empty: T
+    val join: T * T -> T
+    val dest: theory -> T ->
+      (term list *
+        (((Binding.T -> Binding.T) * (string * string)) *
+         (Morphism.morphism * ((typ Vartab.table * typ list) * (term Vartab.table * term list))) *
+         Element.witness list *
+         thm Termtab.table)) list
+    val test: theory -> T * term list -> bool
+    val lookup: theory ->
+      T * (term list * ((typ Vartab.table * typ list) * (term Vartab.table * term list))) ->
+      (((Binding.T -> Binding.T) * (string * string)) * Element.witness list * thm Termtab.table) option
+    val insert: theory -> term list -> ((Binding.T -> Binding.T) * (string * string)) ->
+      (Morphism.morphism * ((typ Vartab.table * typ list) * (term Vartab.table * term list))) ->
+      T ->
+      T * (term list * (((Binding.T -> Binding.T) * (string * string)) * Element.witness list)) list
+    val add_witness: term list -> Element.witness -> T -> T
+    val add_equation: term list -> thm -> T -> T
+(*
+    val update_morph: term list -> Morphism.morphism -> T -> T
+    val get_morph: theory -> T ->
+      term list * ((typ Vartab.table * typ list) * (term Vartab.table * term list)) ->
+      Morphism.morphism
+*)
+  end =
+struct
+  (* A registration is indexed by parameter instantiation.
+     NB: index is exported whereas content is internalised. *)
+  type T = registration Termtab.table;
+
+  fun mk_reg prfx exp imp wits eqns morph =
+    {prfx = prfx, exp = exp, imp = imp, wits = wits, eqns = eqns, morph = morph};
+
+  fun map_reg f reg =
+    let
+      val {prfx, exp, imp, wits, eqns, morph} = reg;
+      val (prfx', exp', imp', wits', eqns', morph') = f (prfx, exp, imp, wits, eqns, morph);
+    in mk_reg prfx' exp' imp' wits' eqns' morph' end;
+
+  val empty = Termtab.empty;
+
+  (* term list represented as single term, for simultaneous matching *)
+  fun termify ts =
+    Term.list_comb (Const ("", map fastype_of ts ---> propT), ts);
+  fun untermify t =
+    let fun ut (Const _) ts = ts
+          | ut (s $ t) ts = ut s (t::ts)
+    in ut t [] end;
+
+  (* joining of registrations:
+     - prefix and morphisms of right theory;
+     - witnesses are equal, no attempt to subsumption testing;
+     - union of equalities, if conflicting (i.e. two eqns with equal lhs)
+       eqn of right theory takes precedence *)
+  fun join (r1, r2) = Termtab.join (fn _ => fn ({eqns = e1, ...}, {prfx = n, exp, imp, wits = w, eqns = e2, morph = m}) =>
+      mk_reg n exp imp w (Termtab.join (fn _ => fn (_, e) => e) (e1, e2)) m) (r1, r2);
+
+  fun dest_transfer thy regs =
+    Termtab.dest regs |> map (apsnd (map_reg (fn (n, e, i, ws, es, m) =>
+      (n, e, i, map (Element.transfer_witness thy) ws, Termtab.map (transfer thy) es, m))));
+
+  fun dest thy regs = dest_transfer thy regs |> map (apfst untermify) |>
+    map (apsnd (fn {prfx, exp, imp, wits, eqns, ...} => (prfx, (exp, imp), wits, eqns)));
+
+  (* registrations that subsume t *)
+  fun subsumers thy t regs =
+    filter (fn (t', _) => Pattern.matches thy (t', t)) (dest_transfer thy regs);
+
+  (* test if registration that subsumes the query is present *)
+  fun test thy (regs, ts) =
+    not (null (subsumers thy (termify ts) regs));
+      
+  (* look up registration, pick one that subsumes the query *)
+  fun lookup thy (regs, (ts, ((impT, _), (imp, _)))) =
+    let
+      val t = termify ts;
+      val subs = subsumers thy t regs;
+    in
+      (case subs of
+        [] => NONE
+        | ((t', {prfx, exp = exp', imp = ((impT', domT'), (imp', dom')), wits, eqns, morph}) :: _) =>
+          let
+            val (tinst, inst) = Pattern.match thy (t', t) (Vartab.empty, Vartab.empty);
+            val tinst' = domT' |> map (fn (T as TFree (x, _)) =>
+                (x, T |> Morphism.typ exp' |> Envir.typ_subst_TVars tinst
+                      |> var_instT_type impT)) |> Symtab.make;
+            val inst' = dom' |> map (fn (t as Free (x, _)) =>
+                (x, t |> Morphism.term exp' |> Envir.subst_vars (tinst, inst)
+                      |> var_inst_term (impT, imp))) |> Symtab.make;
+            val inst'_morph = Element.inst_morphism thy (tinst', inst');
+          in SOME (prfx,
+            map (Element.morph_witness inst'_morph) wits,
+            Termtab.map (Morphism.thm inst'_morph) eqns)
+          end)
+    end;
+
+  (* add registration if not subsumed by ones already present,
+     additionally returns registrations that are strictly subsumed *)
+  fun insert thy ts prfx (exp, imp) regs =
+    let
+      val t = termify ts;
+      val subs = subsumers thy t regs ;
+    in (case subs of
+        [] => let
+                val sups =
+                  filter (fn (t', _) => Pattern.matches thy (t, t')) (dest_transfer thy regs);
+                val sups' = map (apfst untermify) sups |> map (fn (ts, {prfx, wits, ...}) => (ts, (prfx, wits)))
+              in (Termtab.update (t, mk_reg prfx exp imp [] Termtab.empty ()) regs, sups') end
+      | _ => (regs, []))
+    end;
+
+  fun gen_add f ts regs =
+    let
+      val t = termify ts;
+    in
+      Termtab.update (t, map_reg f (the (Termtab.lookup regs t))) regs
+    end;
+
+  (* add witness theorem to registration,
+     only if instantiation is exact, otherwise exception Option raised *)
+  fun add_witness ts wit regs =
+    gen_add (fn (x, e, i, wits, eqns, m) => (x, e, i, Element.close_witness wit :: wits, eqns, m))
+      ts regs;
+
+  (* add equation to registration, replaces previous equation with same lhs;
+     only if instantiation is exact, otherwise exception Option raised;
+     exception TERM raised if not a meta equality *)
+  fun add_equation ts thm regs =
+    gen_add (fn (x, e, i, thms, eqns, m) =>
+      (x, e, i, thms, Termtab.update (thm |> prop_of |> Logic.dest_equals |> fst, Thm.close_derivation thm) eqns, m))
+      ts regs;
+
+end;
+
+
+(** theory data : locales **)
+
+structure LocalesData = TheoryDataFun
+(
+  type T = NameSpace.T * locale Symtab.table;
+    (* 1st entry: locale namespace,
+       2nd entry: locales of the theory *)
+
+  val empty = NameSpace.empty_table;
+  val copy = I;
+  val extend = I;
+
+  fun join_locales _
+    ({axiom, elems, params, decls = (decls1, decls2), regs, intros, dests}: locale,
+      {elems = elems', decls = (decls1', decls2'), regs = regs', ...}: locale) =
+     {axiom = axiom,
+      elems = merge_lists (eq_snd (op =)) elems elems',
+      params = params,
+      decls =
+       (Library.merge (eq_snd (op =)) (decls1, decls1'),
+        Library.merge (eq_snd (op =)) (decls2, decls2')),
+      regs = merge_alists (op =) regs regs',
+      intros = intros,
+      dests = dests};
+  fun merge _ = NameSpace.join_tables join_locales;
+);
+
+
+
+(** context data : registrations **)
+
+structure RegistrationsData = GenericDataFun
+(
+  type T = Registrations.T Symtab.table;  (*registrations, indexed by locale name*)
+  val empty = Symtab.empty;
+  val extend = I;
+  fun merge _ = Symtab.join (K Registrations.join);
+);
+
+
+(** access locales **)
+
+val intern = NameSpace.intern o #1 o LocalesData.get;
+val extern = NameSpace.extern o #1 o LocalesData.get;
+
+fun get_locale thy name = Symtab.lookup (#2 (LocalesData.get thy)) name;
+
+fun the_locale thy name = case get_locale thy name
+ of SOME loc => loc
+  | NONE => error ("Unknown locale " ^ quote name);
+
+fun register_locale bname loc thy =
+  thy |> LocalesData.map (NameSpace.bind (Sign.naming_of thy)
+    (Binding.name bname, loc) #> snd);
+
+fun change_locale name f thy =
+  let
+    val {axiom, elems, params, decls, regs, intros, dests} =
+        the_locale thy name;
+    val (axiom', elems', params', decls', regs', intros', dests') =
+      f (axiom, elems, params, decls, regs, intros, dests);
+  in
+    thy
+    |> (LocalesData.map o apsnd) (Symtab.update (name, {axiom = axiom',
+          elems = elems', params = params',
+          decls = decls', regs = regs', intros = intros', dests = dests'}))
+  end;
+
+fun print_locales thy =
+  let val (space, locs) = LocalesData.get thy in
+    Pretty.strs ("locales:" :: map #1 (NameSpace.extern_table (space, locs)))
+    |> Pretty.writeln
+  end;
+
+
+(* access registrations *)
+
+(* retrieve registration from theory or context *)
+
+fun get_registrations ctxt name =
+  case Symtab.lookup (RegistrationsData.get ctxt) name of
+      NONE => []
+    | SOME reg => Registrations.dest (Context.theory_of ctxt) reg;
+
+fun get_global_registrations thy = get_registrations (Context.Theory thy);
+fun get_local_registrations ctxt = get_registrations (Context.Proof ctxt);
+
+
+fun get_registration ctxt imprt (name, ps) =
+  case Symtab.lookup (RegistrationsData.get ctxt) name of
+      NONE => NONE
+    | SOME reg => Registrations.lookup (Context.theory_of ctxt) (reg, (ps, imprt));
+
+fun get_global_registration thy = get_registration (Context.Theory thy);
+fun get_local_registration ctxt = get_registration (Context.Proof ctxt);
+
+
+fun test_registration ctxt (name, ps) =
+  case Symtab.lookup (RegistrationsData.get ctxt) name of
+      NONE => false
+    | SOME reg => Registrations.test (Context.theory_of ctxt) (reg, ps);
+
+fun test_global_registration thy = test_registration (Context.Theory thy);
+fun test_local_registration ctxt = test_registration (Context.Proof ctxt);
+
+
+(* add registration to theory or context, ignored if subsumed *)
+
+fun put_registration (name, ps) prfx morphs ctxt =
+  RegistrationsData.map (fn regs =>
+    let
+      val thy = Context.theory_of ctxt;
+      val reg = the_default Registrations.empty (Symtab.lookup regs name);
+      val (reg', sups) = Registrations.insert thy ps prfx morphs reg;
+      val _ = if not (null sups) then warning
+                ("Subsumed interpretation(s) of locale " ^
+                 quote (extern thy name) ^
+                 "\nwith the following prefix(es):" ^
+                  commas_quote (map (fn (_, ((_, (_, s)), _)) => s) sups))
+              else ();
+    in Symtab.update (name, reg') regs end) ctxt;
+
+fun put_global_registration id prfx morphs =
+  Context.theory_map (put_registration id prfx morphs);
+fun put_local_registration id prfx morphs =
+  Context.proof_map (put_registration id prfx morphs);
+
+fun put_registration_in_locale name id =
+  change_locale name (fn (axiom, elems, params, decls, regs, intros, dests) =>
+    (axiom, elems, params, decls, regs @ [(id, [])], intros, dests));
+
+
+(* add witness theorem to registration, ignored if registration not present *)
+
+fun add_witness (name, ps) thm =
+  RegistrationsData.map (Symtab.map_entry name (Registrations.add_witness ps thm));
+
+fun add_global_witness id thm = Context.theory_map (add_witness id thm);
+fun add_local_witness id thm = Context.proof_map (add_witness id thm);
+
+
+fun add_witness_in_locale name id thm =
+  change_locale name (fn (axiom, elems, params, decls, regs, intros, dests) =>
+    let
+      fun add (id', thms) =
+        if id = id' then (id', thm :: thms) else (id', thms);
+    in (axiom, elems, params, decls, map add regs, intros, dests) end);
+
+
+(* add equation to registration, ignored if registration not present *)
+
+fun add_equation (name, ps) thm =
+  RegistrationsData.map (Symtab.map_entry name (Registrations.add_equation ps thm));
+
+fun add_global_equation id thm = Context.theory_map (add_equation id thm);
+fun add_local_equation id thm = Context.proof_map (add_equation id thm);
+
+(*
+(* update morphism of registration, ignored if registration not present *)
+
+fun update_morph (name, ps) morph =
+  RegistrationsData.map (Symtab.map_entry name (Registrations.update_morph ps morph));
+
+fun update_global_morph id morph = Context.theory_map (update_morph id morph);
+fun update_local_morph id morph = Context.proof_map (update_morph id morph);
+*)
+
+
+(* printing of registrations *)
+
+fun print_registrations show_wits loc ctxt =
+  let
+    val thy = ProofContext.theory_of ctxt;
+    val prt_term = Pretty.quote o Syntax.pretty_term ctxt;
+    fun prt_term' t = if !show_types
+          then Pretty.block [prt_term t, Pretty.brk 1, Pretty.str "::",
+            Pretty.brk 1, (Pretty.quote o Syntax.pretty_typ ctxt) (type_of t)]
+          else prt_term t;
+    val prt_thm = prt_term o prop_of;
+    fun prt_inst ts =
+        Pretty.enclose "(" ")" (Pretty.breaks (map prt_term' ts));
+    fun prt_prfx ((false, prfx), param_prfx) = [Pretty.str prfx, Pretty.brk 1, Pretty.str "(optional)", Pretty.brk 1, Pretty.str param_prfx]
+      | prt_prfx ((true, prfx), param_prfx) = [Pretty.str prfx, Pretty.brk 1, Pretty.str param_prfx];
+    fun prt_eqns [] = Pretty.str "no equations."
+      | prt_eqns eqns = Pretty.block (Pretty.str "equations:" :: Pretty.brk 1 ::
+          Pretty.breaks (map prt_thm eqns));
+    fun prt_core ts eqns =
+          [prt_inst ts, Pretty.fbrk, prt_eqns (Termtab.dest eqns |> map snd)];
+    fun prt_witns [] = Pretty.str "no witnesses."
+      | prt_witns witns = Pretty.block (Pretty.str "witnesses:" :: Pretty.brk 1 ::
+          Pretty.breaks (map (Element.pretty_witness ctxt) witns))
+    fun prt_reg (ts, (_, _, witns, eqns)) =
+        if show_wits
+          then Pretty.block (prt_core ts eqns @ [Pretty.fbrk, prt_witns witns])
+          else Pretty.block (prt_core ts eqns)
+
+    val loc_int = intern thy loc;
+    val regs = RegistrationsData.get (Context.Proof ctxt);
+    val loc_regs = Symtab.lookup regs loc_int;
+  in
+    (case loc_regs of
+        NONE => Pretty.str ("no interpretations")
+      | SOME r => let
+            val r' = Registrations.dest thy r;
+            val r'' = Library.sort_wrt (fn (_, ((_, (_, prfx)), _, _, _)) => prfx) r';
+          in Pretty.big_list ("interpretations:") (map prt_reg r'') end)
+    |> Pretty.writeln
+  end;
+
+
+(* diagnostics *)
+
+fun err_in_locale ctxt msg ids =
+  let
+    val thy = ProofContext.theory_of ctxt;
+    fun prt_id (name, parms) =
+      [Pretty.block (Pretty.breaks (map Pretty.str (extern thy name :: parms)))];
+    val prt_ids = flat (separate [Pretty.str " +", Pretty.brk 1] (map prt_id ids));
+    val err_msg =
+      if forall (fn (s, _) => s = "") ids then msg
+      else msg ^ "\n" ^ Pretty.string_of (Pretty.block
+        (Pretty.str "The error(s) above occurred in locale:" :: Pretty.brk 1 :: prt_ids));
+  in error err_msg end;
+
+fun err_in_locale' ctxt msg ids' = err_in_locale ctxt msg (map fst ids');
+
+
+fun pretty_ren NONE = Pretty.str "_"
+  | pretty_ren (SOME (x, NONE)) = Pretty.str x
+  | pretty_ren (SOME (x, SOME syn)) =
+      Pretty.block [Pretty.str x, Pretty.brk 1, Syntax.pretty_mixfix syn];
+
+fun pretty_expr thy (Locale name) = Pretty.str (extern thy name)
+  | pretty_expr thy (Rename (expr, xs)) =
+      Pretty.block [pretty_expr thy expr, Pretty.brk 1, Pretty.block (map pretty_ren xs |> Pretty.breaks)]
+  | pretty_expr thy (Merge es) =
+      Pretty.separate "+" (map (pretty_expr thy) es) |> Pretty.block;
+
+fun err_in_expr _ msg (Merge []) = error msg
+  | err_in_expr ctxt msg expr =
+    error (msg ^ "\n" ^ Pretty.string_of (Pretty.block
+      [Pretty.str "The error(s) above occured in locale expression:", Pretty.brk 1,
+       pretty_expr (ProofContext.theory_of ctxt) expr]));
+
+
+(** structured contexts: rename + merge + implicit type instantiation **)
+
+(* parameter types *)
+
+fun frozen_tvars ctxt Ts =
+  #1 (Variable.importT_inst (map Logic.mk_type Ts) ctxt)
+  |> map (fn ((xi, S), T) => (xi, (S, T)));
+
+fun unify_frozen ctxt maxidx Ts Us =
+  let
+    fun paramify NONE i = (NONE, i)
+      | paramify (SOME T) i = apfst SOME (TypeInfer.paramify_dummies T i);
+
+    val (Ts', maxidx') = fold_map paramify Ts maxidx;
+    val (Us', maxidx'') = fold_map paramify Us maxidx';
+    val thy = ProofContext.theory_of ctxt;
+
+    fun unify (SOME T, SOME U) env = (Sign.typ_unify thy (U, T) env
+          handle Type.TUNIFY => raise TYPE ("unify_frozen: failed to unify types", [U, T], []))
+      | unify _ env = env;
+    val (unifier, _) = fold unify (Ts' ~~ Us') (Vartab.empty, maxidx'');
+    val Vs = map (Option.map (Envir.norm_type unifier)) Us';
+    val unifier' = fold Vartab.update_new (frozen_tvars ctxt (map_filter I Vs)) unifier;
+  in map (Option.map (Envir.norm_type unifier')) Vs end;
+
+fun params_of elemss =
+  distinct (eq_fst (op = : string * string -> bool)) (maps (snd o fst) elemss);
+
+fun params_of' elemss =
+  distinct (eq_fst (op = : string * string -> bool)) (maps (snd o fst o fst) elemss);
+
+fun param_prefix locale_name params = (NameSpace.base locale_name ^ "_locale", space_implode "_" params);
+
+
+(* CB: param_types has the following type:
+  ('a * 'b option) list -> ('a * 'b) list *)
+fun param_types ps = map_filter (fn (_, NONE) => NONE | (x, SOME T) => SOME (x, T)) ps;
+
+
+fun merge_syntax ctxt ids ss = Symtab.merge (op = : mixfix * mixfix -> bool) ss
+  handle Symtab.DUP x => err_in_locale ctxt
+    ("Conflicting syntax for parameter: " ^ quote x) (map fst ids);
+
+
+(* Distinction of assumed vs. derived identifiers.
+   The former may have axioms relating assumptions of the context to
+   assumptions of the specification fragment (for locales with
+   predicates).  The latter have witnesses relating assumptions of the
+   specification fragment to assumptions of other (assumed) specification
+   fragments. *)
+
+datatype 'a mode = Assumed of 'a | Derived of 'a;
+
+fun map_mode f (Assumed x) = Assumed (f x)
+  | map_mode f (Derived x) = Derived (f x);
+
+
+(* flatten expressions *)
+
+local
+
+fun unify_parms ctxt fixed_parms raw_parmss =
+  let
+    val thy = ProofContext.theory_of ctxt;
+    val maxidx = length raw_parmss;
+    val idx_parmss = (0 upto maxidx - 1) ~~ raw_parmss;
+
+    fun varify i = Term.map_type_tfree (fn (a, S) => TVar ((a, i), S));
+    fun varify_parms (i, ps) = map (apsnd (varify i)) (param_types ps);
+    val parms = fixed_parms @ maps varify_parms idx_parmss;
+
+    fun unify T U envir = Sign.typ_unify thy (U, T) envir
+      handle Type.TUNIFY =>
+        let
+          val T' = Envir.norm_type (fst envir) T;
+          val U' = Envir.norm_type (fst envir) U;
+          val prt = Syntax.string_of_typ ctxt;
+        in
+          raise TYPE ("unify_parms: failed to unify types " ^
+            prt U' ^ " and " ^ prt T', [U', T'], [])
+        end;
+    fun unify_list (T :: Us) = fold (unify T) Us
+      | unify_list [] = I;
+    val (unifier, _) = fold unify_list (map #2 (Symtab.dest (Symtab.make_list parms)))
+      (Vartab.empty, maxidx);
+
+    val parms' = map (apsnd (Envir.norm_type unifier)) (distinct (eq_fst (op =)) parms);
+    val unifier' = fold Vartab.update_new (frozen_tvars ctxt (map #2 parms')) unifier;
+
+    fun inst_parms (i, ps) =
+      List.foldr OldTerm.add_typ_tfrees [] (map_filter snd ps)
+      |> map_filter (fn (a, S) =>
+          let val T = Envir.norm_type unifier' (TVar ((a, i), S))
+          in if T = TFree (a, S) then NONE else SOME (a, T) end)
+      |> Symtab.make;
+  in map inst_parms idx_parmss end;
+
+in
+
+fun unify_elemss _ _ [] = []
+  | unify_elemss _ [] [elems] = [elems]
+  | unify_elemss ctxt fixed_parms elemss =
+      let
+        val thy = ProofContext.theory_of ctxt;
+        val phis = unify_parms ctxt fixed_parms (map (snd o fst o fst) elemss)
+          |> map (Element.instT_morphism thy);
+        fun inst ((((name, ps), mode), elems), phi) =
+          (((name, map (apsnd (Option.map (Morphism.typ phi))) ps),
+              map_mode (map (Element.morph_witness phi)) mode),
+            map (Element.morph_ctxt phi) elems);
+      in map inst (elemss ~~ phis) end;
+
+
+fun renaming xs parms = zip_options parms xs
+  handle Library.UnequalLengths =>
+    error ("Too many arguments in renaming: " ^
+      commas (map (fn NONE => "_" | SOME x => quote (fst x)) xs));
+
+
+(* params_of_expr:
+   Compute parameters (with types and syntax) of locale expression.
+*)
+
+fun params_of_expr ctxt fixed_params expr (prev_parms, prev_types, prev_syn) =
+  let
+    val thy = ProofContext.theory_of ctxt;
+
+    fun merge_tenvs fixed tenv1 tenv2 =
+        let
+          val [env1, env2] = unify_parms ctxt fixed
+                [tenv1 |> Symtab.dest |> map (apsnd SOME),
+                 tenv2 |> Symtab.dest |> map (apsnd SOME)]
+        in
+          Symtab.merge (op =) (Symtab.map (Element.instT_type env1) tenv1,
+            Symtab.map (Element.instT_type env2) tenv2)
+        end;
+
+    fun merge_syn expr syn1 syn2 =
+        Symtab.merge (op = : mixfix * mixfix -> bool) (syn1, syn2)
+        handle Symtab.DUP x => err_in_expr ctxt
+          ("Conflicting syntax for parameter: " ^ quote x) expr;
+
+    fun params_of (expr as Locale name) =
+          let
+            val {params, ...} = the_locale thy name;
+          in (map (fst o fst) params, params |> map fst |> Symtab.make,
+               params |> map (apfst fst) |> Symtab.make) end
+      | params_of (expr as Rename (e, xs)) =
+          let
+            val (parms', types', syn') = params_of e;
+            val ren = renaming xs parms';
+            (* renaming may reduce number of parameters *)
+            val new_parms = map (Element.rename ren) parms' |> distinct (op =);
+            val ren_syn = syn' |> Symtab.dest |> map (Element.rename_var_name ren);
+            val new_syn = fold (Symtab.insert (op =)) ren_syn Symtab.empty
+                handle Symtab.DUP x =>
+                  err_in_expr ctxt ("Conflicting syntax for parameter: " ^ quote x) expr;
+            val syn_types = map (apsnd (fn mx =>
+                SOME (Type.freeze_type (#1 (TypeInfer.paramify_dummies (Syntax.mixfixT mx) 0)))))
+              (Symtab.dest new_syn);
+            val ren_types = types' |> Symtab.dest |> map (apfst (Element.rename ren));
+            val (env :: _) = unify_parms ctxt []
+                ((ren_types |> map (apsnd SOME)) :: map single syn_types);
+            val new_types = fold (Symtab.insert (op =))
+                (map (apsnd (Element.instT_type env)) ren_types) Symtab.empty;
+          in (new_parms, new_types, new_syn) end
+      | params_of (Merge es) =
+          fold (fn e => fn (parms, types, syn) =>
+                   let
+                     val (parms', types', syn') = params_of e
+                   in
+                     (merge_lists (op =) parms parms', merge_tenvs [] types types',
+                      merge_syn e syn syn')
+                   end)
+            es ([], Symtab.empty, Symtab.empty)
+
+      val (parms, types, syn) = params_of expr;
+    in
+      (merge_lists (op =) prev_parms parms, merge_tenvs fixed_params prev_types types,
+       merge_syn expr prev_syn syn)
+    end;
+
+fun make_params_ids params = [(("", params), ([], Assumed []))];
+fun make_raw_params_elemss (params, tenv, syn) =
+    [((("", map (fn p => (p, Symtab.lookup tenv p)) params), Assumed []),
+      Int [Fixes (map (fn p =>
+        (Binding.name p, Symtab.lookup tenv p, Symtab.lookup syn p |> the)) params)])];
+
+
+(* flatten_expr:
+   Extend list of identifiers by those new in locale expression expr.
+   Compute corresponding list of lists of locale elements (one entry per
+   identifier).
+
+   Identifiers represent locale fragments and are in an extended form:
+     ((name, ps), (ax_ps, axs))
+   (name, ps) is the locale name with all its parameters.
+   (ax_ps, axs) is the locale axioms with its parameters;
+     axs are always taken from the top level of the locale hierarchy,
+     hence axioms may contain additional parameters from later fragments:
+     ps subset of ax_ps.  axs is either singleton or empty.
+
+   Elements are enriched by identifier-like information:
+     (((name, ax_ps), axs), elems)
+   The parameters in ax_ps are the axiom parameters, but enriched by type
+   info: now each entry is a pair of string and typ option.  Axioms are
+   type-instantiated.
+
+*)
+
+fun flatten_expr ctxt ((prev_idents, prev_syntax), expr) =
+  let
+    val thy = ProofContext.theory_of ctxt;
+
+    fun rename_parms top ren ((name, ps), (parms, mode)) =
+        ((name, map (Element.rename ren) ps),
+         if top
+         then (map (Element.rename ren) parms,
+               map_mode (map (Element.morph_witness (Element.rename_morphism ren))) mode)
+         else (parms, mode));
+
+    (* add (name, pTs) and its registrations, recursively; adjust hyps of witnesses *)
+
+    fun add_with_regs ((name, pTs), mode) (wits, ids, visited) =
+        if member (fn (a, (b, _)) => a = b) visited (name, map #1 pTs)
+        then (wits, ids, visited)
+        else
+          let
+            val {params, regs, ...} = the_locale thy name;
+            val pTs' = map #1 params;
+            val ren = map #1 pTs' ~~ map (fn (x, _) => (x, NONE)) pTs;
+              (* dummy syntax, since required by rename *)
+            val pTs'' = map (fn ((p, _), (_, T)) => (p, T)) (pTs ~~ pTs');
+            val [env] = unify_parms ctxt pTs [map (apsnd SOME) pTs''];
+              (* propagate parameter types, to keep them consistent *)
+            val regs' = map (fn ((name, ps), wits) =>
+                ((name, map (Element.rename ren) ps),
+                 map (Element.transfer_witness thy) wits)) regs;
+            val new_regs = regs';
+            val new_ids = map fst new_regs;
+            val new_idTs =
+              map (apsnd (map (fn p => (p, (the o AList.lookup (op =) pTs) p)))) new_ids;
+
+            val new_wits = new_regs |> map (#2 #> map
+              (Element.morph_witness
+                (Element.instT_morphism thy env $>
+                  Element.rename_morphism ren $>
+                  Element.satisfy_morphism wits)
+                #> Element.close_witness));
+            val new_ids' = map (fn (id, wits) =>
+                (id, ([], Derived wits))) (new_ids ~~ new_wits);
+            val new_idTs' = map (fn ((n, pTs), (_, ([], mode))) =>
+                ((n, pTs), mode)) (new_idTs ~~ new_ids');
+            val new_id = ((name, map #1 pTs), ([], mode));
+            val (wits', ids', visited') = fold add_with_regs new_idTs'
+              (wits @ flat new_wits, ids, visited @ [new_id]);
+          in
+            (wits', ids' @ [new_id], visited')
+          end;
+
+    (* distribute top-level axioms over assumed ids *)
+
+    fun axiomify all_ps ((name, parms), (_, Assumed _)) axioms =
+        let
+          val {elems, ...} = the_locale thy name;
+          val ts = maps
+            (fn (Assumes asms, _) => maps (map #1 o #2) asms
+              | _ => [])
+            elems;
+          val (axs1, axs2) = chop (length ts) axioms;
+        in (((name, parms), (all_ps, Assumed axs1)), axs2) end
+      | axiomify all_ps (id, (_, Derived ths)) axioms =
+          ((id, (all_ps, Derived ths)), axioms);
+
+    (* identifiers of an expression *)
+
+    fun identify top (Locale name) =
+    (* CB: ids_ax is a list of tuples of the form ((name, ps), axs),
+       where name is a locale name, ps a list of parameter names and axs
+       a list of axioms relating to the identifier, axs is empty unless
+       identify at top level (top = true);
+       parms is accumulated list of parameters *)
+          let
+            val {axiom, params, ...} = the_locale thy name;
+            val ps = map (#1 o #1) params;
+            val (_, ids'', _) = add_with_regs ((name, map #1 params), Assumed []) ([], [], []);
+            val ids_ax = if top then fst (fold_map (axiomify ps) ids'' axiom) else ids'';
+            in (ids_ax, ps) end
+      | identify top (Rename (e, xs)) =
+          let
+            val (ids', parms') = identify top e;
+            val ren = renaming xs parms'
+              handle ERROR msg => err_in_locale' ctxt msg ids';
+
+            val ids'' = distinct (eq_fst (op =)) (map (rename_parms top ren) ids');
+            val parms'' = distinct (op =) (maps (#2 o #1) ids'');
+          in (ids'', parms'') end
+      | identify top (Merge es) =
+          fold (fn e => fn (ids, parms) =>
+                   let
+                     val (ids', parms') = identify top e
+                   in
+                     (merge_alists (op =) ids ids', merge_lists (op =) parms parms')
+                   end)
+            es ([], []);
+
+    fun inst_wit all_params (t, th) = let
+         val {hyps, prop, ...} = Thm.rep_thm th;
+         val ps = map (apsnd SOME) (fold Term.add_frees (prop :: hyps) []);
+         val [env] = unify_parms ctxt all_params [ps];
+         val t' = Element.instT_term env t;
+         val th' = Element.instT_thm thy env th;
+       in (t', th') end;
+
+    fun eval all_params tenv syn ((name, params), (locale_params, mode)) =
+      let
+        val {params = ps_mx, elems = elems_stamped, ...} = the_locale thy name;
+        val elems = map fst elems_stamped;
+        val ps = map fst ps_mx;
+        fun lookup_syn x = (case Symtab.lookup syn x of SOME Structure => NONE | opt => opt);
+        val locale_params' = map (fn p => (p, Symtab.lookup tenv p |> the)) locale_params;
+        val mode' = map_mode (map (Element.map_witness (inst_wit all_params))) mode;
+        val ren = map fst ps ~~ map (fn p => (p, lookup_syn p)) params;
+        val [env] = unify_parms ctxt all_params [map (apfst (Element.rename ren) o apsnd SOME) ps];
+        val (lprfx, pprfx) = param_prefix name params;
+        val add_prefices = pprfx <> "" ? Binding.add_prefix false pprfx
+          #> Binding.add_prefix false lprfx;
+        val elem_morphism =
+          Element.rename_morphism ren $>
+          Morphism.binding_morphism add_prefices $>
+          Element.instT_morphism thy env;
+        val elems' = map (Element.morph_ctxt elem_morphism) elems;
+      in (((name, map (apsnd SOME) locale_params'), mode'), elems') end;
+
+    (* parameters, their types and syntax *)
+    val (all_params', tenv, syn) = params_of_expr ctxt [] expr ([], Symtab.empty, Symtab.empty);
+    val all_params = map (fn p => (p, Symtab.lookup tenv p |> the)) all_params';
+    (* compute identifiers and syntax, merge with previous ones *)
+    val (ids, _) = identify true expr;
+    val idents = subtract (eq_fst (op =)) prev_idents ids;
+    val syntax = merge_syntax ctxt ids (syn, prev_syntax);
+    (* type-instantiate elements *)
+    val final_elemss = map (eval all_params tenv syntax) idents;
+  in ((prev_idents @ idents, syntax), final_elemss) end;
+
+end;
+
+
+(* activate elements *)
+
+local
+
+fun axioms_export axs _ As =
+  (Element.satisfy_thm axs #> Drule.implies_intr_list (Library.drop (length axs, As)), fn t => t);
+
+
+(* NB: derived ids contain only facts at this stage *)
+
+fun activate_elem _ _ (Fixes fixes) (ctxt, mode) =
+      ([], (ctxt |> ProofContext.add_fixes_i fixes |> snd, mode))
+  | activate_elem _ _ (Constrains _) (ctxt, mode) =
+      ([], (ctxt, mode))
+  | activate_elem ax_in_ctxt _ (Assumes asms) (ctxt, Assumed axs) =
+      let
+        val asms' = Attrib.map_specs (Attrib.attribute_i (ProofContext.theory_of ctxt)) asms;
+        val ts = maps (map #1 o #2) asms';
+        val (ps, qs) = chop (length ts) axs;
+        val (_, ctxt') =
+          ctxt |> fold Variable.auto_fixes ts
+          |> ProofContext.add_assms_i (axioms_export (if ax_in_ctxt then ps else [])) asms';
+      in ([], (ctxt', Assumed qs)) end
+  | activate_elem _ _ (Assumes asms) (ctxt, Derived ths) =
+      ([], (ctxt, Derived ths))
+  | activate_elem _ _ (Defines defs) (ctxt, Assumed axs) =
+      let
+        val defs' = Attrib.map_specs (Attrib.attribute_i (ProofContext.theory_of ctxt)) defs;
+        val asms = defs' |> map (fn ((name, atts), (t, ps)) =>
+            let val ((c, _), t') = LocalDefs.cert_def ctxt t
+            in (t', ((Binding.map_base (Thm.def_name_optional c) name, atts), [(t', ps)])) end);
+        val (_, ctxt') =
+          ctxt |> fold (Variable.auto_fixes o #1) asms
+          |> ProofContext.add_assms_i LocalDefs.def_export (map #2 asms);
+      in ([], (ctxt', Assumed axs)) end
+  | activate_elem _ _ (Defines defs) (ctxt, Derived ths) =
+      ([], (ctxt, Derived ths))
+  | activate_elem _ is_ext (Notes (kind, facts)) (ctxt, mode) =
+      let
+        val facts' = Attrib.map_facts (Attrib.attribute_i (ProofContext.theory_of ctxt)) facts;
+        val (res, ctxt') = ctxt |> local_note_qualified kind facts';
+      in (if is_ext then (map (#1 o #1) facts' ~~ map #2 res) else [], (ctxt', mode)) end;
+
+fun activate_elems ax_in_ctxt (((name, ps), mode), elems) ctxt =
+  let
+    val thy = ProofContext.theory_of ctxt;
+    val (res, (ctxt', _)) = fold_map (activate_elem ax_in_ctxt (name = ""))
+        elems (ProofContext.qualified_names ctxt, mode)
+      handle ERROR msg => err_in_locale ctxt msg [(name, map fst ps)];
+    val ctxt'' = if name = "" then ctxt'
+          else let
+              val ps' = map (fn (n, SOME T) => Free (n, T)) ps;
+            in if test_local_registration ctxt' (name, ps') then ctxt'
+              else let
+                  val ctxt'' = put_local_registration (name, ps') (I, (NameSpace.base name, ""))
+                    (Morphism.identity, ((Vartab.empty, []), (Vartab.empty, []) )) ctxt'
+                in case mode of
+                    Assumed axs =>
+                      fold (add_local_witness (name, ps') o
+                        Element.assume_witness thy o Element.witness_prop) axs ctxt''
+                  | Derived ths =>
+                     fold (add_local_witness (name, ps')) ths ctxt''
+                end
+            end
+  in (ProofContext.restore_naming ctxt ctxt'', res) end;
+
+fun activate_elemss ax_in_ctxt prep_facts =
+    fold_map (fn (((name, ps), mode), raw_elems) => fn ctxt =>
+      let
+        val elems = map (prep_facts ctxt) raw_elems;
+        val (ctxt', res) = apsnd flat
+            (activate_elems ax_in_ctxt (((name, ps), mode), elems) ctxt);
+        val elems' = elems |> map (Element.map_ctxt_attrib Args.closure);
+      in (((((name, ps), mode), elems'), res), ctxt') end);
+
+in
+
+(* CB: activate_facts prep_facts elemss ctxt,
+   where elemss is a list of pairs consisting of identifiers and
+   context elements, extends ctxt by the context elements yielding
+   ctxt' and returns ((elemss', facts), ctxt').
+   Identifiers in the argument are of the form ((name, ps), axs) and
+   assumptions use the axioms in the identifiers to set up exporters
+   in ctxt'.  elemss' does not contain identifiers and is obtained
+   from elemss and the intermediate context with prep_facts.
+   If read_facts or cert_facts is used for prep_facts, these also remove
+   the internal/external markers from elemss. *)
+
+fun activate_facts ax_in_ctxt prep_facts args =
+  activate_elemss ax_in_ctxt prep_facts args
+  #>> (apsnd flat o split_list);
+
+end;
+
+
+
+(** prepare locale elements **)
+
+(* expressions *)
+
+fun intern_expr thy (Locale xname) = Locale (intern thy xname)
+  | intern_expr thy (Merge exprs) = Merge (map (intern_expr thy) exprs)
+  | intern_expr thy (Rename (expr, xs)) = Rename (intern_expr thy expr, xs);
+
+
+(* propositions and bindings *)
+
+(* flatten (ctxt, prep_expr) ((ids, syn), expr)
+   normalises expr (which is either a locale
+   expression or a single context element) wrt.
+   to the list ids of already accumulated identifiers.
+   It returns ((ids', syn'), elemss) where ids' is an extension of ids
+   with identifiers generated for expr, and elemss is the list of
+   context elements generated from expr.
+   syn and syn' are symtabs mapping parameter names to their syntax.  syn'
+   is an extension of syn.
+   For details, see flatten_expr.
+
+   Additionally, for a locale expression, the elems are grouped into a single
+   Int; individual context elements are marked Ext.  In this case, the
+   identifier-like information of the element is as follows:
+   - for Fixes: (("", ps), []) where the ps have type info NONE
+   - for other elements: (("", []), []).
+   The implementation of activate_facts relies on identifier names being
+   empty strings for external elements.
+*)
+
+fun flatten (ctxt, _) ((ids, syn), Elem (Fixes fixes)) = let
+        val ids' = ids @ [(("", map (Binding.base_name o #1) fixes), ([], Assumed []))]
+      in
+        ((ids',
+         merge_syntax ctxt ids'
+           (syn, Symtab.make (map (fn fx => (Binding.base_name (#1 fx), #3 fx)) fixes))
+           handle Symtab.DUP x => err_in_locale ctxt
+             ("Conflicting syntax for parameter: " ^ quote x)
+             (map #1 ids')),
+         [((("", map (rpair NONE o Binding.base_name o #1) fixes), Assumed []), Ext (Fixes fixes))])
+      end
+  | flatten _ ((ids, syn), Elem elem) =
+      ((ids @ [(("", []), ([], Assumed []))], syn), [((("", []), Assumed []), Ext elem)])
+  | flatten (ctxt, prep_expr) ((ids, syn), Expr expr) =
+      apsnd (map (apsnd Int)) (flatten_expr ctxt ((ids, syn), prep_expr expr));
+
+local
+
+local
+
+fun declare_int_elem (Fixes fixes) ctxt =
+      ([], ctxt |> ProofContext.add_fixes_i (map (fn (x, T, mx) =>
+        (x, Option.map (Term.map_type_tfree (TypeInfer.param 0)) T, mx)) fixes) |> snd)
+  | declare_int_elem _ ctxt = ([], ctxt);
+
+fun declare_ext_elem prep_vars (Fixes fixes) ctxt =
+      let val (vars, _) = prep_vars fixes ctxt
+      in ([], ctxt |> ProofContext.add_fixes_i vars |> snd) end
+  | declare_ext_elem prep_vars (Constrains csts) ctxt =
+      let val (_, ctxt') = prep_vars (map (fn (x, T) => (Binding.name x, SOME T, NoSyn)) csts) ctxt
+      in ([], ctxt') end
+  | declare_ext_elem _ (Assumes asms) ctxt = (map #2 asms, ctxt)
+  | declare_ext_elem _ (Defines defs) ctxt = (map (fn (_, (t, ps)) => [(t, ps)]) defs, ctxt)
+  | declare_ext_elem _ (Notes _) ctxt = ([], ctxt);
+
+fun declare_elems prep_vars (((name, ps), Assumed _), elems) ctxt = ((case elems
+     of Int es => fold_map declare_int_elem es ctxt
+      | Ext e => declare_ext_elem prep_vars e ctxt |>> single)
+          handle ERROR msg => err_in_locale ctxt msg [(name, map fst ps)])
+  | declare_elems _ ((_, Derived _), elems) ctxt = ([], ctxt);
+
+in
+
+fun declare_elemss prep_vars fixed_params raw_elemss ctxt =
+  let
+    (* CB: fix of type bug of goal in target with context elements.
+       Parameters new in context elements must receive types that are
+       distinct from types of parameters in target (fixed_params).  *)
+    val ctxt_with_fixed = 
+      fold Variable.declare_term (map Free fixed_params) ctxt;
+    val int_elemss =
+      raw_elemss
+      |> map_filter (fn (id, Int es) => SOME (id, es) | _ => NONE)
+      |> unify_elemss ctxt_with_fixed fixed_params;
+    val (raw_elemss', _) =
+      fold_map (curry (fn ((id, Int _), (_, es) :: elemss) => ((id, Int es), elemss) | x => x))
+        raw_elemss int_elemss;
+  in fold_map (declare_elems prep_vars) raw_elemss' ctxt end;
+
+end;
+
+local
+
+val norm_term = Envir.beta_norm oo Term.subst_atomic;
+
+fun abstract_thm thy eq =
+  Thm.assume (Thm.cterm_of thy eq) |> Drule.gen_all |> Drule.abs_def;
+
+fun bind_def ctxt (name, ps) eq (xs, env, ths) =
+  let
+    val ((y, T), b) = LocalDefs.abs_def eq;
+    val b' = norm_term env b;
+    val th = abstract_thm (ProofContext.theory_of ctxt) eq;
+    fun err msg = err_in_locale ctxt (msg ^ ": " ^ quote y) [(name, map fst ps)];
+  in
+    exists (fn (x, _) => x = y) xs andalso
+      err "Attempt to define previously specified variable";
+    exists (fn (Free (y', _), _) => y = y' | _ => false) env andalso
+      err "Attempt to redefine variable";
+    (Term.add_frees b' xs, (Free (y, T), b') :: env, th :: ths)
+  end;
+
+
+(* CB: for finish_elems (Int and Ext),
+   extracts specification, only of assumed elements *)
+
+fun eval_text _ _ _ (Fixes _) text = text
+  | eval_text _ _ _ (Constrains _) text = text
+  | eval_text _ (_, Assumed _) is_ext (Assumes asms)
+        (((exts, exts'), (ints, ints')), (xs, env, defs)) =
+      let
+        val ts = maps (map #1 o #2) asms;
+        val ts' = map (norm_term env) ts;
+        val spec' =
+          if is_ext then ((exts @ ts, exts' @ ts'), (ints, ints'))
+          else ((exts, exts'), (ints @ ts, ints' @ ts'));
+      in (spec', (fold Term.add_frees ts' xs, env, defs)) end
+  | eval_text _ (_, Derived _) _ (Assumes _) text = text
+  | eval_text ctxt (id, Assumed _) _ (Defines defs) (spec, binds) =
+      (spec, fold (bind_def ctxt id o #1 o #2) defs binds)
+  | eval_text _ (_, Derived _) _ (Defines _) text = text
+  | eval_text _ _ _ (Notes _) text = text;
+
+
+(* for finish_elems (Int),
+   remove redundant elements of derived identifiers,
+   turn assumptions and definitions into facts,
+   satisfy hypotheses of facts *)
+
+fun finish_derived _ _ (Assumed _) (Fixes fixes) = SOME (Fixes fixes)
+  | finish_derived _ _ (Assumed _) (Constrains csts) = SOME (Constrains csts)
+  | finish_derived _ _ (Assumed _) (Assumes asms) = SOME (Assumes asms)
+  | finish_derived _ _ (Assumed _) (Defines defs) = SOME (Defines defs)
+
+  | finish_derived _ _ (Derived _) (Fixes _) = NONE
+  | finish_derived _ _ (Derived _) (Constrains _) = NONE
+  | finish_derived sign satisfy (Derived _) (Assumes asms) = asms
+      |> map (apsnd (map (fn (a, _) => ([Thm.assume (cterm_of sign a)], []))))
+      |> pair Thm.assumptionK |> Notes
+      |> Element.morph_ctxt satisfy |> SOME
+  | finish_derived sign satisfy (Derived _) (Defines defs) = defs
+      |> map (apsnd (fn (d, _) => [([Thm.assume (cterm_of sign d)], [])]))
+      |> pair Thm.definitionK |> Notes
+      |> Element.morph_ctxt satisfy |> SOME
+
+  | finish_derived _ satisfy _ (Notes facts) = Notes facts
+      |> Element.morph_ctxt satisfy |> SOME;
+
+(* CB: for finish_elems (Ext) *)
+
+fun closeup _ false elem = elem
+  | closeup ctxt true elem =
+      let
+        fun close_frees t =
+          let
+            val rev_frees =
+              Term.fold_aterms (fn Free (x, T) =>
+                if Variable.is_fixed ctxt x then I else insert (op =) (x, T) | _ => I) t [];
+          in Term.list_all_free (rev rev_frees, t) end;
+
+        fun no_binds [] = []
+          | no_binds _ = error "Illegal term bindings in locale element";
+      in
+        (case elem of
+          Assumes asms => Assumes (asms |> map (fn (a, propps) =>
+            (a, map (fn (t, ps) => (close_frees t, no_binds ps)) propps)))
+        | Defines defs => Defines (defs |> map (fn (a, (t, ps)) =>
+            (a, (close_frees (#2 (LocalDefs.cert_def ctxt t)), no_binds ps))))
+        | e => e)
+      end;
+
+
+fun finish_ext_elem parms _ (Fixes fixes, _) = Fixes (map (fn (b, _, mx) =>
+      let val x = Binding.base_name b
+      in (b, AList.lookup (op =) parms x, mx) end) fixes)
+  | finish_ext_elem parms _ (Constrains _, _) = Constrains []
+  | finish_ext_elem _ close (Assumes asms, propp) =
+      close (Assumes (map #1 asms ~~ propp))
+  | finish_ext_elem _ close (Defines defs, propp) =
+      close (Defines (map #1 defs ~~ map (fn [(t, ps)] => (t, ps)) propp))
+  | finish_ext_elem _ _ (Notes facts, _) = Notes facts;
+
+
+(* CB: finish_parms introduces type info from parms to identifiers *)
+(* CB: only needed for types that have been NONE so far???
+   If so, which are these??? *)
+
+fun finish_parms parms (((name, ps), mode), elems) =
+  (((name, map (fn (x, _) => (x, AList.lookup (op = : string * string -> bool) parms x)) ps), mode), elems);
+
+fun finish_elems ctxt parms _ ((text, wits), ((id, Int e), _)) =
+      let
+        val [(id' as (_, mode), es)] = unify_elemss ctxt parms [(id, e)];
+        val wits' = case mode of Assumed _ => wits | Derived ths => wits @ ths;
+        val text' = fold (eval_text ctxt id' false) es text;
+        val es' = map_filter
+          (finish_derived (ProofContext.theory_of ctxt) (Element.satisfy_morphism wits') mode) es;
+      in ((text', wits'), (id', map Int es')) end
+  | finish_elems ctxt parms do_close ((text, wits), ((id, Ext e), [propp])) =
+      let
+        val e' = finish_ext_elem parms (closeup ctxt do_close) (e, propp);
+        val text' = eval_text ctxt id true e' text;
+      in ((text', wits), (id, [Ext e'])) end
+
+in
+
+(* CB: only called by prep_elemss *)
+
+fun finish_elemss ctxt parms do_close =
+  foldl_map (apsnd (finish_parms parms) o finish_elems ctxt parms do_close);
+
+end;
+
+
+(* Remove duplicate Defines elements: temporary workaround to fix Afp/Category. *)
+
+fun defs_ord (defs1, defs2) =
+    list_ord (fn ((_, (d1, _)), (_, (d2, _))) =>
+      TermOrd.fast_term_ord (d1, d2)) (defs1, defs2);
+structure Defstab =
+    TableFun(type key = (Attrib.binding * (term * term list)) list val ord = defs_ord);
+
+fun rem_dup_defs es ds =
+    fold_map (fn e as (Defines defs) => (fn ds =>
+                 if Defstab.defined ds defs
+                 then (Defines [], ds)
+                 else (e, Defstab.update (defs, ()) ds))
+               | e => (fn ds => (e, ds))) es ds;
+fun rem_dup_elemss (Int es) ds = apfst Int (rem_dup_defs es ds)
+  | rem_dup_elemss (Ext e) ds = (Ext e, ds);
+fun rem_dup_defines raw_elemss =
+    fold_map (fn (id as (_, (Assumed _)), es) => (fn ds =>
+                     apfst (pair id) (rem_dup_elemss es ds))
+               | (id as (_, (Derived _)), es) => (fn ds =>
+                     ((id, es), ds))) raw_elemss Defstab.empty |> #1;
+
+(* CB: type inference and consistency checks for locales.
+
+   Works by building a context (through declare_elemss), extracting the
+   required information and adjusting the context elements (finish_elemss).
+   Can also universally close free vars in assms and defs.  This is only
+   needed for Ext elements and controlled by parameter do_close.
+
+   Only elements of assumed identifiers are considered.
+*)
+
+fun prep_elemss prep_vars prepp do_close context fixed_params raw_elemss raw_concl =
+  let
+    (* CB: contexts computed in the course of this function are discarded.
+       They are used for type inference and consistency checks only. *)
+    (* CB: fixed_params are the parameters (with types) of the target locale,
+       empty list if there is no target. *)
+    (* CB: raw_elemss are list of pairs consisting of identifiers and
+       context elements, the latter marked as internal or external. *)
+    val raw_elemss = rem_dup_defines raw_elemss;
+    val (raw_proppss, raw_ctxt) = declare_elemss prep_vars fixed_params raw_elemss context;
+    (* CB: raw_ctxt is context with additional fixed variables derived from
+       the fixes elements in raw_elemss,
+       raw_proppss contains assumptions and definitions from the
+       external elements in raw_elemss. *)
+    fun prep_prop raw_propp (raw_ctxt, raw_concl)  =
+      let
+        (* CB: add type information from fixed_params to context (declare_term) *)
+        (* CB: process patterns (conclusion and external elements only) *)
+        val (ctxt, all_propp) =
+          prepp (fold Variable.declare_term (map Free fixed_params) raw_ctxt, raw_concl @ raw_propp);
+        (* CB: add type information from conclusion and external elements to context *)
+        val ctxt = fold Variable.declare_term (maps (map fst) all_propp) ctxt;
+        (* CB: resolve schematic variables (patterns) in conclusion and external elements. *)
+        val all_propp' = map2 (curry (op ~~))
+          (#1 (#2 (ProofContext.bind_propp_schematic_i (ctxt, all_propp)))) (map (map snd) all_propp);
+        val (concl, propp) = chop (length raw_concl) all_propp';
+      in (propp, (ctxt, concl)) end
+
+    val (proppss, (ctxt, concl)) =
+      (fold_burrow o fold_burrow) prep_prop raw_proppss (raw_ctxt, raw_concl);
+
+    (* CB: obtain all parameters from identifier part of raw_elemss *)
+    val xs = map #1 (params_of' raw_elemss);
+    val typing = unify_frozen ctxt 0
+      (map (Variable.default_type raw_ctxt) xs)
+      (map (Variable.default_type ctxt) xs);
+    val parms = param_types (xs ~~ typing);
+    (* CB: parms are the parameters from raw_elemss, with correct typing. *)
+
+    (* CB: extract information from assumes and defines elements
+       (fixes, constrains and notes in raw_elemss don't have an effect on
+       text and elemss), compute final form of context elements. *)
+    val ((text, _), elemss) = finish_elemss ctxt parms do_close
+      ((((([], []), ([], [])), ([], [], [])), []), raw_elemss ~~ proppss);
+    (* CB: text has the following structure:
+           (((exts, exts'), (ints, ints')), (xs, env, defs))
+       where
+         exts: external assumptions (terms in external assumes elements)
+         exts': dito, normalised wrt. env
+         ints: internal assumptions (terms in internal assumes elements)
+         ints': dito, normalised wrt. env
+         xs: the free variables in exts' and ints' and rhss of definitions,
+           this includes parameters except defined parameters
+         env: list of term pairs encoding substitutions, where the first term
+           is a free variable; substitutions represent defines elements and
+           the rhs is normalised wrt. the previous env
+         defs: theorems representing the substitutions from defines elements
+           (thms are normalised wrt. env).
+       elemss is an updated version of raw_elemss:
+         - type info added to Fixes and modified in Constrains
+         - axiom and definition statement replaced by corresponding one
+           from proppss in Assumes and Defines
+         - Facts unchanged
+       *)
+  in ((parms, elemss, concl), text) end;
+
+in
+
+fun read_elemss x = prep_elemss ProofContext.read_vars ProofContext.read_propp_schematic x;
+fun cert_elemss x = prep_elemss ProofContext.cert_vars ProofContext.cert_propp_schematic x;
+
+end;
+
+
+(* facts and attributes *)
+
+local
+
+fun check_name name =
+  if NameSpace.is_qualified name then error ("Illegal qualified name: " ^ quote name)
+  else name;
+
+fun prep_facts _ _ _ ctxt (Int elem) = elem
+      |> Element.morph_ctxt (Morphism.thm_morphism (Thm.transfer (ProofContext.theory_of ctxt)))
+  | prep_facts prep_name get intern ctxt (Ext elem) = elem |> Element.map_ctxt
+     {var = I, typ = I, term = I,
+      binding = Binding.map_base prep_name,
+      fact = get ctxt,
+      attrib = Args.assignable o intern (ProofContext.theory_of ctxt)};
+
+in
+
+fun read_facts x = prep_facts check_name ProofContext.get_fact Attrib.intern_src x;
+fun cert_facts x = prep_facts I (K I) (K I) x;
+
+end;
+
+
+(* Get the specification of a locale *)
+
+(*The global specification is made from the parameters and global
+  assumptions, the local specification from the parameters and the
+  local assumptions.*)
+
+local
+
+fun gen_asms_of get thy name =
+  let
+    val ctxt = ProofContext.init thy;
+    val (_, raw_elemss) = flatten (ctxt, I) (([], Symtab.empty), Expr (Locale name));
+    val ((_, elemss, _), _) = read_elemss false ctxt [] raw_elemss [];
+  in
+    elemss |> get
+      |> maps (fn (_, es) => map (fn Int e => e) es)
+      |> maps (fn Assumes asms => asms | _ => [])
+      |> map (apsnd (map fst))
+  end;
+
+in
+
+fun parameters_of thy = #params o the_locale thy;
+
+fun intros thy = #intros o the_locale thy;
+  (*returns introduction rule for delta predicate and locale predicate
+    as a pair of singleton lists*)
+
+fun dests thy = #dests o the_locale thy;
+
+fun facts_of thy = map_filter (fn (Element.Notes (_, facts), _) => SOME facts
+  | _ => NONE) o #elems o the_locale thy;
+
+fun parameters_of_expr thy expr =
+  let
+    val ctxt = ProofContext.init thy;
+    val pts = params_of_expr ctxt [] (intern_expr thy expr)
+        ([], Symtab.empty, Symtab.empty);
+    val raw_params_elemss = make_raw_params_elemss pts;
+    val ((_, syn), raw_elemss) = flatten (ctxt, intern_expr thy)
+        (([], Symtab.empty), Expr expr);
+    val ((parms, _, _), _) =
+        read_elemss false ctxt [] (raw_params_elemss @ raw_elemss) [];
+  in map (fn p as (n, _) => (p, Symtab.lookup syn n |> the)) parms end;
+
+fun local_asms_of thy name =
+  gen_asms_of (single o Library.last_elem) thy name;
+
+fun global_asms_of thy name =
+  gen_asms_of I thy name;
+
+end;
+
+
+(* full context statements: imports + elements + conclusion *)
+
+local
+
+fun prep_context_statement prep_expr prep_elemss prep_facts
+    do_close fixed_params imports elements raw_concl context =
+  let
+    val thy = ProofContext.theory_of context;
+
+    val (import_params, import_tenv, import_syn) =
+      params_of_expr context fixed_params (prep_expr thy imports)
+        ([], Symtab.empty, Symtab.empty);
+    val includes = map_filter (fn Expr e => SOME e | Elem _ => NONE) elements;
+    val (incl_params, incl_tenv, incl_syn) = fold (params_of_expr context fixed_params)
+      (map (prep_expr thy) includes) (import_params, import_tenv, import_syn);
+
+    val ((import_ids, _), raw_import_elemss) =
+      flatten (context, prep_expr thy) (([], Symtab.empty), Expr imports);
+    (* CB: normalise "includes" among elements *)
+    val ((ids, syn), raw_elemsss) = foldl_map (flatten (context, prep_expr thy))
+      ((import_ids, incl_syn), elements);
+
+    val raw_elemss = flat raw_elemsss;
+    (* CB: raw_import_elemss @ raw_elemss is the normalised list of
+       context elements obtained from import and elements. *)
+    (* Now additional elements for parameters are inserted. *)
+    val import_params_ids = make_params_ids import_params;
+    val incl_params_ids =
+        make_params_ids (incl_params \\ import_params);
+    val raw_import_params_elemss =
+        make_raw_params_elemss (import_params, incl_tenv, incl_syn);
+    val raw_incl_params_elemss =
+        make_raw_params_elemss (incl_params \\ import_params, incl_tenv, incl_syn);
+    val ((parms, all_elemss, concl), (spec, (_, _, defs))) = prep_elemss do_close
+      context fixed_params
+      (raw_import_params_elemss @ raw_import_elemss @ raw_incl_params_elemss @ raw_elemss) raw_concl;
+
+    (* replace extended ids (for axioms) by ids *)
+    val (import_ids', incl_ids) = chop (length import_ids) ids;
+    val all_ids = import_params_ids @ import_ids' @ incl_params_ids @ incl_ids;
+    val all_elemss' = map (fn (((_, ps), _), (((n, ps'), mode), elems)) =>
+        (((n, map (fn p => (p, (the o AList.lookup (op =) ps') p)) ps), mode), elems))
+      (all_ids ~~ all_elemss);
+    (* CB: all_elemss and parms contain the correct parameter types *)
+
+    val (ps, qs) = chop (length raw_import_params_elemss + length raw_import_elemss) all_elemss';
+    val ((import_elemss, _), import_ctxt) =
+      activate_facts false prep_facts ps context;
+
+    val ((elemss, _), ctxt) =
+      activate_facts false prep_facts qs (ProofContext.set_stmt true import_ctxt);
+  in
+    ((((import_ctxt, import_elemss), (ctxt, elemss, syn)),
+      (parms, spec, defs)), concl)
+  end;
+
+fun prep_statement prep_locale prep_ctxt raw_locale elems concl ctxt =
+  let
+    val thy = ProofContext.theory_of ctxt;
+    val locale = Option.map (prep_locale thy) raw_locale;
+    val (fixed_params, imports) =
+      (case locale of
+        NONE => ([], empty)
+      | SOME name =>
+          let val {params = ps, ...} = the_locale thy name
+          in (map fst ps, Locale name) end);
+    val ((((locale_ctxt, _), (elems_ctxt, _, _)), _), concl') =
+      prep_ctxt false fixed_params imports (map Elem elems) concl ctxt;
+  in (locale, locale_ctxt, elems_ctxt, concl') end;
+
+fun prep_expr prep imports body ctxt =
+  let
+    val (((_, import_elemss), (ctxt', elemss, _)), _) = prep imports body ctxt;
+    val all_elems = maps snd (import_elemss @ elemss);
+  in (all_elems, ctxt') end;
+
+in
+
+val read_ctxt = prep_context_statement intern_expr read_elemss read_facts;
+val cert_ctxt = prep_context_statement (K I) cert_elemss cert_facts;
+
+fun read_context imports body ctxt = #1 (read_ctxt true [] imports (map Elem body) [] ctxt);
+fun cert_context imports body ctxt = #1 (cert_ctxt true [] imports (map Elem body) [] ctxt);
+
+val read_expr = prep_expr read_context;
+val cert_expr = prep_expr cert_context;
+
+fun read_context_statement loc = prep_statement (K I) read_ctxt loc;
+fun read_context_statement_cmd loc = prep_statement intern read_ctxt loc;
+fun cert_context_statement loc = prep_statement (K I) cert_ctxt loc;
+
+end;
+
+
+(* init *)
+
+fun init loc =
+  ProofContext.init
+  #> #2 o cert_context_statement (SOME loc) [] [];
+
+
+(* print locale *)
+
+fun print_locale thy show_facts imports body =
+  let val (all_elems, ctxt) = read_expr imports body (ProofContext.init thy) in
+    Pretty.big_list "locale elements:" (all_elems
+      |> (if show_facts then I else filter (fn Notes _ => false | _ => true))
+      |> map (Element.pretty_ctxt ctxt) |> filter_out null
+      |> map Pretty.chunks)
+    |> Pretty.writeln
+  end;
+
+
+
+(** store results **)
+
+(* join equations of an id with already accumulated ones *)
+
+fun join_eqns get_reg id eqns =
+  let
+    val eqns' = case get_reg id
+      of NONE => eqns
+        | SOME (_, _, eqns') => Termtab.join (fn _ => fn (_, e) => e) (eqns, eqns')
+            (* prefer equations from eqns' *)
+  in ((id, eqns'), eqns') end;
+
+
+(* collect witnesses and equations up to a particular target for a
+   registration; requires parameters and flattened list of identifiers
+   instead of recomputing it from the target *)
+
+fun collect_witnesses ctxt (imprt as ((impT, _), (imp, _))) parms ids ext_ts = let
+
+    val thy = ProofContext.theory_of ctxt;
+
+    val ts = map (var_inst_term (impT, imp)) ext_ts;
+    val (parms, parmTs) = split_list parms;
+    val parmvTs = map Logic.varifyT parmTs;
+    val vtinst = fold (Sign.typ_match thy) (parmvTs ~~ map Term.fastype_of ts) Vartab.empty;
+    val tinst = Vartab.dest vtinst |> map (fn ((x, 0), (_, T)) => (x, T))
+        |> Symtab.make;
+    val inst = Symtab.make (parms ~~ ts);
+
+    (* instantiate parameter names in ids *)
+    val ext_inst = Symtab.make (parms ~~ ext_ts);
+    fun ext_inst_names ps = map (the o Symtab.lookup ext_inst) ps;
+    val inst_ids = map (apfst (apsnd ext_inst_names)) ids;
+    val assumed_ids = map_filter (fn (id, (_, Assumed _)) => SOME id | _ => NONE) inst_ids;
+    val wits = maps (#2 o the o get_local_registration ctxt imprt) assumed_ids;
+    val eqns =
+      fold_map (join_eqns (get_local_registration ctxt imprt))
+        (map fst inst_ids) Termtab.empty |> snd |> Termtab.dest |> map snd;
+  in ((tinst, inst), wits, eqns) end;
+
+
+(* compute and apply morphism *)
+
+fun name_morph phi_name (lprfx, pprfx) b =
+  b
+  |> (if not (Binding.is_empty b) andalso pprfx <> ""
+        then Binding.add_prefix false pprfx else I)
+  |> (if not (Binding.is_empty b)
+        then Binding.add_prefix false lprfx else I)
+  |> phi_name;
+
+fun inst_morph thy phi_name param_prfx insts prems eqns export =
+  let
+    (* standardise export morphism *)
+    val exp_fact = Drule.zero_var_indexes_list o map Thm.strip_shyps o Morphism.fact export;
+    val exp_term = TermSubst.zero_var_indexes o Morphism.term export;
+      (* FIXME sync with exp_fact *)
+    val exp_typ = Logic.type_map exp_term;
+    val export' =
+      Morphism.morphism {binding = I, var = I, typ = exp_typ, term = exp_term, fact = exp_fact};
+  in
+    Morphism.binding_morphism (name_morph phi_name param_prfx) $>
+      Element.inst_morphism thy insts $>
+      Element.satisfy_morphism prems $>
+      Morphism.term_morphism (MetaSimplifier.rewrite_term thy eqns []) $>
+      Morphism.thm_morphism (MetaSimplifier.rewrite_rule eqns) $>
+      export'
+  end;
+
+fun activate_note thy phi_name param_prfx attrib insts prems eqns exp =
+  (Element.facts_map o Element.morph_ctxt)
+      (inst_morph thy phi_name param_prfx insts prems eqns exp)
+  #> Attrib.map_facts attrib;
+
+
+(* public interface to interpretation morphism *)
+
+fun get_interpret_morph thy phi_name param_prfx (exp, imp) target ext_ts =
+  let
+    val parms = the_locale thy target |> #params |> map fst;
+    val ids = flatten (ProofContext.init thy, intern_expr thy)
+      (([], Symtab.empty), Expr (Locale target)) |> fst |> fst;
+    val (insts, prems, eqns) = collect_witnesses (ProofContext.init thy) imp parms ids ext_ts;
+  in
+    inst_morph thy phi_name param_prfx insts prems eqns exp
+  end;
+
+(* store instantiations of args for all registered interpretations
+   of the theory *)
+
+fun note_thmss_registrations target (kind, args) thy =
+  let
+    val parms = the_locale thy target |> #params |> map fst;
+    val ids = flatten (ProofContext.init thy, intern_expr thy)
+      (([], Symtab.empty), Expr (Locale target)) |> fst |> fst;
+
+    val regs = get_global_registrations thy target;
+    (* add args to thy for all registrations *)
+
+    fun activate (ext_ts, ((phi_name, param_prfx), (exp, imp), _, _)) thy =
+      let
+        val (insts, prems, eqns) = collect_witnesses (ProofContext.init thy) imp parms ids ext_ts;
+        val args' = args
+          |> activate_note thy phi_name param_prfx
+               (Attrib.attribute_i thy) insts prems eqns exp;
+      in
+        thy
+        |> global_note_qualified kind args'
+        |> snd
+      end;
+  in fold activate regs thy end;
+
+
+(* locale results *)
+
+fun add_thmss loc kind args ctxt =
+  let
+    val (([(_, [Notes args'])], _), ctxt') =
+      activate_facts true cert_facts
+        [((("", []), Assumed []), [Ext (Notes (kind, args))])] ctxt;
+    val ctxt'' = ctxt' |> ProofContext.theory
+      (change_locale loc
+        (fn (axiom, elems, params, decls, regs, intros, dests) =>
+          (axiom, elems @ [(Notes args', stamp ())],
+            params, decls, regs, intros, dests))
+      #> note_thmss_registrations loc args');
+  in ctxt'' end;
+
+
+(* declarations *)
+
+local
+
+fun decl_attrib decl phi = Thm.declaration_attribute (K (decl phi));
+
+fun add_decls add loc decl =
+  ProofContext.theory (change_locale loc
+    (fn (axiom, elems, params, decls, regs, intros, dests) =>
+      (axiom, elems, params, add (decl, stamp ()) decls, regs, intros, dests))) #>
+  add_thmss loc Thm.internalK
+    [((Binding.empty, [Attrib.internal (decl_attrib decl)]), [([Drule.dummy_thm], [])])];
+
+in
+
+val add_type_syntax = add_decls (apfst o cons);
+val add_term_syntax = add_decls (apsnd o cons);
+val add_declaration = add_decls (K I);
+
+fun declarations_of thy loc =
+  the_locale thy loc |> #decls |> apfst (map fst) |> apsnd (map fst);
+
+end;
+
+
+
+(** define locales **)
+
+(* predicate text *)
+(* CB: generate locale predicates and delta predicates *)
+
+local
+
+(* introN: name of theorems for introduction rules of locale and
+     delta predicates;
+   axiomsN: name of theorem set with destruct rules for locale predicates,
+     also name suffix of delta predicates. *)
+
+val introN = "intro";
+val axiomsN = "axioms";
+
+fun atomize_spec thy ts =
+  let
+    val t = Logic.mk_conjunction_balanced ts;
+    val body = ObjectLogic.atomize_term thy t;
+    val bodyT = Term.fastype_of body;
+  in
+    if bodyT = propT then (t, propT, Thm.reflexive (Thm.cterm_of thy t))
+    else (body, bodyT, ObjectLogic.atomize (Thm.cterm_of thy t))
+  end;
+
+fun aprop_tr' n c = (Syntax.constN ^ c, fn ctxt => fn args =>
+  if length args = n then
+    Syntax.const "_aprop" $
+      Term.list_comb (Syntax.free (Consts.extern (ProofContext.consts_of ctxt) c), args)
+  else raise Match);
+
+(* CB: define one predicate including its intro rule and axioms
+   - bname: predicate name
+   - parms: locale parameters
+   - defs: thms representing substitutions from defines elements
+   - ts: terms representing locale assumptions (not normalised wrt. defs)
+   - norm_ts: terms representing locale assumptions (normalised wrt. defs)
+   - thy: the theory
+*)
+
+fun def_pred bname parms defs ts norm_ts thy =
+  let
+    val name = Sign.full_bname thy bname;
+
+    val (body, bodyT, body_eq) = atomize_spec thy norm_ts;
+    val env = Term.add_free_names body [];
+    val xs = filter (member (op =) env o #1) parms;
+    val Ts = map #2 xs;
+    val extraTs =
+      (Term.add_tfrees body [] \\ fold Term.add_tfreesT Ts [])
+      |> Library.sort_wrt #1 |> map TFree;
+    val predT = map Term.itselfT extraTs ---> Ts ---> bodyT;
+
+    val args = map Logic.mk_type extraTs @ map Free xs;
+    val head = Term.list_comb (Const (name, predT), args);
+    val statement = ObjectLogic.ensure_propT thy head;
+
+    val ([pred_def], defs_thy) =
+      thy
+      |> bodyT = propT ? Sign.add_advanced_trfuns ([], [], [aprop_tr' (length args) name], [])
+      |> Sign.declare_const [] ((Binding.name bname, predT), NoSyn) |> snd
+      |> PureThy.add_defs false
+        [((Thm.def_name bname, Logic.mk_equals (head, body)), [Thm.kind_internal])];
+    val defs_ctxt = ProofContext.init defs_thy |> Variable.declare_term head;
+
+    val cert = Thm.cterm_of defs_thy;
+
+    val intro = Goal.prove_global defs_thy [] norm_ts statement (fn _ =>
+      MetaSimplifier.rewrite_goals_tac [pred_def] THEN
+      Tactic.compose_tac (false, body_eq RS Drule.equal_elim_rule1, 1) 1 THEN
+      Tactic.compose_tac (false,
+        Conjunction.intr_balanced (map (Thm.assume o cert) norm_ts), 0) 1);
+
+    val conjuncts =
+      (Drule.equal_elim_rule2 OF [body_eq,
+        MetaSimplifier.rewrite_rule [pred_def] (Thm.assume (cert statement))])
+      |> Conjunction.elim_balanced (length ts);
+    val axioms = ts ~~ conjuncts |> map (fn (t, ax) =>
+      Element.prove_witness defs_ctxt t
+       (MetaSimplifier.rewrite_goals_tac defs THEN
+        Tactic.compose_tac (false, ax, 0) 1));
+  in ((statement, intro, axioms), defs_thy) end;
+
+fun assumes_to_notes (Assumes asms) axms =
+      fold_map (fn (a, spec) => fn axs =>
+          let val (ps, qs) = chop (length spec) axs
+          in ((a, [(ps, [])]), qs) end) asms axms
+      |> apfst (curry Notes Thm.assumptionK)
+  | assumes_to_notes e axms = (e, axms);
+
+(* CB: the following two change only "new" elems, these have identifier ("", _). *)
+
+(* turn Assumes into Notes elements *)
+
+fun change_assumes_elemss axioms elemss =
+  let
+    val satisfy = Element.morph_ctxt (Element.satisfy_morphism axioms);
+    fun change (id as ("", _), es) =
+          fold_map assumes_to_notes (map satisfy es)
+          #-> (fn es' => pair (id, es'))
+      | change e = pair e;
+  in
+    fst (fold_map change elemss (map Element.conclude_witness axioms))
+  end;
+
+(* adjust hyps of Notes elements *)
+
+fun change_elemss_hyps axioms elemss =
+  let
+    val satisfy = Element.morph_ctxt (Element.satisfy_morphism axioms);
+    fun change (id as ("", _), es) = (id, map (fn e as Notes _ => satisfy e | e => e) es)
+      | change e = e;
+  in map change elemss end;
+
+in
+
+(* CB: main predicate definition function *)
+
+fun define_preds pname (parms, ((exts, exts'), (ints, ints')), defs) elemss thy =
+  let
+    val ((elemss', more_ts), a_elem, a_intro, thy'') =
+      if null exts then ((elemss, []), [], [], thy)
+      else
+        let
+          val aname = if null ints then pname else pname ^ "_" ^ axiomsN;
+          val ((statement, intro, axioms), thy') =
+            thy
+            |> def_pred aname parms defs exts exts';
+          val elemss' = change_assumes_elemss axioms elemss;
+          val a_elem = [(("", []),
+            [Assumes [((Binding.name (pname ^ "_" ^ axiomsN), []), [(statement, [])])]])];
+          val (_, thy'') =
+            thy'
+            |> Sign.add_path aname
+            |> Sign.no_base_names
+            |> PureThy.note_thmss Thm.internalK [((Binding.name introN, []), [([intro], [])])]
+            ||> Sign.restore_naming thy';
+        in ((elemss', [statement]), a_elem, [intro], thy'') end;
+    val (predicate, stmt', elemss'', b_intro, thy'''') =
+      if null ints then (([], []), more_ts, elemss' @ a_elem, [], thy'')
+      else
+        let
+          val ((statement, intro, axioms), thy''') =
+            thy''
+            |> def_pred pname parms defs (ints @ more_ts) (ints' @ more_ts);
+          val cstatement = Thm.cterm_of thy''' statement;
+          val elemss'' = change_elemss_hyps axioms elemss';
+          val b_elem = [(("", []),
+               [Assumes [((Binding.name (pname ^ "_" ^ axiomsN), []), [(statement, [])])]])];
+          val (_, thy'''') =
+            thy'''
+            |> Sign.add_path pname
+            |> Sign.no_base_names
+            |> PureThy.note_thmss Thm.internalK
+                 [((Binding.name introN, []), [([intro], [])]),
+                  ((Binding.name axiomsN, []),
+                    [(map (Drule.standard o Element.conclude_witness) axioms, [])])]
+            ||> Sign.restore_naming thy''';
+        in (([cstatement], axioms), [statement], elemss'' @ b_elem, [intro], thy'''') end;
+  in (((elemss'', predicate, stmt'), (a_intro, b_intro)), thy'''') end;
+
+end;
+
+
+(* add_locale(_i) *)
+
+local
+
+(* turn Defines into Notes elements, accumulate definition terms *)
+
+fun defines_to_notes is_ext thy (Defines defs) defns =
+    let
+      val defs' = map (fn (_, (def, _)) => (Attrib.empty_binding, (def, []))) defs
+      val notes = map (fn (a, (def, _)) =>
+        (a, [([assume (cterm_of thy def)], [])])) defs
+    in
+      (if is_ext then SOME (Notes (Thm.definitionK, notes)) else NONE, defns @ [Defines defs'])
+    end
+  | defines_to_notes _ _ e defns = (SOME e, defns);
+
+fun change_defines_elemss thy elemss defns =
+  let
+    fun change (id as (n, _), es) defns =
+        let
+          val (es', defns') = fold_map (defines_to_notes (n="") thy) es defns
+        in ((id, map_filter I es'), defns') end
+  in fold_map change elemss defns end;
+
+fun gen_add_locale prep_ctxt prep_expr
+    predicate_name bname raw_imports raw_body thy =
+    (* predicate_name: "" - locale with predicate named as locale
+        "name" - locale with predicate named "name" *)
+  let
+    val thy_ctxt = ProofContext.init thy;
+    val name = Sign.full_bname thy bname;
+    val _ = is_some (get_locale thy name) andalso
+      error ("Duplicate definition of locale " ^ quote name);
+
+    val (((import_ctxt, import_elemss), (body_ctxt, body_elemss, syn)),
+      text as (parms, ((_, exts'), _), defs)) =
+        prep_ctxt raw_imports raw_body thy_ctxt;
+    val elemss = import_elemss @ body_elemss |>
+      map_filter (fn ((id, Assumed axs), elems) => SOME (id, elems) | _ => NONE);
+
+    val extraTs = List.foldr OldTerm.add_term_tfrees [] exts' \\
+      List.foldr OldTerm.add_typ_tfrees [] (map snd parms);
+    val _ = if null extraTs then ()
+      else warning ("Additional type variable(s) in locale specification " ^ quote bname);
+
+    val predicate_name' = case predicate_name of "" => bname | _ => predicate_name;
+    val (elemss', defns) = change_defines_elemss thy elemss [];
+    val elemss'' = elemss' @ [(("", []), defns)];
+    val (((elemss''', predicate as (pred_statement, pred_axioms), stmt'), intros), thy') =
+      define_preds predicate_name' text elemss'' thy;
+    val regs = pred_axioms
+      |> fold_map (fn (id, elems) => fn wts => let
+             val ts = flat (map_filter (fn (Assumes asms) =>
+               SOME (maps (map #1 o #2) asms) | _ => NONE) elems);
+             val (wts1, wts2) = chop (length ts) wts;
+           in ((apsnd (map fst) id, wts1), wts2) end) elemss'''
+      |> fst
+      |> map_filter (fn (("", _), _) => NONE | e => SOME e);
+    fun axiomify axioms elemss =
+      (axioms, elemss) |> foldl_map (fn (axs, (id, elems)) => let
+                   val ts = flat (map_filter (fn (Assumes asms) =>
+                     SOME (maps (map #1 o #2) asms) | _ => NONE) elems);
+                   val (axs1, axs2) = chop (length ts) axs;
+                 in (axs2, ((id, Assumed axs1), elems)) end)
+      |> snd;
+    val ((_, facts), ctxt) = activate_facts true (K I)
+      (axiomify pred_axioms elemss''') (ProofContext.init thy');
+    val view_ctxt = Assumption.add_view thy_ctxt pred_statement ctxt;
+    val export = Thm.close_derivation o Goal.norm_result o
+      singleton (ProofContext.export view_ctxt thy_ctxt);
+    val facts' = facts |> map (fn (a, ths) => ((a, []), [(map export ths, [])]));
+    val elems' = maps #2 (filter (fn ((s, _), _) => s = "") elemss''');
+    val elems'' = map_filter (fn (Fixes _) => NONE | e => SOME e) elems';
+    val axs' = map (Element.assume_witness thy') stmt';
+    val loc_ctxt = thy'
+      |> Sign.add_path bname
+      |> Sign.no_base_names
+      |> PureThy.note_thmss Thm.assumptionK facts' |> snd
+      |> Sign.restore_naming thy'
+      |> register_locale bname {axiom = axs',
+        elems = map (fn e => (e, stamp ())) elems'',
+        params = params_of elemss''' |> map (fn (x, SOME T) => ((x, T), the (Symtab.lookup syn x))),
+        decls = ([], []),
+        regs = regs,
+        intros = intros,
+        dests = map Element.conclude_witness pred_axioms}
+      |> init name;
+  in (name, loc_ctxt) end;
+
+in
+
+val add_locale = gen_add_locale cert_context (K I);
+val add_locale_cmd = gen_add_locale read_context intern_expr "";
+
+end;
+
+val _ = Context.>> (Context.map_theory
+ (add_locale "" "var" empty [Fixes [(Binding.name (Name.internal "x"), NONE, NoSyn)]] #>
+  snd #> ProofContext.theory_of #>
+  add_locale "" "struct" empty [Fixes [(Binding.name (Name.internal "S"), NONE, Structure)]] #>
+  snd #> ProofContext.theory_of));
+
+
+
+
+(** Normalisation of locale statements ---
+    discharges goals implied by interpretations **)
+
+local
+
+fun locale_assm_intros thy =
+  Symtab.fold (fn (_, {intros = (a, _), ...}) => fn intros => (a @ intros))
+    (#2 (LocalesData.get thy)) [];
+fun locale_base_intros thy =
+  Symtab.fold (fn (_, {intros = (_, b), ...}) => fn intros => (b @ intros))
+    (#2 (LocalesData.get thy)) [];
+
+fun all_witnesses ctxt =
+  let
+    val thy = ProofContext.theory_of ctxt;
+    fun get registrations = Symtab.fold (fn (_, regs) => fn thms =>
+        (Registrations.dest thy regs |> map (fn (_, (_, (exp, _), wits, _)) =>
+          map (Element.conclude_witness #> Morphism.thm exp) wits) |> flat) @ thms)
+      registrations [];
+  in get (RegistrationsData.get (Context.Proof ctxt)) end;
+
+in
+
+fun intro_locales_tac eager ctxt facts st =
+  let
+    val wits = all_witnesses ctxt;
+    val thy = ProofContext.theory_of ctxt;
+    val intros = locale_base_intros thy @ (if eager then locale_assm_intros thy else []);
+  in
+    Method.intros_tac (wits @ intros) facts st
+  end;
+
+end;
+
+
+(** Interpretation commands **)
+
+local
+
+(* extract proof obligations (assms and defs) from elements *)
+
+fun extract_asms_elems ((id, Assumed _), elems) = (id, maps Element.prems_of elems)
+  | extract_asms_elems ((id, Derived _), _) = (id, []);
+
+
+(* activate instantiated facts in theory or context *)
+
+fun gen_activate_facts_elemss mk_ctxt note attrib put_reg add_wit add_eqn
+        phi_name all_elemss pss propss eq_attns (exp, imp) thmss thy_ctxt =
+  let
+    val ctxt = mk_ctxt thy_ctxt;
+    fun get_reg thy_ctxt = get_local_registration (mk_ctxt thy_ctxt);
+    fun test_reg thy_ctxt = test_local_registration (mk_ctxt thy_ctxt);
+
+    val (all_propss, eq_props) = chop (length all_elemss) propss;
+    val (all_thmss, eq_thms) = chop (length all_elemss) thmss;
+
+    (* Filter out fragments already registered. *)
+
+    val (new_elemss, xs) = split_list (filter_out (fn (((id, _), _), _) =>
+          test_reg thy_ctxt id) (all_elemss ~~ (pss ~~ (all_propss ~~ all_thmss))));
+    val (new_pss, ys) = split_list xs;
+    val (new_propss, new_thmss) = split_list ys;
+
+    val thy_ctxt' = thy_ctxt
+      (* add registrations *)
+      |> fold2 (fn ((id as (loc, _), _), _) => fn ps => put_reg id (phi_name, param_prefix loc ps) (exp, imp))
+           new_elemss new_pss
+      (* add witnesses of Assumed elements (only those generate proof obligations) *)
+      |> fold2 (fn (id, _) => fold (add_wit id)) new_propss new_thmss
+      (* add equations *)
+      |> fold2 (fn (id, _) => fold (add_eqn id)) eq_props
+          ((map o map) (Drule.abs_def o LocalDefs.meta_rewrite_rule ctxt o
+            Element.conclude_witness) eq_thms);
+
+    val prems = flat (map_filter
+          (fn ((id, Assumed _), _) => Option.map #2 (get_reg thy_ctxt' imp id)
+            | ((_, Derived _), _) => NONE) all_elemss);
+
+    val thy_ctxt'' = thy_ctxt'
+      (* add witnesses of Derived elements *)
+      |> fold (fn (id, thms) => fold
+           (add_wit id o Element.morph_witness (Element.satisfy_morphism prems)) thms)
+         (map_filter (fn ((_, Assumed _), _) => NONE
+            | ((id, Derived thms), _) => SOME (id, thms)) new_elemss)
+
+    fun activate_elem phi_name param_prfx insts prems eqns exp (Notes (kind, facts)) thy_ctxt =
+        let
+          val ctxt = mk_ctxt thy_ctxt;
+          val thy = ProofContext.theory_of ctxt;
+          val facts' = facts
+            |> activate_note thy phi_name param_prfx
+                 (attrib thy_ctxt) insts prems eqns exp;
+        in 
+          thy_ctxt
+          |> note kind facts'
+          |> snd
+        end
+      | activate_elem _ _ _ _ _ _ _ thy_ctxt = thy_ctxt;
+
+    fun activate_elems (((loc, ext_ts), _), _) ps thy_ctxt =
+      let
+        val ctxt = mk_ctxt thy_ctxt;
+        val thy = ProofContext.theory_of ctxt;
+        val {params, elems, ...} = the_locale thy loc;
+        val parms = map fst params;
+        val param_prfx = param_prefix loc ps;
+        val ids = flatten (ProofContext.init thy, intern_expr thy)
+          (([], Symtab.empty), Expr (Locale loc)) |> fst |> fst;
+        val (insts, prems, eqns) = collect_witnesses ctxt imp parms ids ext_ts;
+      in
+        thy_ctxt
+        |> fold (activate_elem phi_name param_prfx insts prems eqns exp o fst) elems
+      end;
+
+  in
+    thy_ctxt''
+    (* add equations as lemmas to context *)
+    |> (fold2 o fold2) (fn attn => fn thm => snd o yield_singleton (note Thm.lemmaK)
+         ((apsnd o map) (attrib thy_ctxt'') attn, [([Element.conclude_witness thm], [])]))
+            (unflat eq_thms eq_attns) eq_thms
+    (* add interpreted facts *)
+    |> fold2 activate_elems new_elemss new_pss
+  end;
+
+fun global_activate_facts_elemss x = gen_activate_facts_elemss
+  ProofContext.init
+  global_note_qualified
+  Attrib.attribute_i
+  put_global_registration
+  add_global_witness
+  add_global_equation
+  x;
+
+fun local_activate_facts_elemss x = gen_activate_facts_elemss
+  I
+  local_note_qualified
+  (Attrib.attribute_i o ProofContext.theory_of)
+  put_local_registration
+  add_local_witness
+  add_local_equation
+  x;
+
+fun prep_instantiations parse_term parse_prop ctxt parms (insts, eqns) =
+  let
+    (* parameters *)
+    val (parm_names, parm_types) = parms |> split_list
+      ||> map (TypeInfer.paramify_vars o Logic.varifyT);
+    val type_parms = fold Term.add_tvarsT parm_types [] |> map (Logic.mk_type o TVar);
+    val type_parm_names = fold Term.add_tfreesT (map snd parms) [] |> map fst;
+
+    (* parameter instantiations *)
+    val d = length parms - length insts;
+    val insts =
+      if d < 0 then error "More arguments than parameters in instantiation."
+      else insts @ replicate d NONE;
+    val (given_ps, given_insts) =
+      ((parm_names ~~ parm_types) ~~ insts) |> map_filter
+          (fn (_, NONE) => NONE
+            | ((n, T), SOME inst) => SOME ((n, T), inst))
+        |> split_list;
+    val (given_parm_names, given_parm_types) = given_ps |> split_list;
+
+    (* parse insts / eqns *)
+    val given_insts' = map (parse_term ctxt) given_insts;
+    val eqns' = map (parse_prop ctxt) eqns;
+
+    (* type inference and contexts *)
+    val arg = type_parms @ map2 TypeInfer.constrain given_parm_types given_insts' @ eqns';
+    val res = Syntax.check_terms ctxt arg;
+    val ctxt' = ctxt |> fold Variable.auto_fixes res;
+
+    (* instantiation *)
+    val (type_parms'', res') = chop (length type_parms) res;
+    val (given_insts'', eqns'') = chop (length given_insts) res';
+    val instT = Symtab.make (type_parm_names ~~ map Logic.dest_type type_parms'');
+    val inst = Symtab.make (given_parm_names ~~ given_insts'');
+
+    (* export from eigencontext *)
+    val export = Variable.export_morphism ctxt' ctxt;
+
+    (* import, its inverse *)
+    val domT = fold Term.add_tfrees res [] |> map TFree;
+    val importT = domT |> map (fn x => (Morphism.typ export x, x))
+      |> map_filter (fn (TFree _, _) => NONE  (* fixed point of export *)
+               | (TVar y, x) => SOME (fst y, x)
+               | _ => error "internal: illegal export in interpretation")
+      |> Vartab.make;
+    val dom = fold Term.add_frees res [] |> map Free;
+    val imprt = dom |> map (fn x => (Morphism.term export x, x))
+      |> map_filter (fn (Free _, _) => NONE  (* fixed point of export *)
+               | (Var y, x) => SOME (fst y, x)
+               | _ => error "internal: illegal export in interpretation")
+      |> Vartab.make;
+  in (((instT, inst), eqns''), (export, ((importT, domT), (imprt, dom)))) end;
+
+val read_instantiations = prep_instantiations Syntax.parse_term Syntax.parse_prop;
+val check_instantiations = prep_instantiations (K I) (K I);
+
+fun gen_prep_registration mk_ctxt test_reg activate
+    prep_attr prep_expr prep_insts
+    thy_ctxt phi_name raw_expr raw_insts =
+  let
+    val ctxt = mk_ctxt thy_ctxt;
+    val thy = ProofContext.theory_of ctxt;
+    val ctxt' = ProofContext.init thy;
+    fun prep_attn attn = (apsnd o map)
+      (Attrib.crude_closure ctxt o Args.assignable o prep_attr thy) attn;
+
+    val expr = prep_expr thy raw_expr;
+
+    val pts = params_of_expr ctxt' [] expr ([], Symtab.empty, Symtab.empty);
+    val params_ids = make_params_ids (#1 pts);
+    val raw_params_elemss = make_raw_params_elemss pts;
+    val ((ids, _), raw_elemss) = flatten (ctxt', I) (([], Symtab.empty), Expr expr);
+    val ((parms, all_elemss, _), (_, (_, defs, _))) =
+      read_elemss false ctxt' [] (raw_params_elemss @ raw_elemss) [];
+
+    (** compute instantiation **)
+
+    (* consistency check: equations need to be stored in a particular locale,
+       therefore if equations are present locale expression must be a name *)
+
+    val _ = case (expr, snd raw_insts) of
+        (Locale _, _) => () | (_, []) => ()
+      | (_, _) => error "Interpretations with `where' only permitted if locale expression is a name.";
+
+    (* read or certify instantiation *)
+    val (raw_insts', raw_eqns) = raw_insts;
+    val (raw_eq_attns, raw_eqns') = split_list raw_eqns;
+    val (((instT, inst1), eqns), morphs) = prep_insts ctxt parms (raw_insts', raw_eqns');
+    val eq_attns = map prep_attn raw_eq_attns;
+
+    (* defined params without given instantiation *)
+    val not_given = filter_out (Symtab.defined inst1 o fst) parms;
+    fun add_def (p, pT) inst =
+      let
+        val (t, T) = case find_first (fn (Free (a, _), _) => a = p) defs of
+               NONE => error ("Instance missing for parameter " ^ quote p)
+             | SOME (Free (_, T), t) => (t, T);
+        val d = Element.inst_term (instT, inst) t;
+      in Symtab.update_new (p, d) inst end;
+    val inst2 = fold add_def not_given inst1;
+    val inst_morphism = Element.inst_morphism thy (instT, inst2);
+    (* Note: insts contain no vars. *)
+
+    (** compute proof obligations **)
+
+    (* restore "small" ids *)
+    val ids' = map (fn ((n, ps), (_, mode)) =>
+          ((n, map (fn p => Free (p, (the o AList.lookup (op =) parms) p)) ps), mode))
+        ids;
+    val (_, all_elemss') = chop (length raw_params_elemss) all_elemss
+    (* instantiate ids and elements *)
+    val inst_elemss = (ids' ~~ all_elemss') |> map (fn (((n, ps), _), ((_, mode), elems)) =>
+      ((n, map (Morphism.term (inst_morphism $> fst morphs)) ps),
+        map (fn Int e => Element.morph_ctxt inst_morphism e) elems)
+      |> apfst (fn id => (id, map_mode (map (Element.morph_witness inst_morphism)) mode)));
+
+    (* equations *)
+    val eqn_elems = if null eqns then []
+      else [(Library.last_elem inst_elemss |> fst |> fst, eqns)];
+
+    val propss = map extract_asms_elems inst_elemss @ eqn_elems;
+
+  in
+    (propss, activate phi_name inst_elemss (map (snd o fst) ids) propss eq_attns morphs, morphs)
+  end;
+
+fun gen_prep_global_registration mk_ctxt = gen_prep_registration ProofContext.init
+  test_global_registration
+  global_activate_facts_elemss mk_ctxt;
+
+fun gen_prep_local_registration mk_ctxt = gen_prep_registration I
+  test_local_registration
+  local_activate_facts_elemss mk_ctxt;
+
+val prep_global_registration = gen_prep_global_registration
+  (K I) (K I) check_instantiations;
+val prep_global_registration_cmd = gen_prep_global_registration
+  Attrib.intern_src intern_expr read_instantiations;
+
+val prep_local_registration = gen_prep_local_registration
+  (K I) (K I) check_instantiations;
+val prep_local_registration_cmd = gen_prep_local_registration
+  Attrib.intern_src intern_expr read_instantiations;
+
+fun prep_registration_in_locale target expr thy =
+  (* target already in internal form *)
+  let
+    val ctxt = ProofContext.init thy;
+    val ((raw_target_ids, target_syn), _) = flatten (ctxt, I)
+        (([], Symtab.empty), Expr (Locale target));
+    val fixed = the_locale thy target |> #params |> map #1;
+    val ((all_ids, syn), raw_elemss) = flatten (ctxt, intern_expr thy)
+        ((raw_target_ids, target_syn), Expr expr);
+    val (target_ids, ids) = chop (length raw_target_ids) all_ids;
+    val ((parms, elemss, _), _) = read_elemss false ctxt fixed raw_elemss [];
+
+    (** compute proof obligations **)
+
+    (* restore "small" ids, with mode *)
+    val ids' = map (apsnd snd) ids;
+    (* remove Int markers *)
+    val elemss' = map (fn (_, es) =>
+        map (fn Int e => e) es) elemss
+    (* extract assumptions and defs *)
+    val ids_elemss = ids' ~~ elemss';
+    val propss = map extract_asms_elems ids_elemss;
+
+    (** activation function:
+        - add registrations to the target locale
+        - add induced registrations for all global registrations of
+          the target, unless already present
+        - add facts of induced registrations to theory **)
+
+    fun activate thmss thy =
+      let
+        val satisfy = Element.satisfy_thm (flat thmss);
+        val ids_elemss_thmss = ids_elemss ~~ thmss;
+        val regs = get_global_registrations thy target;
+
+        fun activate_id (((id, Assumed _), _), thms) thy =
+            thy |> put_registration_in_locale target id
+                |> fold (add_witness_in_locale target id) thms
+          | activate_id _ thy = thy;
+
+        fun activate_reg (ext_ts, ((phi_name, param_prfx), (exp, imp), _, _)) thy =
+          let
+            val (insts, wits, _) = collect_witnesses (ProofContext.init thy) imp fixed target_ids ext_ts;
+            val inst_parms = map (the o AList.lookup (op =) (map #1 fixed ~~ ext_ts));
+            val disch = Element.satisfy_thm wits;
+            val new_elemss = filter (fn (((name, ps), _), _) =>
+                not (test_global_registration thy (name, inst_parms ps))) (ids_elemss);
+            fun activate_assumed_id (((_, Derived _), _), _) thy = thy
+              | activate_assumed_id ((((name, ps), Assumed _), _), thms) thy = let
+                val ps' = inst_parms ps;
+              in
+                if test_global_registration thy (name, ps')
+                then thy
+                else thy
+                  |> put_global_registration (name, ps') (phi_name, param_prefix name ps) (exp, imp)
+                  |> fold (fn witn => fn thy => add_global_witness (name, ps')
+                     (Element.morph_witness (Element.inst_morphism thy insts) witn) thy) thms
+              end;
+
+            fun activate_derived_id ((_, Assumed _), _) thy = thy
+              | activate_derived_id (((name, ps), Derived ths), _) thy = let
+                val ps' = inst_parms ps;
+              in
+                if test_global_registration thy (name, ps')
+                then thy
+                else thy
+                  |> put_global_registration (name, ps') (phi_name, param_prefix name ps) (exp, imp)
+                  |> fold (fn witn => fn thy => add_global_witness (name, ps')
+                       (witn |> Element.map_witness (fn (t, th) =>  (* FIXME *)
+                       (Element.inst_term insts t,
+                        disch (Element.inst_thm thy insts (satisfy th))))) thy) ths
+              end;
+
+            fun activate_elem (loc, ps) (Notes (kind, facts)) thy =
+                let
+                  val att_morphism =
+                    Morphism.binding_morphism (name_morph phi_name param_prfx) $>
+                    Morphism.thm_morphism satisfy $>
+                    Element.inst_morphism thy insts $>
+                    Morphism.thm_morphism disch;
+                  val facts' = facts
+                    |> Attrib.map_facts (Attrib.attribute_i thy o Args.morph_values att_morphism)
+                    |> (map o apsnd o map o apfst o map) (disch o Element.inst_thm thy insts o satisfy)
+                    |> (map o apfst o apfst) (name_morph phi_name param_prfx);
+                in
+                  thy
+                  |> global_note_qualified kind facts'
+                  |> snd
+                end
+              | activate_elem _ _ thy = thy;
+
+            fun activate_elems ((id, _), elems) thy = fold (activate_elem id) elems thy;
+
+          in thy |> fold activate_assumed_id ids_elemss_thmss
+                 |> fold activate_derived_id ids_elemss
+                 |> fold activate_elems new_elemss end;
+      in
+        thy |> fold activate_id ids_elemss_thmss
+            |> fold activate_reg regs
+      end;
+
+  in (propss, activate) end;
+
+fun prep_propp propss = propss |> map (fn (_, props) =>
+  map (rpair [] o Element.mark_witness) props);
+
+fun prep_result propps thmss =
+  ListPair.map (fn ((_, props), thms) => map2 Element.make_witness props thms) (propps, thmss);
+
+fun gen_interpretation prep_registration after_qed prfx raw_expr raw_insts thy =
+  let
+    val (propss, activate, morphs) = prep_registration thy prfx raw_expr raw_insts;
+    fun after_qed' results =
+      ProofContext.theory (activate (prep_result propss results))
+      #> after_qed;
+  in
+    thy
+    |> ProofContext.init
+    |> Proof.theorem_i NONE after_qed' (prep_propp propss)
+    |> Element.refine_witness
+    |> Seq.hd
+    |> pair morphs
+  end;
+
+fun gen_interpret prep_registration after_qed name_morph expr insts int state =
+  let
+    val _ = Proof.assert_forward_or_chain state;
+    val ctxt = Proof.context_of state;
+    val (propss, activate, morphs) = prep_registration ctxt name_morph expr insts;
+    fun after_qed' results =
+      Proof.map_context (K (ctxt |> activate (prep_result propss results)))
+      #> Proof.put_facts NONE
+      #> after_qed;
+  in
+    state
+    |> Proof.local_goal (ProofDisplay.print_results int) (K I) ProofContext.bind_propp_i
+      "interpret" NONE after_qed' (map (pair (Binding.empty, [])) (prep_propp propss))
+    |> Element.refine_witness |> Seq.hd
+    |> pair morphs
+  end;
+
+fun standard_name_morph interp_prfx b =
+  if Binding.is_empty b then b
+  else Binding.map_prefix (fn ((lprfx, _) :: pprfx) =>
+    fold (Binding.add_prefix false o fst) pprfx
+    #> interp_prfx <> "" ? Binding.add_prefix true interp_prfx
+    #> Binding.add_prefix false lprfx
+  ) b;
+
+in
+
+val interpretation = gen_interpretation prep_global_registration;
+fun interpretation_cmd interp_prfx = snd ooo gen_interpretation prep_global_registration_cmd
+  I (standard_name_morph interp_prfx);
+
+fun interpretation_in_locale after_qed (raw_target, expr) thy =
+  let
+    val target = intern thy raw_target;
+    val (propss, activate) = prep_registration_in_locale target expr thy;
+    val raw_propp = prep_propp propss;
+
+    val (_, _, goal_ctxt, propp) = thy
+      |> ProofContext.init
+      |> cert_context_statement (SOME target) [] raw_propp;
+
+    fun after_qed' results =
+      ProofContext.theory (activate (prep_result propss results))
+      #> after_qed;
+  in
+    goal_ctxt
+    |> Proof.theorem_i NONE after_qed' propp
+    |> Element.refine_witness |> Seq.hd
+  end;
+
+val interpret = gen_interpret prep_local_registration;
+fun interpret_cmd interp_prfx = snd oooo gen_interpret prep_local_registration_cmd
+  Seq.single (standard_name_morph interp_prfx);
+
+end;
+
+end;
--- a/src/Pure/Isar/spec_parse.ML	Mon Jan 05 19:37:15 2009 +0100
+++ b/src/Pure/Isar/spec_parse.ML	Tue Jan 06 08:50:12 2009 +0100
@@ -24,7 +24,7 @@
   val locale_fixes: (Binding.T * string option * mixfix) list parser
   val locale_insts: (string option list * (Attrib.binding * string) list) parser
   val class_expr: string list parser
-  val locale_expr: Locale.expr parser
+  val locale_expr: Old_Locale.expr parser
   val locale_expression: Expression.expression parser
   val locale_keyword: string parser
   val context_element: Element.context parser
@@ -117,9 +117,9 @@
 
 val locale_expr =
   let
-    fun expr2 x = (P.xname >> Locale.Locale || P.$$$ "(" |-- P.!!! (expr0 --| P.$$$ ")")) x
-    and expr1 x = (expr2 -- Scan.repeat1 (P.maybe rename) >> Locale.Rename || expr2) x
-    and expr0 x = (plus1_unless locale_keyword expr1 >> (fn [e] => e | es => Locale.Merge es)) x;
+    fun expr2 x = (P.xname >> Old_Locale.Locale || P.$$$ "(" |-- P.!!! (expr0 --| P.$$$ ")")) x
+    and expr1 x = (expr2 -- Scan.repeat1 (P.maybe rename) >> Old_Locale.Rename || expr2) x
+    and expr0 x = (plus1_unless locale_keyword expr1 >> (fn [e] => e | es => Old_Locale.Merge es)) x;
   in expr0 end;
 
 val locale_expression =
--- a/src/Pure/Isar/subclass.ML	Mon Jan 05 19:37:15 2009 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,67 +0,0 @@
-(*  Title:      Pure/Isar/subclass.ML
-    Author:     Florian Haftmann, TU Muenchen
-
-User interface for proving subclass relationship between type classes.
-*)
-
-signature SUBCLASS =
-sig
-  val subclass: class -> local_theory -> Proof.state
-  val subclass_cmd: xstring -> local_theory -> Proof.state
-  val prove_subclass: tactic -> class -> local_theory -> local_theory
-end;
-
-structure Subclass : SUBCLASS =
-struct
-
-local
-
-fun gen_subclass prep_class do_proof raw_sup lthy =
-  let
-    val thy = ProofContext.theory_of lthy;
-    val sup = prep_class thy raw_sup;
-    val sub = case TheoryTarget.peek lthy
-     of {is_class = false, ...} => error "Not a class context"
-      | {target, ...} => target;
-    val _ = if Sign.subsort thy ([sup], [sub])
-      then error ("Class " ^ Syntax.string_of_sort lthy [sup]
-        ^ " is subclass of class " ^ Syntax.string_of_sort lthy [sub])
-      else ();
-    val sub_params = map fst (Class.these_params thy [sub]);
-    val sup_params = map fst (Class.these_params thy [sup]);
-    val err_params = subtract (op =) sub_params sup_params;
-    val _ = if null err_params then [] else
-      error ("Class " ^ Syntax.string_of_sort lthy [sub] ^ " lacks parameter(s) " ^
-        commas_quote err_params ^ " of " ^ Syntax.string_of_sort lthy [sup]);
-    val sublocale_prop =
-      Locale.global_asms_of thy sup
-      |> maps snd
-      |> try the_single
-      |> Option.map (ObjectLogic.ensure_propT thy);
-    fun after_qed some_thm =
-      LocalTheory.theory (Class.prove_subclass (sub, sup) some_thm)
-      #> (TheoryTarget.init (SOME sub) o ProofContext.theory_of);
-  in
-    do_proof after_qed sublocale_prop lthy
-  end;
-
-fun user_proof after_qed NONE =
-      Proof.theorem_i NONE (K (after_qed NONE)) [[]]
-  | user_proof after_qed (SOME prop) =
-      Proof.theorem_i NONE (after_qed o try the_single o the_single) [[(prop, [])]];
-
-fun tactic_proof tac after_qed NONE lthy =
-      after_qed NONE lthy
-  | tactic_proof tac after_qed (SOME prop) lthy =
-      after_qed (SOME (Goal.prove (LocalTheory.target_of lthy) [] [] prop
-        (K tac))) lthy;
-
-in
-
-val subclass = gen_subclass (K I) user_proof;
-val subclass_cmd = gen_subclass Sign.read_class user_proof;
-fun prove_subclass tac = gen_subclass (K I) (tactic_proof tac);
-
-end; (*local*)
-
-end;
--- a/src/Pure/Isar/theory_target.ML	Mon Jan 05 19:37:15 2009 +0100
+++ b/src/Pure/Isar/theory_target.ML	Tue Jan 06 08:50:12 2009 +0100
@@ -13,6 +13,7 @@
   val begin: string -> Proof.context -> local_theory
   val context: xstring -> theory -> local_theory
   val instantiation: string list * (string * sort) list * sort -> theory -> local_theory
+  val instantiation_cmd: xstring list * sort * xstring -> theory -> local_theory
   val overloading: (string * (string * typ) * bool) list -> theory -> local_theory
   val overloading_cmd: (string * string * bool) list -> theory -> local_theory
 end;
@@ -23,19 +24,19 @@
 (* new locales *)
 
 fun locale_extern new_locale x = 
-  if new_locale then NewLocale.extern x else Locale.extern x;
+  if new_locale then Locale.extern x else Old_Locale.extern x;
 fun locale_add_type_syntax new_locale x =
-  if new_locale then NewLocale.add_type_syntax x else Locale.add_type_syntax x;
+  if new_locale then Locale.add_type_syntax x else Old_Locale.add_type_syntax x;
 fun locale_add_term_syntax new_locale x =
-  if new_locale then NewLocale.add_term_syntax x else Locale.add_term_syntax x;
+  if new_locale then Locale.add_term_syntax x else Old_Locale.add_term_syntax x;
 fun locale_add_declaration new_locale x =
-  if new_locale then NewLocale.add_declaration x else Locale.add_declaration x;
+  if new_locale then Locale.add_declaration x else Old_Locale.add_declaration x;
 fun locale_add_thmss new_locale x =
-  if new_locale then NewLocale.add_thmss x else Locale.add_thmss x;
+  if new_locale then Locale.add_thmss x else Old_Locale.add_thmss x;
 fun locale_init new_locale x =
-  if new_locale then NewLocale.init x else Locale.init x;
+  if new_locale then Locale.init x else Old_Locale.init x;
 fun locale_intern new_locale x =
-  if new_locale then NewLocale.intern x else Locale.intern x;
+  if new_locale then Locale.intern x else Old_Locale.intern x;
 
 (* context data *)
 
@@ -82,7 +83,7 @@
   Pretty.block [Pretty.str "theory", Pretty.brk 1,
       Pretty.str (Context.theory_name (ProofContext.theory_of ctxt))] ::
     (if not (null overloading) then [Overloading.pretty ctxt]
-     else if not (null (#1 instantiation)) then [Class.pretty_instantiation ctxt]
+     else if not (null (#1 instantiation)) then [Class_Target.pretty_instantiation ctxt]
      else pretty_thy ctxt target is_locale is_class);
 
 
@@ -108,7 +109,7 @@
 
 fun class_target (Target {target, ...}) f =
   LocalTheory.raw_theory f #>
-  LocalTheory.target (Class.refresh_syntax target);
+  LocalTheory.target (Class_Target.refresh_syntax target);
 
 
 (* notes *)
@@ -207,7 +208,7 @@
     val (prefix', _) = Binding.dest b';
     val class_global = Binding.base_name b = Binding.base_name b'
       andalso not (null prefix')
-      andalso (fst o snd o split_last) prefix' = Class.class_prefix target;
+      andalso (fst o snd o split_last) prefix' = Class_Target.class_prefix target;
   in
     not (is_class andalso (similar_body orelse class_global)) ?
       (Context.mapping_result
@@ -231,11 +232,11 @@
     val (mx1, mx2, mx3) = fork_mixfix ta mx;
     fun syntax_error c = error ("Illegal mixfix syntax for overloaded constant " ^ quote c);
     val declare_const =
-      (case Class.instantiation_param lthy c of
+      (case Class_Target.instantiation_param lthy c of
         SOME c' =>
           if mx3 <> NoSyn then syntax_error c'
           else LocalTheory.theory_result (AxClass.declare_overloaded (c', U))
-            ##> Class.confirm_declaration c
+            ##> Class_Target.confirm_declaration c
         | NONE =>
             (case Overloading.operation lthy c of
               SOME (c', _) =>
@@ -248,7 +249,7 @@
   in
     lthy'
     |> is_locale ? term_syntax ta (locale_const ta Syntax.mode_default tags ((b, mx2), t))
-    |> is_class ? class_target ta (Class.declare target tags ((c, mx1), t))
+    |> is_class ? class_target ta (Class_Target.declare target tags ((c, mx1), t))
     |> LocalDefs.add_def ((b, NoSyn), t)
   end;
 
@@ -275,7 +276,7 @@
         #-> (fn (lhs, _) =>
           let val lhs' = Term.list_comb (Logic.unvarify lhs, xs) in
             term_syntax ta (locale_const ta prmode tags ((b, mx2), lhs')) #>
-            is_class ? class_target ta (Class.abbrev target prmode tags ((c, mx1), t'))
+            is_class ? class_target ta (Class_Target.abbrev target prmode tags ((c, mx1), t'))
           end)
       else
         LocalTheory.theory
@@ -311,7 +312,7 @@
         SOME (_, checked) =>
           (fn name => fn (Const (c, _), rhs) => Overloading.define checked name (c, rhs))
       | NONE =>
-          if is_none (Class.instantiation_param lthy c)
+          if is_none (Class_Target.instantiation_param lthy c)
           then (fn name => fn eq => Thm.add_def false false (name, Logic.mk_equals eq))
           else (fn name => fn (Const (c, _), rhs) => AxClass.define_overloaded name (c, rhs)));
     val (global_def, lthy3) = lthy2
@@ -333,15 +334,15 @@
 
 fun init_target _ NONE = global_target
   | init_target thy (SOME target) =
-      make_target target (NewLocale.test_locale thy (NewLocale.intern thy target))
-      true (Class.is_class thy target) ([], [], []) [];
+      make_target target (Locale.test_locale thy (Locale.intern thy target))
+      true (Class_Target.is_class thy target) ([], [], []) [];
 
 fun init_ctxt (Target {target, new_locale, is_locale, is_class, instantiation, overloading}) =
-  if not (null (#1 instantiation)) then Class.init_instantiation instantiation
+  if not (null (#1 instantiation)) then Class_Target.init_instantiation instantiation
   else if not (null overloading) then Overloading.init overloading
   else if not is_locale then ProofContext.init
   else if not is_class then locale_init new_locale target
-  else Class.init target;
+  else Class_Target.init target;
 
 fun init_lthy (ta as Target {target, instantiation, overloading, ...}) =
   Data.put ta #>
@@ -355,11 +356,20 @@
     declaration = declaration ta,
     reinit = fn lthy => init_lthy_ctxt ta (ProofContext.theory_of lthy),
     exit = LocalTheory.target_of o
-      (if not (null (#1 instantiation)) then Class.conclude_instantiation
+      (if not (null (#1 instantiation)) then Class_Target.conclude_instantiation
        else if not (null overloading) then Overloading.conclude
        else I)}
 and init_lthy_ctxt ta = init_lthy ta o init_ctxt ta;
 
+fun read_multi_arity thy (raw_tycos, raw_sorts, raw_sort) =
+  let
+    val all_arities = map (fn raw_tyco => Sign.read_arity thy
+      (raw_tyco, raw_sorts, raw_sort)) raw_tycos;
+    val tycos = map #1 all_arities;
+    val (_, sorts, sort) = hd all_arities;
+    val vs = Name.names Name.context Name.aT sorts;
+  in (tycos, vs, sort) end;
+
 fun gen_overloading prep_const raw_ops thy =
   let
     val ctxt = ProofContext.init thy;
@@ -374,9 +384,11 @@
 
 fun context "-" thy = init NONE thy
   | context target thy = init (SOME (locale_intern
-      (NewLocale.test_locale thy (NewLocale.intern thy target)) thy target)) thy;
+      (Locale.test_locale thy (Locale.intern thy target)) thy target)) thy;
 
 fun instantiation arities = init_lthy_ctxt (make_target "" false false false arities []);
+fun instantiation_cmd raw_arities thy =
+  instantiation (read_multi_arity thy raw_arities) thy;
 
 val overloading = gen_overloading (fn ctxt => Syntax.check_term ctxt o Const);
 val overloading_cmd = gen_overloading Syntax.read_term;
--- a/src/Pure/Tools/invoke.ML	Mon Jan 05 19:37:15 2009 +0100
+++ b/src/Pure/Tools/invoke.ML	Tue Jan 06 08:50:12 2009 +0100
@@ -6,9 +6,9 @@
 
 signature INVOKE =
 sig
-  val invoke: string * Attrib.src list -> Locale.expr -> string option list ->
+  val invoke: string * Attrib.src list -> Old_Locale.expr -> string option list ->
     (Binding.T * string option * mixfix) list -> bool -> Proof.state -> Proof.state
-  val invoke_i: string * attribute list -> Locale.expr -> term option list ->
+  val invoke_i: string * attribute list -> Old_Locale.expr -> term option list ->
     (Binding.T * typ option * mixfix) list -> bool -> Proof.state -> Proof.state
 end;
 
@@ -104,8 +104,8 @@
 in
 
 fun invoke x =
-  gen_invoke Attrib.attribute Locale.read_expr Syntax.parse_term ProofContext.add_fixes x;
-fun invoke_i x = gen_invoke (K I) Locale.cert_expr (K I) ProofContext.add_fixes_i x;
+  gen_invoke Attrib.attribute Old_Locale.read_expr Syntax.parse_term ProofContext.add_fixes x;
+fun invoke_i x = gen_invoke (K I) Old_Locale.cert_expr (K I) ProofContext.add_fixes_i x;
 
 end;