Output.error_msg;
authorwenzelm
Sat, 14 Jan 2006 17:14:16 +0100
changeset 18683 a8f9c192f6d1
parent 18682 216692feebab
child 18684 38d72231b41d
Output.error_msg;
src/Pure/General/scan.ML
src/Pure/Isar/session.ML
--- a/src/Pure/General/scan.ML	Sat Jan 14 17:14:15 2006 +0100
+++ b/src/Pure/General/scan.ML	Sat Jan 14 17:14:16 2006 +0100
@@ -243,7 +243,7 @@
 fun force scan xs = scan xs handle MORE _ => raise FAIL NONE;
 fun prompt str scan xs = scan xs handle MORE NONE => raise MORE (SOME str);
 fun catch scan xs = scan xs handle ABORT msg => raise FAIL (SOME msg);
-fun error scan xs = scan xs handle ABORT msg => Output.error msg;
+fun error scan xs = scan xs handle ABORT msg => Library.error msg;
 
 
 (* finite scans *)
@@ -284,7 +284,7 @@
 
     fun drain_loop recover inp =
       drain_with (catch scanner) inp handle FAIL msg =>
-        (error_msg (if_none msg "Syntax error."); drain_with recover inp);
+        (Output.error_msg (if_none msg "Syntax error."); drain_with recover inp);
 
     val ((ys, (state', xs')), src') =
       (case (get def_prmpt src, opt_recover) of
--- a/src/Pure/Isar/session.ML	Sat Jan 14 17:14:15 2006 +0100
+++ b/src/Pure/Isar/session.ML	Sat Jan 14 17:14:16 2006 +0100
@@ -86,7 +86,7 @@
          (dumping dump) (get_rpath rpath) verbose;
        ThyInfo.time_use root;
        finish ()))) ()
-  handle exn => (writeln (Toplevel.exn_message exn); exit 1);
+  handle exn => (Output.error_msg (Toplevel.exn_message exn); exit 1);
 
 
 end;