diff options
| author |  Stephane Glondu <steph@glondu.net> | 2008-08-08 13:18:42 +0200 |
|---|---|---|
| committer | Stephane Glondu <steph@glondu.net> | 2008-08-08 13:18:42 +0200 |
| commit | 870075f34dd9fa5792bfbf413afd3b96f17e76a0 (patch) | |
| tree | 0c647056de1832cf1dba5ba58758b9121418e4be /toplevel/toplevel.ml | |
| parent | a0cfa4f118023d35b767a999d5a2ac4b082857b4 (diff) | |
Imported Upstream version 8.2~beta4+dfsgupstream/8.2.beta4+dfsg
Diffstat (limited to 'toplevel/toplevel.ml')
| -rw-r--r-- | toplevel/toplevel.ml | 27 |
1 files changed, 17 insertions, 10 deletions
diff --git a/toplevel/toplevel.ml b/toplevel/toplevel.ml index 42f2883a..8a9ef501 100644 --- a/toplevel/toplevel.ml +++ b/toplevel/toplevel.ml @@ -6,7 +6,7 @@ (* * GNU Lesser General Public License Version 2.1 *) (************************************************************************) -(* $Id: toplevel.ml 10916 2008-05-10 15:38:36Z herbelin $ *) +(* $Id: toplevel.ml 11317 2008-08-07 15:52:38Z barras $ *) open Pp open Util @@ -140,13 +140,15 @@ let print_highlight_location ib loc = (* Functions to report located errors in a file. *) let print_location_in_file s inlibrary fname loc = - let errstrm = (str"Error while reading " ++ str s ++ str":") in - if loc = dummy_loc then - (errstrm ++ str", unknown location." ++ fnl ()) + let errstrm = str"Error while reading " ++ str s in + if loc = dummy_loc then + hov 1 (errstrm ++ spc() ++ str" (unknown location):") ++ fnl () else + let errstrm = + if s = fname then mt() else errstrm ++ str":" ++ fnl() in if inlibrary then - (errstrm ++ fnl () ++ str"Module " ++ str ("\""^fname^"\"") ++ - str" characters " ++ Cerrors.print_loc loc ++ fnl ()) + hov 0 (errstrm ++ str"Module " ++ str ("\""^fname^"\"") ++ spc() ++ + str"characters " ++ Cerrors.print_loc loc) ++ fnl () else let (bp,ep) = unloc loc in let ic = open_in fname in @@ -160,10 +162,15 @@ let print_location_in_file s inlibrary fname loc = try let (line, bol) = line_of_pos 1 0 0 in close_in ic; - (errstrm ++ str"File " ++ str ("\""^fname^"\"") ++ - str", line " ++ int line ++ - str", characters " ++ Cerrors.print_loc (make_loc (bp-bol,ep-bol)) ++ str":" ++ fnl ()) - with e -> (close_in ic; (errstrm ++ str", invalid location." ++ fnl ())) + hov 0 + (errstrm ++ str"File " ++ str ("\""^fname^"\"") ++ str"," ++ spc() ++ + hov 0 (str"line " ++ int line ++ str"," ++ spc() ++ + str"characters " ++ + Cerrors.print_loc (make_loc (bp-bol,ep-bol))) ++ str":") ++ + fnl () + with e -> + (close_in ic; + hov 1 (errstrm ++ spc() ++ str"(invalid location):") ++ fnl ()) let print_command_location ib dloc = match dloc with |