diff options
| author | Fabrice Le Fessant <Fabrice.Le_fessant@inria.fr> | 2013-06-12 15:32:27 +0000 |
|---|---|---|
| committer | Fabrice Le Fessant <Fabrice.Le_fessant@inria.fr> | 2013-06-12 15:32:27 +0000 |
| commit | b171e15a1238efa84335ea82cfac6d3a0aca2129 (patch) | |
| tree | 901ed7d2e0588c704ed73787e79e6b78309e2b19 /parsing | |
| parent | aa53c7c59d498894d5129a06495ffdf25d9b8e76 (diff) | |
Fix fix to PR#3679 : discard CR instead of printing a dot
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@13771 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
Diffstat (limited to 'parsing')
| -rw-r--r-- | parsing/location.ml | 46 |
1 files changed, 25 insertions, 21 deletions
diff --git a/parsing/location.ml b/parsing/location.ml index d4562e6d2..d3f89f440 100644 --- a/parsing/location.ml +++ b/parsing/location.ml @@ -132,25 +132,8 @@ let highlight_dumb ppf lb loc = let line = ref 0 in let pos_at_bol = ref 0 in for pos = 0 to end_pos do - let c = lb.lex_buffer.[pos + pos0] in - if c <> '\n' then begin - if !line = !line_start && !line = !line_end then - (* loc is on one line: print whole line *) - Format.pp_print_char ppf c - else if !line = !line_start then begin - (* first line of multiline loc: print ... before loc_start *) - if pos = loc.loc_start.pos_cnum then - Format.pp_print_string ppf "..."; - Format.pp_print_char ppf c - end else if !line = !line_end then begin - (* last line of multiline loc: print ... after loc_end *) - Format.pp_print_char ppf c; - if pos = loc.loc_end.pos_cnum then - Format.pp_print_string ppf "..."; - end else if !line > !line_start && !line < !line_end then - (* intermediate line of multiline loc: print whole line *) - Format.pp_print_char ppf c - end else begin + match lb.lex_buffer.[pos + pos0] with + | '\n' -> if !line = !line_start && !line = !line_end then begin (* loc is on one line: underline location *) Format.fprintf ppf "@. "; @@ -166,8 +149,29 @@ let highlight_dumb ppf lb loc = if pos < loc.loc_end.pos_cnum then Format.pp_print_string ppf " " end; incr line; - pos_at_bol := pos + 1; - end + pos_at_bol := pos + 1 + | '\r' -> () (* discard *) + | c -> + if !line = !line_start && !line = !line_end then + (* loc is on one line: print whole line *) + Format.pp_print_char ppf c + else if !line = !line_start then + (* first line of multiline loc: + print a dot for each char before loc_start *) + if pos < loc.loc_start.pos_cnum then + Format.pp_print_char ppf '.' + else + Format.pp_print_char ppf c + else if !line = !line_end then + (* last line of multiline loc: print a dot for each char + after loc_end, even whitespaces *) + if pos < loc.loc_end.pos_cnum then + Format.pp_print_char ppf c + else + Format.pp_print_char ppf '.' + else if !line > !line_start && !line < !line_end then + (* intermediate line of multiline loc: print whole line *) + Format.pp_print_char ppf c done (* Highlight the location using one of the supported modes. *) |