# HG changeset patch
# User wenzelm
# Date 1459783553 -7200
# Node ID caaa2fc4040db04a12e6379850ee1893866983f3
# Parent  e4140efe699ecc9ae3eb15b16840393d3a290415
clarified bootstrap -- avoid 'ML_file' in Pure.thy for uniformity;

diff -r e4140efe699e -r caaa2fc4040d src/Pure/Isar/isar_syn.ML
--- a/src/Pure/Isar/isar_syn.ML	Mon Apr 04 17:02:34 2016 +0200
+++ b/src/Pure/Isar/isar_syn.ML	Mon Apr 04 17:25:53 2016 +0200
@@ -189,6 +189,23 @@
 
 (* use ML text *)
 
+local
+
+fun ML_file_cmd debug files = Toplevel.generic_theory (fn gthy =>
+  let
+    val [{src_path, lines, digest, pos}: Token.file] = files (Context.theory_of gthy);
+    val provide = Resources.provide (src_path, digest);
+    val source = Input.source true (cat_lines lines) (pos, pos);
+    val flags: ML_Compiler.flags =
+      {SML = false, exchange = false, redirect = true, verbose = true,
+        debug = debug, writeln = writeln, warning = warning};
+  in
+    gthy
+    |> ML_Context.exec (fn () => ML_Context.eval_source flags source)
+    |> Local_Theory.propagate_ml_env
+    |> Context.mapping provide (Local_Theory.background_theory provide)
+  end);
+
 fun SML_file_cmd debug files = Toplevel.theory (fn thy =>
   let
     val ([{lines, pos, ...}: Token.file], thy') = files thy;
@@ -201,6 +218,22 @@
       (ML_Context.exec (fn () => ML_Context.eval_source flags source))
   end);
 
+in
+
+val _ =
+  Outer_Syntax.command ("ML_file", @{here}) "read and evaluate Isabelle/ML file"
+    (Resources.parse_files "ML_file" >> ML_file_cmd NONE);
+
+val _ =
+  Outer_Syntax.command ("ML_file_debug", @{here})
+    "read and evaluate Isabelle/ML file (with debugger information)"
+    (Resources.parse_files "ML_file_debug" >> ML_file_cmd (SOME true));
+
+val _ =
+  Outer_Syntax.command ("ML_file_no_debug", @{here})
+    "read and evaluate Isabelle/ML file (no debugger information)"
+    (Resources.parse_files "ML_file_no_debug" >> ML_file_cmd (SOME false));
+
 val _ =
   Outer_Syntax.command @{command_keyword SML_file} "read and evaluate Standard ML file"
     (Resources.provide_parse_files "SML_file" >> SML_file_cmd NONE);
@@ -215,6 +248,8 @@
     "read and evaluate Standard ML file (no debugger information)"
     (Resources.provide_parse_files "SML_file_no_debug" >> SML_file_cmd (SOME false));
 
+end;
+
 val _ =
   Outer_Syntax.command @{command_keyword SML_export} "evaluate SML within Isabelle/ML environment"
     (Parse.ML_source >> (fn source =>
@@ -241,14 +276,6 @@
       end));
 
 val _ =
-  Outer_Syntax.command @{command_keyword ML} "ML text within theory or local theory"
-    (Parse.ML_source >> (fn source =>
-      Toplevel.generic_theory
-        (ML_Context.exec (fn () =>
-            ML_Context.eval_source (ML_Compiler.verbose true ML_Compiler.flags) source) #>
-          Local_Theory.propagate_ml_env)));
-
-val _ =
   Outer_Syntax.command @{command_keyword ML_prf} "ML text within proof"
     (Parse.ML_source >> (fn source =>
       Toplevel.proof (Proof.map_context (Context.proof_map
diff -r e4140efe699e -r caaa2fc4040d src/Pure/Isar/outer_syntax.ML
--- a/src/Pure/Isar/outer_syntax.ML	Mon Apr 04 17:02:34 2016 +0200
+++ b/src/Pure/Isar/outer_syntax.ML	Mon Apr 04 17:25:53 2016 +0200
@@ -306,4 +306,15 @@
       in error ("Bad command " ^ quote name ^ Position.here pos ^ report) end
   end;
 
+
+(* 'ML' command -- required for bootstrapping Isar *)
+
+val _ =
+  command ("ML", @{here}) "ML text within theory or local theory"
+    (Parse.ML_source >> (fn source =>
+      Toplevel.generic_theory
+        (ML_Context.exec (fn () =>
+            ML_Context.eval_source (ML_Compiler.verbose true ML_Compiler.flags) source) #>
+          Local_Theory.propagate_ml_env)));
+
 end;
diff -r e4140efe699e -r caaa2fc4040d src/Pure/ML/ml_file.ML
--- a/src/Pure/ML/ml_file.ML	Mon Apr 04 17:02:34 2016 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,39 +0,0 @@
-(*  Title:      Pure/ML/ml_file.ML
-    Author:     Makarius
-
-The 'ML_file' command.
-*)
-
-structure ML_File: sig end =
-struct
-
-fun ML_file_cmd debug files = Toplevel.generic_theory (fn gthy =>
-  let
-    val [{src_path, lines, digest, pos}: Token.file] = files (Context.theory_of gthy);
-    val provide = Resources.provide (src_path, digest);
-    val source = Input.source true (cat_lines lines) (pos, pos);
-    val flags: ML_Compiler.flags =
-      {SML = false, exchange = false, redirect = true, verbose = true,
-        debug = debug, writeln = writeln, warning = warning};
-  in
-    gthy
-    |> ML_Context.exec (fn () => ML_Context.eval_source flags source)
-    |> Local_Theory.propagate_ml_env
-    |> Context.mapping provide (Local_Theory.background_theory provide)
-  end);
-
-val _ =
-  Outer_Syntax.command ("ML_file", @{here}) "read and evaluate Isabelle/ML file"
-    (Resources.parse_files "ML_file" >> ML_file_cmd NONE);
-
-val _ =
-  Outer_Syntax.command ("ML_file_debug", @{here})
-    "read and evaluate Isabelle/ML file (with debugger information)"
-    (Resources.parse_files "ML_file_debug" >> ML_file_cmd (SOME true));
-
-val _ =
-  Outer_Syntax.command ("ML_file_no_debug", @{here})
-    "read and evaluate Isabelle/ML file (no debugger information)"
-    (Resources.parse_files "ML_file_no_debug" >> ML_file_cmd (SOME false));
-
-end;
diff -r e4140efe699e -r caaa2fc4040d src/Pure/Pure.thy
--- a/src/Pure/Pure.thy	Mon Apr 04 17:02:34 2016 +0200
+++ b/src/Pure/Pure.thy	Mon Apr 04 17:25:53 2016 +0200
@@ -21,9 +21,9 @@
     "definition" "abbreviation" "type_notation" "no_type_notation" "notation"
     "no_notation" "axiomatization" "lemmas" "declare"
     "hide_class" "hide_type" "hide_const" "hide_fact" :: thy_decl
+  and "ML_file" "ML_file_debug" "ML_file_no_debug" :: thy_load % "ML"
   and "SML_file" "SML_file_debug" "SML_file_no_debug" :: thy_load % "ML"
   and "SML_import" "SML_export" :: thy_decl % "ML"
-  and "ML" :: thy_decl % "ML"
   and "ML_prf" :: prf_decl % "proof"  (* FIXME % "ML" ?? *)
   and "ML_val" "ML_command" :: diag % "ML"
   and "simproc_setup" :: thy_decl % "ML" == ""
@@ -93,7 +93,1130 @@
   and "named_theorems" :: thy_decl
 begin
 
-ML_file "Isar/isar_syn.ML"
+section \<open>Isar commands\<close>
+
+ML \<open>
+local
+
+(** theory commands **)
+
+(* sorts *)
+
+val _ =
+  Outer_Syntax.local_theory @{command_keyword default_sort}
+    "declare default sort for explicit type variables"
+    (Parse.sort >> (fn s => fn lthy => Local_Theory.set_defsort (Syntax.read_sort lthy s) lthy));
+
+
+(* types *)
+
+val _ =
+  Outer_Syntax.local_theory @{command_keyword typedecl} "type declaration"
+    (Parse.type_args -- Parse.binding -- Parse.opt_mixfix
+      >> (fn ((args, a), mx) =>
+          Typedecl.typedecl {final = true} (a, map (rpair dummyS) args, mx) #> snd));
+
+val _ =
+  Outer_Syntax.local_theory @{command_keyword type_synonym} "declare type abbreviation"
+    (Parse.type_args -- Parse.binding --
+      (@{keyword "="} |-- Parse.!!! (Parse.typ -- Parse.opt_mixfix'))
+      >> (fn ((args, a), (rhs, mx)) => snd o Typedecl.abbrev_cmd (a, args, mx) rhs));
+
+val _ =
+  Outer_Syntax.command @{command_keyword nonterminal}
+    "declare syntactic type constructors (grammar nonterminal symbols)"
+    (Parse.and_list1 Parse.binding >> (Toplevel.theory o Sign.add_nonterminals_global));
+
+
+(* consts and syntax *)
+
+val _ =
+  Outer_Syntax.command @{command_keyword judgment} "declare object-logic judgment"
+    (Parse.const_binding >> (Toplevel.theory o Object_Logic.add_judgment_cmd));
+
+val _ =
+  Outer_Syntax.command @{command_keyword consts} "declare constants"
+    (Scan.repeat1 Parse.const_binding >> (Toplevel.theory o Sign.add_consts_cmd));
+
+val mode_spec =
+  (@{keyword "output"} >> K ("", false)) ||
+    Parse.name -- Scan.optional (@{keyword "output"} >> K false) true;
+
+val opt_mode =
+  Scan.optional (@{keyword "("} |-- Parse.!!! (mode_spec --| @{keyword ")"})) Syntax.mode_default;
+
+val _ =
+  Outer_Syntax.command @{command_keyword syntax} "add raw syntax clauses"
+    (opt_mode -- Scan.repeat1 Parse.const_decl
+      >> (Toplevel.theory o uncurry Sign.add_syntax_cmd));
+
+val _ =
+  Outer_Syntax.command @{command_keyword no_syntax} "delete raw syntax clauses"
+    (opt_mode -- Scan.repeat1 Parse.const_decl
+      >> (Toplevel.theory o uncurry Sign.del_syntax_cmd));
+
+
+(* translations *)
+
+val trans_pat =
+  Scan.optional
+    (@{keyword "("} |-- Parse.!!! (Parse.inner_syntax Parse.xname --| @{keyword ")"})) "logic"
+    -- Parse.inner_syntax Parse.string;
+
+fun trans_arrow toks =
+  ((@{keyword "\<rightharpoonup>"} || @{keyword "=>"}) >> K Syntax.Parse_Rule ||
+    (@{keyword "\<leftharpoondown>"} || @{keyword "<="}) >> K Syntax.Print_Rule ||
+    (@{keyword "\<rightleftharpoons>"} || @{keyword "=="}) >> K Syntax.Parse_Print_Rule) toks;
+
+val trans_line =
+  trans_pat -- Parse.!!! (trans_arrow -- trans_pat)
+    >> (fn (left, (arr, right)) => arr (left, right));
+
+val _ =
+  Outer_Syntax.command @{command_keyword translations} "add syntax translation rules"
+    (Scan.repeat1 trans_line >> (Toplevel.theory o Isar_Cmd.translations));
+
+val _ =
+  Outer_Syntax.command @{command_keyword no_translations} "delete syntax translation rules"
+    (Scan.repeat1 trans_line >> (Toplevel.theory o Isar_Cmd.no_translations));
+
+
+(* constant definitions and abbreviations *)
+
+val _ =
+  Outer_Syntax.local_theory' @{command_keyword definition} "constant definition"
+    (Parse_Spec.constdef >> (fn args => #2 oo Specification.definition_cmd args));
+
+val _ =
+  Outer_Syntax.local_theory' @{command_keyword abbreviation} "constant abbreviation"
+    (opt_mode -- (Scan.option Parse_Spec.constdecl -- Parse.prop)
+      >> (fn (mode, args) => Specification.abbreviation_cmd mode args));
+
+val _ =
+  Outer_Syntax.local_theory @{command_keyword type_notation}
+    "add concrete syntax for type constructors"
+    (opt_mode -- Parse.and_list1 (Parse.type_const -- Parse.mixfix)
+      >> (fn (mode, args) => Specification.type_notation_cmd true mode args));
+
+val _ =
+  Outer_Syntax.local_theory @{command_keyword no_type_notation}
+    "delete concrete syntax for type constructors"
+    (opt_mode -- Parse.and_list1 (Parse.type_const -- Parse.mixfix)
+      >> (fn (mode, args) => Specification.type_notation_cmd false mode args));
+
+val _ =
+  Outer_Syntax.local_theory @{command_keyword notation}
+    "add concrete syntax for constants / fixed variables"
+    (opt_mode -- Parse.and_list1 (Parse.const -- Parse.mixfix)
+      >> (fn (mode, args) => Specification.notation_cmd true mode args));
+
+val _ =
+  Outer_Syntax.local_theory @{command_keyword no_notation}
+    "delete concrete syntax for constants / fixed variables"
+    (opt_mode -- Parse.and_list1 (Parse.const -- Parse.mixfix)
+      >> (fn (mode, args) => Specification.notation_cmd false mode args));
+
+
+(* constant specifications *)
+
+val _ =
+  Outer_Syntax.command @{command_keyword axiomatization} "axiomatic constant specification"
+    (Scan.optional Parse.fixes [] --
+      Scan.optional (Parse.where_ |-- Parse.!!! (Parse.and_list1 Parse_Spec.specs)) []
+      >> (fn (x, y) => Toplevel.theory (#2 o Specification.axiomatization_cmd x y)));
+
+
+(* theorems *)
+
+val _ =
+  Outer_Syntax.local_theory' @{command_keyword lemmas} "define theorems"
+    (Parse_Spec.name_facts -- Parse.for_fixes >>
+      (fn (facts, fixes) => #2 oo Specification.theorems_cmd Thm.theoremK facts fixes));
+
+val _ =
+  Outer_Syntax.local_theory' @{command_keyword declare} "declare theorems"
+    (Parse.and_list1 Parse.xthms1 -- Parse.for_fixes
+      >> (fn (facts, fixes) =>
+          #2 oo Specification.theorems_cmd "" [(Attrib.empty_binding, flat facts)] fixes));
+
+val _ =
+  Outer_Syntax.local_theory @{command_keyword named_theorems}
+    "declare named collection of theorems"
+    (Parse.and_list1 (Parse.binding -- Scan.optional Parse.text "") >>
+      fold (fn (b, descr) => snd o Named_Theorems.declare b descr));
+
+
+(* hide names *)
+
+local
+
+fun hide_names command_keyword what hide parse prep =
+  Outer_Syntax.command command_keyword ("hide " ^ what ^ " from name space")
+    ((Parse.opt_keyword "open" >> not) -- Scan.repeat1 parse >> (fn (fully, args) =>
+      (Toplevel.theory (fn thy =>
+        let val ctxt = Proof_Context.init_global thy
+        in fold (hide fully o prep ctxt) args thy end))));
+
+in
+
+val _ =
+  hide_names @{command_keyword hide_class} "classes" Sign.hide_class Parse.class
+    Proof_Context.read_class;
+
+val _ =
+  hide_names @{command_keyword hide_type} "types" Sign.hide_type Parse.type_const
+    ((#1 o dest_Type) oo Proof_Context.read_type_name {proper = true, strict = false});
+
+val _ =
+  hide_names @{command_keyword hide_const} "consts" Sign.hide_const Parse.const
+    ((#1 o dest_Const) oo Proof_Context.read_const {proper = true, strict = false});
+
+val _ =
+  hide_names @{command_keyword hide_fact} "facts" Global_Theory.hide_fact
+    (Parse.position Parse.xname) (Global_Theory.check_fact o Proof_Context.theory_of);
+
+end;
+
+
+(* use ML text *)
+
+local
+
+fun ML_file_cmd debug files = Toplevel.generic_theory (fn gthy =>
+  let
+    val [{src_path, lines, digest, pos}: Token.file] = files (Context.theory_of gthy);
+    val provide = Resources.provide (src_path, digest);
+    val source = Input.source true (cat_lines lines) (pos, pos);
+    val flags: ML_Compiler.flags =
+      {SML = false, exchange = false, redirect = true, verbose = true,
+        debug = debug, writeln = writeln, warning = warning};
+  in
+    gthy
+    |> ML_Context.exec (fn () => ML_Context.eval_source flags source)
+    |> Local_Theory.propagate_ml_env
+    |> Context.mapping provide (Local_Theory.background_theory provide)
+  end);
+
+fun SML_file_cmd debug files = Toplevel.theory (fn thy =>
+  let
+    val ([{lines, pos, ...}: Token.file], thy') = files thy;
+    val source = Input.source true (cat_lines lines) (pos, pos);
+    val flags: ML_Compiler.flags =
+      {SML = true, exchange = false, redirect = true, verbose = true,
+        debug = debug, writeln = writeln, warning = warning};
+  in
+    thy' |> Context.theory_map
+      (ML_Context.exec (fn () => ML_Context.eval_source flags source))
+  end);
+
+in
+
+val _ =
+  Outer_Syntax.command ("ML_file", @{here}) "read and evaluate Isabelle/ML file"
+    (Resources.parse_files "ML_file" >> ML_file_cmd NONE);
+
+val _ =
+  Outer_Syntax.command ("ML_file_debug", @{here})
+    "read and evaluate Isabelle/ML file (with debugger information)"
+    (Resources.parse_files "ML_file_debug" >> ML_file_cmd (SOME true));
+
+val _ =
+  Outer_Syntax.command ("ML_file_no_debug", @{here})
+    "read and evaluate Isabelle/ML file (no debugger information)"
+    (Resources.parse_files "ML_file_no_debug" >> ML_file_cmd (SOME false));
+
+val _ =
+  Outer_Syntax.command @{command_keyword SML_file} "read and evaluate Standard ML file"
+    (Resources.provide_parse_files "SML_file" >> SML_file_cmd NONE);
+
+val _ =
+  Outer_Syntax.command @{command_keyword SML_file_debug}
+    "read and evaluate Standard ML file (with debugger information)"
+    (Resources.provide_parse_files "SML_file_debug" >> SML_file_cmd (SOME true));
+
+val _ =
+  Outer_Syntax.command @{command_keyword SML_file_no_debug}
+    "read and evaluate Standard ML file (no debugger information)"
+    (Resources.provide_parse_files "SML_file_no_debug" >> SML_file_cmd (SOME false));
+
+end;
+
+val _ =
+  Outer_Syntax.command @{command_keyword SML_export} "evaluate SML within Isabelle/ML environment"
+    (Parse.ML_source >> (fn source =>
+      let
+        val flags: ML_Compiler.flags =
+          {SML = true, exchange = true, redirect = false, verbose = true,
+            debug = NONE, writeln = writeln, warning = warning};
+      in
+        Toplevel.theory
+          (Context.theory_map (ML_Context.exec (fn () => ML_Context.eval_source flags source)))
+      end));
+
+val _ =
+  Outer_Syntax.command @{command_keyword SML_import} "evaluate Isabelle/ML within SML environment"
+    (Parse.ML_source >> (fn source =>
+      let
+        val flags: ML_Compiler.flags =
+          {SML = false, exchange = true, redirect = false, verbose = true,
+            debug = NONE, writeln = writeln, warning = warning};
+      in
+        Toplevel.generic_theory
+          (ML_Context.exec (fn () => ML_Context.eval_source flags source) #>
+            Local_Theory.propagate_ml_env)
+      end));
+
+val _ =
+  Outer_Syntax.command @{command_keyword ML_prf} "ML text within proof"
+    (Parse.ML_source >> (fn source =>
+      Toplevel.proof (Proof.map_context (Context.proof_map
+        (ML_Context.exec (fn () =>
+            ML_Context.eval_source (ML_Compiler.verbose true ML_Compiler.flags) source))) #>
+          Proof.propagate_ml_env)));
+
+val _ =
+  Outer_Syntax.command @{command_keyword ML_val} "diagnostic ML text"
+    (Parse.ML_source >> Isar_Cmd.ml_diag true);
+
+val _ =
+  Outer_Syntax.command @{command_keyword ML_command} "diagnostic ML text (silent)"
+    (Parse.ML_source >> Isar_Cmd.ml_diag false);
+
+val _ =
+  Outer_Syntax.command @{command_keyword setup} "ML setup for global theory"
+    (Parse.ML_source >> (Toplevel.theory o Isar_Cmd.setup));
+
+val _ =
+  Outer_Syntax.local_theory @{command_keyword local_setup} "ML setup for local theory"
+    (Parse.ML_source >> Isar_Cmd.local_setup);
+
+val _ =
+  Outer_Syntax.local_theory @{command_keyword attribute_setup} "define attribute in ML"
+    (Parse.position Parse.name --
+        Parse.!!! (@{keyword "="} |-- Parse.ML_source -- Scan.optional Parse.text "")
+      >> (fn (name, (txt, cmt)) => Attrib.attribute_setup name txt cmt));
+
+val _ =
+  Outer_Syntax.local_theory @{command_keyword method_setup} "define proof method in ML"
+    (Parse.position Parse.name --
+        Parse.!!! (@{keyword "="} |-- Parse.ML_source -- Scan.optional Parse.text "")
+      >> (fn (name, (txt, cmt)) => Method.method_setup name txt cmt));
+
+val _ =
+  Outer_Syntax.local_theory @{command_keyword declaration} "generic ML declaration"
+    (Parse.opt_keyword "pervasive" -- Parse.ML_source
+      >> (fn (pervasive, txt) => Isar_Cmd.declaration {syntax = false, pervasive = pervasive} txt));
+
+val _ =
+  Outer_Syntax.local_theory @{command_keyword syntax_declaration} "generic ML syntax declaration"
+    (Parse.opt_keyword "pervasive" -- Parse.ML_source
+      >> (fn (pervasive, txt) => Isar_Cmd.declaration {syntax = true, pervasive = pervasive} txt));
+
+val _ =
+  Outer_Syntax.local_theory @{command_keyword simproc_setup} "define simproc in ML"
+    (Parse.position Parse.name --
+      (@{keyword "("} |-- Parse.enum1 "|" Parse.term --| @{keyword ")"} --| @{keyword "="}) --
+      Parse.ML_source -- Scan.optional (@{keyword "identifier"} |-- Scan.repeat1 Parse.xname) []
+    >> (fn (((a, b), c), d) => Isar_Cmd.simproc_setup a b c d));
+
+
+(* translation functions *)
+
+val _ =
+  Outer_Syntax.command @{command_keyword parse_ast_translation}
+    "install parse ast translation functions"
+    (Parse.ML_source >> (Toplevel.theory o Isar_Cmd.parse_ast_translation));
+
+val _ =
+  Outer_Syntax.command @{command_keyword parse_translation}
+    "install parse translation functions"
+    (Parse.ML_source >> (Toplevel.theory o Isar_Cmd.parse_translation));
+
+val _ =
+  Outer_Syntax.command @{command_keyword print_translation}
+    "install print translation functions"
+    (Parse.ML_source >> (Toplevel.theory o Isar_Cmd.print_translation));
+
+val _ =
+  Outer_Syntax.command @{command_keyword typed_print_translation}
+    "install typed print translation functions"
+    (Parse.ML_source >> (Toplevel.theory o Isar_Cmd.typed_print_translation));
+
+val _ =
+  Outer_Syntax.command @{command_keyword print_ast_translation}
+    "install print ast translation functions"
+    (Parse.ML_source >> (Toplevel.theory o Isar_Cmd.print_ast_translation));
+
+
+(* oracles *)
+
+val _ =
+  Outer_Syntax.command @{command_keyword oracle} "declare oracle"
+    (Parse.range Parse.name -- (@{keyword "="} |-- Parse.ML_source) >>
+      (fn (x, y) => Toplevel.theory (Isar_Cmd.oracle x y)));
+
+
+(* bundled declarations *)
+
+val _ =
+  Outer_Syntax.local_theory @{command_keyword bundle} "define bundle of declarations"
+    ((Parse.binding --| @{keyword "="}) -- Parse.xthms1 -- Parse.for_fixes
+      >> (uncurry Bundle.bundle_cmd));
+
+val _ =
+  Outer_Syntax.command @{command_keyword include}
+    "include declarations from bundle in proof body"
+    (Scan.repeat1 (Parse.position Parse.xname) >> (Toplevel.proof o Bundle.include_cmd));
+
+val _ =
+  Outer_Syntax.command @{command_keyword including}
+    "include declarations from bundle in goal refinement"
+    (Scan.repeat1 (Parse.position Parse.xname) >> (Toplevel.proof o Bundle.including_cmd));
+
+val _ =
+  Outer_Syntax.command @{command_keyword print_bundles}
+    "print bundles of declarations"
+    (Parse.opt_bang >> (fn b => Toplevel.keep (Bundle.print_bundles b o Toplevel.context_of)));
+
+
+(* local theories *)
+
+val _ =
+  Outer_Syntax.command @{command_keyword context} "begin local theory context"
+    ((Parse.position Parse.xname >> (fn name =>
+        Toplevel.begin_local_theory true (Named_Target.begin name)) ||
+      Scan.optional Parse_Spec.includes [] -- Scan.repeat Parse_Spec.context_element
+        >> (fn (incls, elems) => Toplevel.open_target (#2 o Bundle.context_cmd incls elems)))
+      --| Parse.begin);
+
+
+(* locales *)
+
+val locale_val =
+  Parse_Spec.locale_expression --
+    Scan.optional (@{keyword "+"} |-- Parse.!!! (Scan.repeat1 Parse_Spec.context_element)) [] ||
+  Scan.repeat1 Parse_Spec.context_element >> pair ([], []);
+
+val _ =
+  Outer_Syntax.command @{command_keyword locale} "define named specification context"
+    (Parse.binding --
+      Scan.optional (@{keyword "="} |-- Parse.!!! locale_val) (([], []), []) -- Parse.opt_begin
+      >> (fn ((name, (expr, elems)), begin) =>
+          Toplevel.begin_local_theory begin
+            (Expression.add_locale_cmd name Binding.empty expr elems #> snd)));
+
+val _ =
+  Outer_Syntax.command @{command_keyword experiment} "open private specification context"
+    (Scan.repeat Parse_Spec.context_element --| Parse.begin
+      >> (fn elems =>
+          Toplevel.begin_local_theory true (Experiment.experiment_cmd elems #> snd)));
+
+val interpretation_args =
+  Parse.!!! Parse_Spec.locale_expression --
+    Scan.optional
+      (@{keyword "rewrites"} |-- Parse.and_list1 (Parse_Spec.opt_thm_name ":" -- Parse.prop)) [];
+
+val _ =
+  Outer_Syntax.command @{command_keyword interpret}
+    "prove interpretation of locale expression in proof context"
+    (interpretation_args >> (fn (expr, equations) =>
+      Toplevel.proof (Interpretation.interpret_cmd expr equations)));
+
+val interpretation_args_with_defs =
+  Parse.!!! Parse_Spec.locale_expression --
+    (Scan.optional (@{keyword "defines"} |-- Parse.and_list1 (Parse_Spec.opt_thm_name ":"
+      -- ((Parse.binding -- Parse.opt_mixfix') --| @{keyword "="} -- Parse.term))) [] --
+    Scan.optional
+      (@{keyword "rewrites"} |-- Parse.and_list1 (Parse_Spec.opt_thm_name ":" -- Parse.prop)) []);
+
+val _ =
+  Outer_Syntax.local_theory_to_proof @{command_keyword global_interpretation}
+    "prove interpretation of locale expression into global theory"
+    (interpretation_args_with_defs
+      >> (fn (expr, (defs, equations)) => Interpretation.global_interpretation_cmd expr defs equations));
+
+val _ =
+  Outer_Syntax.command @{command_keyword sublocale}
+    "prove sublocale relation between a locale and a locale expression"
+    ((Parse.position Parse.xname --| (@{keyword "\<subseteq>"} || @{keyword "<"}) --
+      interpretation_args_with_defs >> (fn (loc, (expr, (defs, equations))) =>
+        Toplevel.theory_to_proof (Interpretation.global_sublocale_cmd loc expr defs equations)))
+    || interpretation_args_with_defs >> (fn (expr, (defs, equations)) =>
+        Toplevel.local_theory_to_proof NONE NONE (Interpretation.sublocale_cmd expr defs equations)));
+
+val _ =
+  Outer_Syntax.command @{command_keyword interpretation}
+    "prove interpretation of locale expression in local theory or into global theory"
+    (interpretation_args >> (fn (expr, equations) =>
+      Toplevel.local_theory_to_proof NONE NONE (Interpretation.isar_interpretation_cmd expr equations)));
+
+
+
+(* classes *)
+
+val class_val =
+  Parse_Spec.class_expression --
+    Scan.optional (@{keyword "+"} |-- Parse.!!! (Scan.repeat1 Parse_Spec.context_element)) [] ||
+  Scan.repeat1 Parse_Spec.context_element >> pair [];
+
+val _ =
+  Outer_Syntax.command @{command_keyword class} "define type class"
+   (Parse.binding -- Scan.optional (@{keyword "="} |-- class_val) ([], []) -- Parse.opt_begin
+    >> (fn ((name, (supclasses, elems)), begin) =>
+        Toplevel.begin_local_theory begin
+          (Class_Declaration.class_cmd name supclasses elems #> snd)));
+
+val _ =
+  Outer_Syntax.local_theory_to_proof @{command_keyword subclass} "prove a subclass relation"
+    (Parse.class >> Class_Declaration.subclass_cmd);
+
+val _ =
+  Outer_Syntax.command @{command_keyword instantiation} "instantiate and prove type arity"
+   (Parse.multi_arity --| Parse.begin
+     >> (fn arities => Toplevel.begin_local_theory true (Class.instantiation_cmd arities)));
+
+val _ =
+  Outer_Syntax.command @{command_keyword instance} "prove type arity or subclass relation"
+  ((Parse.class --
+    ((@{keyword "\<subseteq>"} || @{keyword "<"}) |-- Parse.!!! Parse.class) >> Class.classrel_cmd ||
+    Parse.multi_arity >> Class.instance_arity_cmd) >> Toplevel.theory_to_proof ||
+    Scan.succeed (Toplevel.local_theory_to_proof NONE NONE (Class.instantiation_instance I)));
+
+
+(* arbitrary overloading *)
+
+val _ =
+  Outer_Syntax.command @{command_keyword overloading} "overloaded definitions"
+   (Scan.repeat1 (Parse.name --| (@{keyword "=="} || @{keyword "\<equiv>"}) -- Parse.term --
+      Scan.optional (@{keyword "("} |-- (@{keyword "unchecked"} >> K false) --| @{keyword ")"}) true
+      >> Scan.triple1) --| Parse.begin
+   >> (fn operations => Toplevel.begin_local_theory true (Overloading.overloading_cmd operations)));
+
+
+(* code generation *)
+
+val _ =
+  Outer_Syntax.command @{command_keyword code_datatype}
+    "define set of code datatype constructors"
+    (Scan.repeat1 Parse.term >> (Toplevel.theory o Code.add_datatype_cmd));
+
+
+
+(** proof commands **)
+
+val _ =
+  Outer_Syntax.local_theory_to_proof @{command_keyword notepad} "begin proof context"
+    (Parse.begin >> K Proof.begin_notepad);
+
+
+(* statements *)
+
+val structured_statement =
+  Parse_Spec.statement -- Parse_Spec.cond_statement -- Parse.for_fixes
+    >> (fn ((shows, (strict, assumes)), fixes) => (strict, fixes, assumes, shows));
+
+val structured_statement' =
+  Parse_Spec.statement -- Parse_Spec.if_statement' -- Parse.for_fixes
+    >> (fn ((shows, assumes), fixes) => (fixes, assumes, shows));
+
+
+fun theorem spec schematic descr =
+  Outer_Syntax.local_theory_to_proof' spec
+    ("state " ^ descr)
+    (Scan.optional (Parse_Spec.opt_thm_name ":" --|
+      Scan.ahead (Parse_Spec.includes >> K "" ||
+        Parse_Spec.locale_keyword || Parse_Spec.statement_keyword)) Attrib.empty_binding --
+      Scan.optional Parse_Spec.includes [] --
+      Parse_Spec.general_statement >> (fn ((a, includes), (elems, concl)) =>
+        ((if schematic then Specification.schematic_theorem_cmd else Specification.theorem_cmd)
+          Thm.theoremK NONE (K I) a includes elems concl)));
+
+val _ = theorem @{command_keyword theorem} false "theorem";
+val _ = theorem @{command_keyword lemma} false "lemma";
+val _ = theorem @{command_keyword corollary} false "corollary";
+val _ = theorem @{command_keyword proposition} false "proposition";
+val _ = theorem @{command_keyword schematic_goal} true "schematic goal";
+
+
+val _ =
+  Outer_Syntax.command @{command_keyword have} "state local goal"
+    (structured_statement >> (fn (a, b, c, d) =>
+      Toplevel.proof' (fn int => Proof.have_cmd a NONE (K I) b c d int #> #2)));
+
+val _ =
+  Outer_Syntax.command @{command_keyword show} "state local goal, to refine pending subgoals"
+    (structured_statement >> (fn (a, b, c, d) =>
+      Toplevel.proof' (fn int => Proof.show_cmd a NONE (K I) b c d int #> #2)));
+
+val _ =
+  Outer_Syntax.command @{command_keyword hence} "old-style alias of \"then have\""
+    (structured_statement >> (fn (a, b, c, d) =>
+      Toplevel.proof' (fn int => Proof.chain #> Proof.have_cmd a NONE (K I) b c d int #> #2)));
+
+val _ =
+  Outer_Syntax.command @{command_keyword thus} "old-style alias of  \"then show\""
+    (structured_statement >> (fn (a, b, c, d) =>
+      Toplevel.proof' (fn int => Proof.chain #> Proof.show_cmd a NONE (K I) b c d int #> #2)));
+
+
+(* facts *)
+
+val facts = Parse.and_list1 Parse.xthms1;
+
+val _ =
+  Outer_Syntax.command @{command_keyword then} "forward chaining"
+    (Scan.succeed (Toplevel.proof Proof.chain));
+
+val _ =
+  Outer_Syntax.command @{command_keyword from} "forward chaining from given facts"
+    (facts >> (Toplevel.proof o Proof.from_thmss_cmd));
+
+val _ =
+  Outer_Syntax.command @{command_keyword with} "forward chaining from given and current facts"
+    (facts >> (Toplevel.proof o Proof.with_thmss_cmd));
+
+val _ =
+  Outer_Syntax.command @{command_keyword note} "define facts"
+    (Parse_Spec.name_facts >> (Toplevel.proof o Proof.note_thmss_cmd));
+
+val _ =
+  Outer_Syntax.command @{command_keyword supply} "define facts during goal refinement (unstructured)"
+    (Parse_Spec.name_facts >> (Toplevel.proof o Proof.supply_cmd));
+
+val _ =
+  Outer_Syntax.command @{command_keyword using} "augment goal facts"
+    (facts >> (Toplevel.proof o Proof.using_cmd));
+
+val _ =
+  Outer_Syntax.command @{command_keyword unfolding} "unfold definitions in goal and facts"
+    (facts >> (Toplevel.proof o Proof.unfolding_cmd));
+
+
+(* proof context *)
+
+val _ =
+  Outer_Syntax.command @{command_keyword fix} "fix local variables (Skolem constants)"
+    (Parse.fixes >> (Toplevel.proof o Proof.fix_cmd));
+
+val _ =
+  Outer_Syntax.command @{command_keyword assume} "assume propositions"
+    (structured_statement' >> (fn (a, b, c) => Toplevel.proof (Proof.assume_cmd a b c)));
+
+val _ =
+  Outer_Syntax.command @{command_keyword presume} "assume propositions, to be established later"
+    (structured_statement' >> (fn (a, b, c) => Toplevel.proof (Proof.presume_cmd a b c)));
+
+val _ =
+  Outer_Syntax.command @{command_keyword def} "local definition (non-polymorphic)"
+    (Parse.and_list1
+      (Parse_Spec.opt_thm_name ":" --
+        ((Parse.binding -- Parse.opt_mixfix) --
+          ((@{keyword "\<equiv>"} || @{keyword "=="}) |-- Parse.!!! Parse.termp)))
+    >> (Toplevel.proof o Proof.def_cmd));
+
+val _ =
+  Outer_Syntax.command @{command_keyword consider} "state cases rule"
+    (Parse_Spec.obtains >> (Toplevel.proof' o Obtain.consider_cmd));
+
+val _ =
+  Outer_Syntax.command @{command_keyword obtain} "generalized elimination"
+    (Parse.parbinding -- Scan.optional (Parse.fixes --| Parse.where_) [] -- Parse_Spec.statement
+      >> (fn ((x, y), z) => Toplevel.proof' (Obtain.obtain_cmd x y z)));
+
+val _ =
+  Outer_Syntax.command @{command_keyword guess} "wild guessing (unstructured)"
+    (Scan.optional Parse.fixes [] >> (Toplevel.proof' o Obtain.guess_cmd));
+
+val _ =
+  Outer_Syntax.command @{command_keyword let} "bind text variables"
+    (Parse.and_list1 (Parse.and_list1 Parse.term -- (@{keyword "="} |-- Parse.term))
+      >> (Toplevel.proof o Proof.let_bind_cmd));
+
+val _ =
+  Outer_Syntax.command @{command_keyword write} "add concrete syntax for constants / fixed variables"
+    (opt_mode -- Parse.and_list1 (Parse.const -- Parse.mixfix)
+    >> (fn (mode, args) => Toplevel.proof (Proof.write_cmd mode args)));
+
+val _ =
+  Outer_Syntax.command @{command_keyword case} "invoke local context"
+    (Parse_Spec.opt_thm_name ":" --
+      (@{keyword "("} |--
+        Parse.!!! (Parse.position Parse.xname -- Scan.repeat (Parse.maybe Parse.binding)
+          --| @{keyword ")"}) ||
+        Parse.position Parse.xname >> rpair []) >> (Toplevel.proof o Proof.case_cmd));
+
+
+(* proof structure *)
+
+val _ =
+  Outer_Syntax.command @{command_keyword "{"} "begin explicit proof block"
+    (Scan.succeed (Toplevel.proof Proof.begin_block));
+
+val _ =
+  Outer_Syntax.command @{command_keyword "}"} "end explicit proof block"
+    (Scan.succeed (Toplevel.proof Proof.end_block));
+
+val _ =
+  Outer_Syntax.command @{command_keyword next} "enter next proof block"
+    (Scan.succeed (Toplevel.proof Proof.next_block));
+
+
+(* end proof *)
+
+val _ =
+  Outer_Syntax.command @{command_keyword qed} "conclude proof"
+    (Scan.option Method.parse >> (fn m =>
+     (Option.map Method.report m;
+      Isar_Cmd.qed m)));
+
+val _ =
+  Outer_Syntax.command @{command_keyword by} "terminal backward proof"
+    (Method.parse -- Scan.option Method.parse >> (fn (m1, m2) =>
+     (Method.report m1;
+      Option.map Method.report m2;
+      Isar_Cmd.terminal_proof (m1, m2))));
+
+val _ =
+  Outer_Syntax.command @{command_keyword ".."} "default proof"
+    (Scan.succeed Isar_Cmd.default_proof);
+
+val _ =
+  Outer_Syntax.command @{command_keyword "."} "immediate proof"
+    (Scan.succeed Isar_Cmd.immediate_proof);
+
+val _ =
+  Outer_Syntax.command @{command_keyword done} "done proof"
+    (Scan.succeed Isar_Cmd.done_proof);
+
+val _ =
+  Outer_Syntax.command @{command_keyword sorry} "skip proof (quick-and-dirty mode only!)"
+    (Scan.succeed Isar_Cmd.skip_proof);
+
+val _ =
+  Outer_Syntax.command @{command_keyword "\<proof>"} "dummy proof (quick-and-dirty mode only!)"
+    (Scan.succeed Isar_Cmd.skip_proof);
+
+val _ =
+  Outer_Syntax.command @{command_keyword oops} "forget proof"
+    (Scan.succeed (Toplevel.forget_proof true));
+
+
+(* proof steps *)
+
+val _ =
+  Outer_Syntax.command @{command_keyword defer} "shuffle internal proof state"
+    (Scan.optional Parse.nat 1 >> (Toplevel.proof o Proof.defer));
+
+val _ =
+  Outer_Syntax.command @{command_keyword prefer} "shuffle internal proof state"
+    (Parse.nat >> (Toplevel.proof o Proof.prefer));
+
+val _ =
+  Outer_Syntax.command @{command_keyword apply} "initial goal refinement step (unstructured)"
+    (Method.parse >> (fn m => (Method.report m; Toplevel.proofs (Proof.apply m))));
+
+val _ =
+  Outer_Syntax.command @{command_keyword apply_end} "terminal goal refinement step (unstructured)"
+    (Method.parse >> (fn m => (Method.report m; Toplevel.proofs (Proof.apply_end m))));
+
+val _ =
+  Outer_Syntax.command @{command_keyword proof} "backward proof step"
+    (Scan.option Method.parse >> (fn m =>
+      (Option.map Method.report m; Toplevel.proofs (Proof.proof m))));
+
+
+(* subgoal focus *)
+
+local
+
+val opt_fact_binding =
+  Scan.optional (Parse.binding -- Parse.opt_attribs || Parse.attribs >> pair Binding.empty)
+    Attrib.empty_binding;
+
+val for_params =
+  Scan.optional
+    (@{keyword "for"} |--
+      Parse.!!! ((Scan.option Parse.dots >> is_some) --
+        (Scan.repeat1 (Parse.position (Parse.maybe Parse.name)))))
+    (false, []);
+
+in
+
+val _ =
+  Outer_Syntax.command @{command_keyword subgoal}
+    "focus on first subgoal within backward refinement"
+    (opt_fact_binding -- (Scan.option (@{keyword "premises"} |-- Parse.!!! opt_fact_binding)) --
+      for_params >> (fn ((a, b), c) =>
+        Toplevel.proofs (Seq.make_results o Seq.single o #2 o Subgoal.subgoal_cmd a b c)));
+
+end;
+
+
+(* calculation *)
+
+val calculation_args =
+  Scan.option (@{keyword "("} |-- Parse.!!! ((Parse.xthms1 --| @{keyword ")"})));
+
+val _ =
+  Outer_Syntax.command @{command_keyword also} "combine calculation and current facts"
+    (calculation_args >> (Toplevel.proofs' o Calculation.also_cmd));
+
+val _ =
+  Outer_Syntax.command @{command_keyword finally}
+    "combine calculation and current facts, exhibit result"
+    (calculation_args >> (Toplevel.proofs' o Calculation.finally_cmd));
+
+val _ =
+  Outer_Syntax.command @{command_keyword moreover} "augment calculation by current facts"
+    (Scan.succeed (Toplevel.proof' Calculation.moreover));
+
+val _ =
+  Outer_Syntax.command @{command_keyword ultimately}
+    "augment calculation by current facts, exhibit result"
+    (Scan.succeed (Toplevel.proof' Calculation.ultimately));
+
+val _ =
+  Outer_Syntax.command @{command_keyword print_trans_rules} "print transitivity rules"
+    (Scan.succeed (Toplevel.keep (Calculation.print_rules o Toplevel.context_of)));
+
+
+(* proof navigation *)
+
+fun report_back () =
+  Output.report [Markup.markup Markup.bad "Explicit backtracking"];
+
+val _ =
+  Outer_Syntax.command @{command_keyword back} "explicit backtracking of proof command"
+    (Scan.succeed
+     (Toplevel.actual_proof (fn prf => (report_back (); Proof_Node.back prf)) o
+      Toplevel.skip_proof report_back));
+
+
+
+(** diagnostic commands (for interactive mode only) **)
+
+val opt_modes =
+  Scan.optional (@{keyword "("} |-- Parse.!!! (Scan.repeat1 Parse.xname --| @{keyword ")"})) [];
+
+val _ =
+  Outer_Syntax.command @{command_keyword help}
+    "retrieve outer syntax commands according to name patterns"
+    (Scan.repeat Parse.name >>
+      (fn pats => Toplevel.keep (fn st => Outer_Syntax.help (Toplevel.theory_of st) pats)));
+
+val _ =
+  Outer_Syntax.command @{command_keyword print_commands} "print outer syntax commands"
+    (Scan.succeed (Toplevel.keep (Outer_Syntax.print_commands o Toplevel.theory_of)));
+
+val _ =
+  Outer_Syntax.command @{command_keyword print_options} "print configuration options"
+    (Parse.opt_bang >> (fn b => Toplevel.keep (Attrib.print_options b o Toplevel.context_of)));
+
+val _ =
+  Outer_Syntax.command @{command_keyword print_context}
+    "print context of local theory target"
+    (Scan.succeed (Toplevel.keep (Pretty.writeln_chunks o Toplevel.pretty_context)));
+
+val _ =
+  Outer_Syntax.command @{command_keyword print_theory}
+    "print logical theory contents"
+    (Parse.opt_bang >> (fn b =>
+      Toplevel.keep (Pretty.writeln o Proof_Display.pretty_theory b o Toplevel.context_of)));
+
+val _ =
+  Outer_Syntax.command @{command_keyword print_definitions}
+    "print dependencies of definitional theory content"
+    (Parse.opt_bang >> (fn b =>
+      Toplevel.keep (Pretty.writeln o Proof_Display.pretty_definitions b o Toplevel.context_of)));
+
+val _ =
+  Outer_Syntax.command @{command_keyword print_syntax}
+    "print inner syntax of context"
+    (Scan.succeed (Toplevel.keep (Proof_Context.print_syntax o Toplevel.context_of)));
+
+val _ =
+  Outer_Syntax.command @{command_keyword print_defn_rules}
+    "print definitional rewrite rules of context"
+    (Scan.succeed (Toplevel.keep (Local_Defs.print_rules o Toplevel.context_of)));
+
+val _ =
+  Outer_Syntax.command @{command_keyword print_abbrevs}
+    "print constant abbreviations of context"
+    (Parse.opt_bang >> (fn b =>
+      Toplevel.keep (Proof_Context.print_abbrevs b o Toplevel.context_of)));
+
+val _ =
+  Outer_Syntax.command @{command_keyword print_theorems}
+    "print theorems of local theory or proof context"
+    (Parse.opt_bang >> (fn b =>
+      Toplevel.keep (Pretty.writeln o Pretty.chunks o Isar_Cmd.pretty_theorems b)));
+
+val _ =
+  Outer_Syntax.command @{command_keyword print_locales}
+    "print locales of this theory"
+    (Parse.opt_bang >> (fn b =>
+      Toplevel.keep (Locale.print_locales b o Toplevel.theory_of)));
+
+val _ =
+  Outer_Syntax.command @{command_keyword print_classes}
+    "print classes of this theory"
+    (Scan.succeed (Toplevel.keep (Class.print_classes o Toplevel.context_of)));
+
+val _ =
+  Outer_Syntax.command @{command_keyword print_locale}
+    "print locale of this theory"
+    (Parse.opt_bang -- Parse.position Parse.xname >> (fn (b, name) =>
+      Toplevel.keep (fn state => Locale.print_locale (Toplevel.theory_of state) b name)));
+
+val _ =
+  Outer_Syntax.command @{command_keyword print_interps}
+    "print interpretations of locale for this theory or proof context"
+    (Parse.position Parse.xname >> (fn name =>
+      Toplevel.keep (fn state => Locale.print_registrations (Toplevel.context_of state) name)));
+
+val _ =
+  Outer_Syntax.command @{command_keyword print_dependencies}
+    "print dependencies of locale expression"
+    (Parse.opt_bang -- Parse_Spec.locale_expression >> (fn (b, expr) =>
+      Toplevel.keep (fn state => Expression.print_dependencies (Toplevel.context_of state) b expr)));
+
+val _ =
+  Outer_Syntax.command @{command_keyword print_attributes}
+    "print attributes of this theory"
+    (Parse.opt_bang >> (fn b => Toplevel.keep (Attrib.print_attributes b o Toplevel.context_of)));
+
+val _ =
+  Outer_Syntax.command @{command_keyword print_simpset}
+    "print context of Simplifier"
+    (Parse.opt_bang >> (fn b =>
+      Toplevel.keep (Pretty.writeln o Simplifier.pretty_simpset b o Toplevel.context_of)));
+
+val _ =
+  Outer_Syntax.command @{command_keyword print_rules} "print intro/elim rules"
+    (Scan.succeed (Toplevel.keep (Context_Rules.print_rules o Toplevel.context_of)));
+
+val _ =
+  Outer_Syntax.command @{command_keyword print_methods} "print methods of this theory"
+    (Parse.opt_bang >> (fn b => Toplevel.keep (Method.print_methods b o Toplevel.context_of)));
+
+val _ =
+  Outer_Syntax.command @{command_keyword print_antiquotations}
+    "print document antiquotations"
+    (Parse.opt_bang >> (fn b =>
+      Toplevel.keep (Thy_Output.print_antiquotations b o Toplevel.context_of)));
+
+val _ =
+  Outer_Syntax.command @{command_keyword print_ML_antiquotations}
+    "print ML antiquotations"
+    (Parse.opt_bang >> (fn b =>
+      Toplevel.keep (ML_Context.print_antiquotations b o Toplevel.context_of)));
+
+val _ =
+  Outer_Syntax.command @{command_keyword locale_deps} "visualize locale dependencies"
+    (Scan.succeed
+      (Toplevel.keep (Toplevel.theory_of #> (fn thy =>
+        Locale.pretty_locale_deps thy
+        |> map (fn {name, parents, body} =>
+          ((name, Graph_Display.content_node (Locale.extern thy name) [body]), parents))
+        |> Graph_Display.display_graph_old))));
+
+val _ =
+  Outer_Syntax.command @{command_keyword print_term_bindings}
+    "print term bindings of proof context"
+    (Scan.succeed
+      (Toplevel.keep
+        (Pretty.writeln_chunks o Proof_Context.pretty_term_bindings o Toplevel.context_of)));
+
+val _ =
+  Outer_Syntax.command @{command_keyword print_facts} "print facts of proof context"
+    (Parse.opt_bang >> (fn b =>
+      Toplevel.keep (Proof_Context.print_local_facts b o Toplevel.context_of)));
+
+val _ =
+  Outer_Syntax.command @{command_keyword print_cases} "print cases of proof context"
+    (Scan.succeed
+      (Toplevel.keep (Pretty.writeln_chunks o Proof_Context.pretty_cases o Toplevel.context_of)));
+
+val _ =
+  Outer_Syntax.command @{command_keyword print_statement}
+    "print theorems as long statements"
+    (opt_modes -- Parse.xthms1 >> Isar_Cmd.print_stmts);
+
+val _ =
+  Outer_Syntax.command @{command_keyword thm} "print theorems"
+    (opt_modes -- Parse.xthms1 >> Isar_Cmd.print_thms);
+
+val _ =
+  Outer_Syntax.command @{command_keyword prf} "print proof terms of theorems"
+    (opt_modes -- Scan.option Parse.xthms1 >> Isar_Cmd.print_prfs false);
+
+val _ =
+  Outer_Syntax.command @{command_keyword full_prf} "print full proof terms of theorems"
+    (opt_modes -- Scan.option Parse.xthms1 >> Isar_Cmd.print_prfs true);
+
+val _ =
+  Outer_Syntax.command @{command_keyword prop} "read and print proposition"
+    (opt_modes -- Parse.term >> Isar_Cmd.print_prop);
+
+val _ =
+  Outer_Syntax.command @{command_keyword term} "read and print term"
+    (opt_modes -- Parse.term >> Isar_Cmd.print_term);
+
+val _ =
+  Outer_Syntax.command @{command_keyword typ} "read and print type"
+    (opt_modes -- (Parse.typ -- Scan.option (@{keyword "::"} |-- Parse.!!! Parse.sort))
+      >> Isar_Cmd.print_type);
+
+val _ =
+  Outer_Syntax.command @{command_keyword print_codesetup} "print code generator setup"
+    (Scan.succeed (Toplevel.keep (Code.print_codesetup o Toplevel.theory_of)));
+
+val _ =
+  Outer_Syntax.command @{command_keyword print_state}
+    "print current proof state (if present)"
+    (opt_modes >> (fn modes =>
+      Toplevel.keep (Print_Mode.with_modes modes (Output.state o Toplevel.string_of_state))));
+
+val _ =
+  Outer_Syntax.command @{command_keyword welcome} "print welcome message"
+    (Scan.succeed (Toplevel.keep (fn _ => writeln (Session.welcome ()))));
+
+val _ =
+  Outer_Syntax.command @{command_keyword display_drafts}
+    "display raw source files with symbols"
+    (Scan.repeat1 Parse.path >> (fn names =>
+      Toplevel.keep (fn _ => ignore (Present.display_drafts (map Path.explode names)))));
+
+
+(* deps *)
+
+local
+  val theory_bounds =
+    Parse.position Parse.theory_xname >> single ||
+    (@{keyword "("} |-- Parse.enum "|" (Parse.position Parse.theory_xname) --| @{keyword ")"});
+in
+
+val _ =
+  Outer_Syntax.command @{command_keyword thy_deps} "visualize theory dependencies"
+    (Scan.option theory_bounds -- Scan.option theory_bounds >>
+      (fn args => Toplevel.keep (fn st => Thy_Deps.thy_deps_cmd (Toplevel.context_of st) args)));
+
+end;
+
+local
+  val class_bounds =
+    Parse.sort >> single ||
+    (@{keyword "("} |-- Parse.enum "|" Parse.sort --| @{keyword ")"});
+in
+
+val _ =
+  Outer_Syntax.command @{command_keyword class_deps} "visualize class dependencies"
+    (Scan.option class_bounds -- Scan.option class_bounds >> (fn args =>
+      Toplevel.keep (fn st => Class_Deps.class_deps_cmd (Toplevel.context_of st) args)));
+
+end;
+
+val _ =
+  Outer_Syntax.command @{command_keyword thm_deps} "visualize theorem dependencies"
+    (Parse.xthms1 >> (fn args =>
+      Toplevel.keep (fn st =>
+        Thm_Deps.thm_deps (Toplevel.theory_of st)
+          (Attrib.eval_thms (Toplevel.context_of st) args))));
+
+local
+  val thy_names =
+    Scan.repeat1 (Scan.unless Parse.minus (Parse.position Parse.theory_xname));
+in
+
+val _ =
+  Outer_Syntax.command @{command_keyword unused_thms} "find unused theorems"
+    (Scan.option ((thy_names --| Parse.minus) -- Scan.option thy_names) >> (fn opt_range =>
+        Toplevel.keep (fn st =>
+          let
+            val thy = Toplevel.theory_of st;
+            val ctxt = Toplevel.context_of st;
+            fun pretty_thm (a, th) = Proof_Context.pretty_fact ctxt (a, [th]);
+            val check = Theory.check ctxt;
+          in
+            Thm_Deps.unused_thms
+              (case opt_range of
+                NONE => (Theory.parents_of thy, [thy])
+              | SOME (xs, NONE) => (map check xs, [thy])
+              | SOME (xs, SOME ys) => (map check xs, map check ys))
+            |> map pretty_thm |> Pretty.writeln_chunks
+          end)));
+
+end;
+
+
+(* find *)
+
+val _ =
+  Outer_Syntax.command @{command_keyword find_consts}
+    "find constants by name / type patterns"
+    (Find_Consts.query_parser >> (fn spec =>
+      Toplevel.keep (fn st =>
+        Pretty.writeln (Find_Consts.pretty_consts (Toplevel.context_of st) spec))));
+
+local
+  val options =
+    Scan.optional
+      (Parse.$$$ "(" |--
+        Parse.!!! (Scan.option Parse.nat --
+          Scan.optional (Parse.reserved "with_dups" >> K false) true --| Parse.$$$ ")"))
+      (NONE, true);
+in
+
+val _ =
+  Outer_Syntax.command @{command_keyword find_theorems}
+    "find theorems meeting specified criteria"
+    (options -- Find_Theorems.query_parser >> (fn ((opt_lim, rem_dups), spec) =>
+      Toplevel.keep (fn st =>
+        Pretty.writeln
+          (Find_Theorems.pretty_theorems (Find_Theorems.proof_state st) opt_lim rem_dups spec))));
+
+end;
+
+
+
+(** extraction of programs from proofs **)
+
+val parse_vars = Scan.optional (Parse.$$$ "(" |-- Parse.list1 Parse.name --| Parse.$$$ ")") [];
+
+val _ =
+  Outer_Syntax.command @{command_keyword realizers}
+    "specify realizers for primitive axioms / theorems, together with correctness proof"
+    (Scan.repeat1 (Parse.xname -- parse_vars --| Parse.$$$ ":" -- Parse.string -- Parse.string) >>
+     (fn xs => Toplevel.theory (fn thy => Extraction.add_realizers
+       (map (fn (((a, vs), s1), s2) => (Global_Theory.get_thm thy a, (vs, s1, s2))) xs) thy)));
+
+val _ =
+  Outer_Syntax.command @{command_keyword realizability}
+    "add equations characterizing realizability"
+    (Scan.repeat1 Parse.string >> (Toplevel.theory o Extraction.add_realizes_eqns));
+
+val _ =
+  Outer_Syntax.command @{command_keyword extract_type}
+    "add equations characterizing type of extracted program"
+    (Scan.repeat1 Parse.string >> (Toplevel.theory o Extraction.add_typeof_eqns));
+
+val _ =
+  Outer_Syntax.command @{command_keyword extract} "extract terms from proofs"
+    (Scan.repeat1 (Parse.xname -- parse_vars) >> (fn xs => Toplevel.theory (fn thy =>
+      Extraction.extract (map (apfst (Global_Theory.get_thm thy)) xs) thy)));
+
+
+
+(** end **)
+
+val _ =
+  Outer_Syntax.command @{command_keyword end} "end context"
+    (Scan.succeed
+      (Toplevel.exit o Toplevel.end_local_theory o Toplevel.close_target o
+        Toplevel.end_proof (K Proof.end_notepad)));
+
+in end;
+\<close>
 
 
 section \<open>Basic attributes\<close>
diff -r e4140efe699e -r caaa2fc4040d src/Pure/ROOT
--- a/src/Pure/ROOT	Mon Apr 04 17:02:34 2016 +0200
+++ b/src/Pure/ROOT	Mon Apr 04 17:25:53 2016 +0200
@@ -108,7 +108,6 @@
     "ML/ml_context.ML"
     "ML/ml_debugger.ML"
     "ML/ml_env.ML"
-    "ML/ml_file.ML"
     "ML/ml_final.ML"
     "ML/ml_heap.ML"
     "ML/ml_lex.ML"
diff -r e4140efe699e -r caaa2fc4040d src/Pure/ROOT.ML
--- a/src/Pure/ROOT.ML	Mon Apr 04 17:02:34 2016 +0200
+++ b/src/Pure/ROOT.ML	Mon Apr 04 17:25:53 2016 +0200
@@ -318,14 +318,13 @@
 
 (* miscellaneous tools and packages for Pure Isabelle *)
 
+use "ML/ml_pp.ML";
+use "ML/ml_antiquotations.ML";
+use "ML/ml_thms.ML";
+
 use "Tools/build.ML";
 use "Tools/named_thms.ML";
-use "ML/ml_pp.ML";
-use "ML/ml_file.ML";
-use "ML/ml_antiquotations.ML";
-use "ML/ml_thms.ML";
 use "Tools/print_operation.ML";
-
 use "Tools/bibtex.ML";
 use "Tools/rail.ML";
 use "Tools/rule_insts.ML";
diff -r e4140efe699e -r caaa2fc4040d src/Pure/Thy/thy_header.ML
--- a/src/Pure/Thy/thy_header.ML	Mon Apr 04 17:02:34 2016 +0200
+++ b/src/Pure/Thy/thy_header.ML	Mon Apr 04 17:25:53 2016 +0200
@@ -80,9 +80,7 @@
      ((txtN, @{here}), SOME ((Keyword.document_body, []), [])),
      ((text_rawN, @{here}), SOME ((Keyword.document_raw, []), [])),
      ((theoryN, @{here}), SOME ((Keyword.thy_begin, []), ["theory"])),
-     (("ML_file", @{here}), SOME ((Keyword.thy_load, []), ["ML"])),
-     (("ML_file_debug", @{here}), SOME ((Keyword.thy_load, []), ["ML"])),
-     (("ML_file_no_debug", @{here}), SOME ((Keyword.thy_load, []), ["ML"]))];
+     (("ML", @{here}), SOME ((Keyword.thy_decl, []), ["ML"]))];
 
 
 (* theory data *)
diff -r e4140efe699e -r caaa2fc4040d src/Pure/Thy/thy_header.scala
--- a/src/Pure/Thy/thy_header.scala	Mon Apr 04 17:02:34 2016 +0200
+++ b/src/Pure/Thy/thy_header.scala	Mon Apr 04 17:25:53 2016 +0200
@@ -57,9 +57,7 @@
       (TXT, Some(((Keyword.DOCUMENT_BODY, Nil), Nil)), None),
       (TEXT_RAW, Some(((Keyword.DOCUMENT_RAW, Nil), Nil)), None),
       (THEORY, Some((Keyword.THY_BEGIN, Nil), List("theory")), None),
-      ("ML_file", Some((Keyword.THY_LOAD, Nil), List("ML")), None),
-      ("ML_file_debug", Some((Keyword.THY_LOAD, Nil), List("ML")), None),
-      ("ML_file_no_debug", Some((Keyword.THY_LOAD, Nil), List("ML")), None))
+      ("ML", Some((Keyword.THY_DECL, Nil), List("ML")), None))
 
   private val bootstrap_keywords =
     Keyword.Keywords.empty.add_keywords(bootstrap_header)