From a663fe4774f7af2b4a189f5fea8b0b92d2d5c006 Mon Sep 17 00:00:00 2001 From: François Pottier Date: Tue, 24 Nov 2015 13:30:31 +0100 Subject: Use 1-based column numbers instead of 0-based. This seems to agree with clang and with the emacs C mode. --- cparser/ErrorReports.ml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cparser/ErrorReports.ml b/cparser/ErrorReports.ml index a8976e42..3e46365d 100644 --- a/cparser/ErrorReports.ml +++ b/cparser/ErrorReports.ml @@ -233,7 +233,7 @@ let fragments text checkpoint (message : string) : string = let report text buffer checkpoint : string = (* Extract the position where the error occurred, that is, the start position of the invalid token. We display it as a filename, a (1-based) - line number, and a (0-based) column number. *) + line number, and a (1-based) column number. *) let (pos, _) = last buffer in (* Construct a readable description of where the error occurred, that is, after which token and before which token. *) @@ -256,7 +256,7 @@ let report text buffer checkpoint : string = Printf.sprintf "%s:%d:%d: syntax error %s.\n%s" pos.pos_fname pos.pos_lnum - (pos.pos_cnum - pos.pos_bol) + (pos.pos_cnum - pos.pos_bol + 1) where message -- cgit From 7044b2f8319fb82111639ee7ced2966f297e59b8 Mon Sep 17 00:00:00 2001 From: François Pottier Date: Tue, 24 Nov 2015 13:33:28 +0100 Subject: For uniformity with other messages, added an "Ill-formed expression.". --- cparser/handcrafted.messages | 1 + 1 file changed, 1 insertion(+) diff --git a/cparser/handcrafted.messages b/cparser/handcrafted.messages index 97f69617..11c26560 100644 --- a/cparser/handcrafted.messages +++ b/cparser/handcrafted.messages @@ -1277,6 +1277,7 @@ translation_unit_file: INT PRE_NAME VAR_NAME EQ LPAREN PRE_NAME VAR_NAME SEMICOL # can be continued with a comma and another expression. # So, let's just say a closing parenthesis is expected. +Ill-formed expression. Up to this point, an expression has been recognized: $0 If this expression is complete, -- cgit