# HG changeset patch
# User wenzelm
# Date 1163105074 -3600
# Node ID 2285cf5a7560e387c97ed9cd3c6f0e5cb6c6401e
# Parent  e4cb9c7a7482b7c07c7e4cd657202036b64e9af6
init: '-' refers to global context;
provide reinit operation;

diff -r e4cb9c7a7482 -r 2285cf5a7560 src/Pure/Isar/theory_target.ML
--- a/src/Pure/Isar/theory_target.ML	Thu Nov 09 21:44:33 2006 +0100
+++ b/src/Pure/Isar/theory_target.ML	Thu Nov 09 21:44:34 2006 +0100
@@ -78,7 +78,7 @@
       |> LocalTheory.theory_result (fold_map const decls) |>> split_list;
   in
     lthy'
-    |> K (loc <> "") ? LocalTheory.abbrevs Syntax.default_mode abbrs
+    |> K (loc <> "") ? (snd o LocalTheory.abbrevs Syntax.default_mode abbrs)
     |> LocalDefs.add_defs defns |>> map (apsnd snd)
   end;
 
@@ -204,22 +204,24 @@
 
 (* init and exit *)
 
-fun begin loc =
-  Data.put (if loc = "" then NONE else SOME loc) #>
-  LocalTheory.init (SOME (NameSpace.base loc))
-   {pretty = pretty loc,
-    consts = consts loc,
-    axioms = axioms,
-    defs = defs,
-    notes = notes loc,
-    term_syntax = term_syntax loc,
-    declaration = declaration loc,
-    exit = K I};
+fun begin loc ctxt = ctxt
+  |> Data.put (if loc = "" then NONE else SOME loc)
+  |> LocalTheory.init (SOME (NameSpace.base loc))
+     {pretty = pretty loc,
+      consts = consts loc,
+      axioms = axioms,
+      defs = defs,
+      notes = notes loc,
+      term_syntax = term_syntax loc,
+      declaration = declaration loc,
+      reinit = begin loc,
+      exit = K I};
 
 fun init_i NONE thy = begin "" (ProofContext.init thy)
   | init_i (SOME loc) thy = begin loc (Locale.init loc thy);
 
-fun init loc thy = init_i (Option.map (Locale.intern thy) loc) thy;
+fun init (SOME "-") thy = init_i NONE thy
+  | init loc thy = init_i (Option.map (Locale.intern thy) loc) thy;
 
 fun mapping loc f = init loc #> f #> LocalTheory.exit false;