# HG changeset patch
# User wenzelm
# Date 1222810296 -7200
# Node ID 4faf705a177df46ff737cd685e28a29f861a9b8e
# Parent  97de495414e82eddd3c32d8fab350af21f40c758
load_thy: more precise treatment of improper cmd or proof (notably 'oops');

diff -r 97de495414e8 -r 4faf705a177d src/Pure/Isar/outer_syntax.ML
--- a/src/Pure/Isar/outer_syntax.ML	Tue Sep 30 22:02:55 2008 +0200
+++ b/src/Pure/Isar/outer_syntax.ML	Tue Sep 30 23:31:36 2008 +0200
@@ -245,10 +245,14 @@
     handle ERROR msg => (Toplevel.malformed range_pos msg, true)
   end;
 
-fun prepare_unit parser (cmd, proof) =
-  (case prepare_span parser cmd of
-    (_, false) => NONE
-  | (tr, true) => SOME (tr, map (prepare_span parser) proof |> filter #2 |> map #1));
+fun prepare_unit parser (cmd, proof, proper_proof) =
+  let
+    val (tr, proper_cmd) = prepare_span parser cmd;
+    val proof_trs = map (prepare_span parser) proof |> filter #2 |> map #1;
+  in
+    if proper_cmd andalso proper_proof then [(tr, proof_trs)]
+    else map (rpair []) (if proper_cmd then tr :: proof_trs else proof_trs)
+  end;
 
 fun prepare_command pos str =
   let val (lexs, parser) = get_syntax () in
@@ -270,7 +274,7 @@
     val spans = Source.exhaust (ThyEdit.span_source toks);
     val _ = List.app ThyEdit.report_span spans;
     val units = Source.exhaust (ThyEdit.unit_source (Source.of_list spans))
-      |> map_filter (prepare_unit parser);
+      |> maps (prepare_unit parser);
 
     val _ = Present.theory_source name
       (fn () => HTML.html_mode (implode o map ThyEdit.present_span) spans);