--- a/src/Pure/Isar/outer_syntax.ML Sun Aug 15 20:13:07 2010 +0200
+++ b/src/Pure/Isar/outer_syntax.ML Sun Aug 15 20:19:56 2010 +0200
@@ -249,7 +249,7 @@
handle ERROR msg => (Toplevel.malformed range_pos msg, true)
end;
-fun prepare_unit commands init (cmd, proof, proper_proof) =
+fun prepare_atom commands init (cmd, proof, proper_proof) =
let
val (tr, proper_cmd) = prepare_span commands cmd |>> Toplevel.modify_init init;
val proof_trs = map (prepare_span commands) proof |> filter #2 |> map #1;
@@ -278,14 +278,14 @@
val toks = Source.exhausted (Thy_Syntax.token_source lexs pos (Source.of_string text));
val spans = Source.exhaust (Thy_Syntax.span_source toks);
val _ = List.app Thy_Syntax.report_span spans; (* FIXME ?? *)
- val units = Source.exhaust (Thy_Syntax.unit_source (Source.of_list spans))
- |> Par_List.map (prepare_unit commands init) |> flat;
+ val atoms = Source.exhaust (Thy_Syntax.atom_source (Source.of_list spans))
+ |> Par_List.map (prepare_atom commands init) |> flat;
val _ = Present.theory_source name
(fn () => HTML.html_mode (implode o map Thy_Syntax.present_span) spans);
val _ = if time then writeln ("\n**** Starting theory " ^ quote name ^ " ****") else ();
- val (results, thy) = cond_timeit time "" (fn () => Toplevel.excursion units);
+ val (results, thy) = cond_timeit time "" (fn () => Toplevel.excursion atoms);
val _ = if time then writeln ("**** Finished theory " ^ quote name ^ " ****\n") else ();
fun after_load () =