Fix column location in c_lex_with_flags errors

gcc/testsuite/ChangeLog:

2015-08-22  Manuel López-Ibáñez  <manu@gcc.gnu.org>

	* gcc.dg/cpp/multiline-2.c: Add column numbers.
	* gcc.dg/dollar.c: Likewise.
	* gcc.dg/pragma-message.c: Likewise.
	* g++.dg/cpp1y/digit-sep-neg.C: Likewise.
	* c-c++-common/raw-string-14.c: Likewise.

gcc/c-family/ChangeLog:

2015-08-22  Manuel López-Ibáñez  <manu@gcc.gnu.org>

	* c-lex.c (c_lex_with_flags): Use explicit locations.

From-SVN: r227096

diff --git a/gcc/c-family/ChangeLog b/gcc/c-family/ChangeLog
index eb717a03878fb52274e718db80102675b627a973..2a5758aac59d5505aeacd55d4bc542cc1eb9c711 100644 (file)
--- a/gcc/c-family/ChangeLog
+++ b/gcc/c-family/ChangeLog
@@ -1,3 +1,7 @@
+2015-08-22  Manuel López-Ibáñez  <manu@gcc.gnu.org>
+
+       * c-lex.c (c_lex_with_flags): Use explicit locations.
+
 2015-08-18  Trevor Saunders  <tbsaunde@tbsaunde.org>
 
        * c-ada-spec.h, c-common.c, c-common.h, c-format.c, c-format.h,

diff --git a/gcc/c-family/c-lex.c b/gcc/c-family/c-lex.c
index e9937163609227ec8268be1c932db426f485816f..55ceb20a01f61b525cb23acdd1e95063b3633667 100644 (file)
--- a/gcc/c-family/c-lex.c
+++ b/gcc/c-family/c-lex.c
@@ -523,11 +523,11 @@ c_lex_with_flags (tree *value, location_t *loc, unsigned char *cpp_flags,
        cppchar_t c = tok->val.str.text[0];
 
        if (c == '"' || c == '\'')
-         error ("missing terminating %c character", (int) c);
+         error_at (*loc, "missing terminating %c character", (int) c);
        else if (ISGRAPH (c))
-         error ("stray %qc in program", (int) c);
+         error_at (*loc, "stray %qc in program", (int) c);
        else
-         error ("stray %<\\%o%> in program", (int) c);
+         error_at (*loc, "stray %<\\%o%> in program", (int) c);
       }
       goto retry;
 

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 945ef0124fcc24b13c82867c1af78855c5e424e9..ba2444dd24f18cb84df89ecee4be0305328c6c32 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,11 @@
+2015-08-22  Manuel López-Ibáñez  <manu@gcc.gnu.org>
+
+       * gcc.dg/cpp/multiline-2.c: Add column numbers.
+       * gcc.dg/dollar.c: Likewise.
+       * gcc.dg/pragma-message.c: Likewise.
+       * g++.dg/cpp1y/digit-sep-neg.C: Likewise.
+       * c-c++-common/raw-string-14.c: Likewise.
+
 2015-08-21  Patrick Palka  <ppalka@gcc.gnu.org>
 
        * g++.old-deja/g++.jason/overload.C: Adjust to preserve original

diff --git a/gcc/testsuite/c-c++-common/raw-string-14.c b/gcc/testsuite/c-c++-common/raw-string-14.c
index 2eeb7258f49b23f184bcdfe02baa9f0ccdd8805a..2253ffea3cc79185400f4bc42e12f2d31110d526 100644 (file)
--- a/gcc/testsuite/c-c++-common/raw-string-14.c
+++ b/gcc/testsuite/c-c++-common/raw-string-14.c
@@ -12,7 +12,7 @@ const void *s1 = R"??/
        // { dg-error "invalid new-line" "invalid" { target *-*-* } 10 }
        // { dg-error "stray" "stray" { target *-*-* } 10 }
        // { dg-warning "missing terminating" "missing" { target *-*-* } 10 }
-       // { dg-error "missing terminating" "missing" { target *-*-* } 10 }
+       // { dg-error "19:missing terminating" "missing" { target *-*-* } 10 }
 const void *s2 = R"abcdefghijklmn??/(a)abcdefghijklmn???";
        // { dg-error "raw string delimiter longer" "longer" { target *-*-* } 16 }
        // { dg-error "stray" "stray" { target *-*-* } 16 }

diff --git a/gcc/testsuite/g++.dg/cpp1y/digit-sep-neg.C b/gcc/testsuite/g++.dg/cpp1y/digit-sep-neg.C
index 54e5ed19cdccc64010e8023ed82a91a7164e7438..833fab7c50b9c7576070b2c8639170d50b2e10b2 100644 (file)
--- a/gcc/testsuite/g++.dg/cpp1y/digit-sep-neg.C
+++ b/gcc/testsuite/g++.dg/cpp1y/digit-sep-neg.C
@@ -10,7 +10,7 @@ main()
   i = 0004''000'000; // { dg-error "adjacent digit separators" }
   i = 0B1'0'0'0'0'0'0'0'0'0'0'0'0'0'0'0'0'0'0'0'0; // OK
   i = 0b'0001'0000'0000'0000'0000'0000; // { dg-error "digit separator after base indicator" }
-  i = 0b0001'0000'0000'0000'0000'0000'; // { dg-error "missing terminating" }
+  i = 0b0001'0000'0000'0000'0000'0000'; // { dg-error "38:missing terminating" }
   unsigned u = 0b0001'0000'0000'0000'0000'0000'U; // { dg-error "digit separator outside digit sequence" }
 
   double d = 0.0;
@@ -18,10 +18,10 @@ main()
   d = 1.'602'176'565e-19; // { dg-error "digit separator adjacent to decimal point" }
   d = 1.602''176'565e-19; // { dg-error "adjacent digit separators" }
   d = 1.602'176'565'e-19; // { dg-error "digit separator adjacent to exponent" }
-  d = 1.602'176'565e'-19; // { dg-error "missing terminating" }
+  d = 1.602'176'565e'-19; // { dg-error "21:missing terminating" }
   d = 1.602'176'565e-'19; // { dg-error "digit separator adjacent to exponent" }
   d = 1.602'176'565e-1'9; // OK
-  d = 1.602'176'565e-19'; // { dg-error "missing terminating" }
+  d = 1.602'176'565e-19'; // { dg-error "24:missing terminating" }
   float f = 1.602'176'565e-19'F; // { dg-error "digit separator outside digit sequence" }
 }
 

diff --git a/gcc/testsuite/gcc.dg/cpp/multiline-2.c b/gcc/testsuite/gcc.dg/cpp/multiline-2.c
index 6a674b4dcd1b757de2a3dbb06780af7d429ef61e..2841e00fb3b343744808188fe455a08a51d07203 100644 (file)
--- a/gcc/testsuite/gcc.dg/cpp/multiline-2.c
+++ b/gcc/testsuite/gcc.dg/cpp/multiline-2.c
@@ -9,6 +9,6 @@ const char *p = "line 1
 "
 "";                          /* The compiler front end sees this.  */
 
-/* { dg-error "missing term" "multiline strings" { target *-*-* } 8 } */
+/* { dg-error "17:missing term" "multiline strings" { target *-*-* } 8 } */
 /* { dg-error "missing term" "multiline strings" { target *-*-* } 9 } */
 

diff --git a/gcc/testsuite/gcc.dg/dollar.c b/gcc/testsuite/gcc.dg/dollar.c
index 43407f227edb575c0d7ba42c5c4b14361c52c6d6..e69c4e2ec83456226807c6affa37b3bfe64f5ed4 100644 (file)
--- a/gcc/testsuite/gcc.dg/dollar.c
+++ b/gcc/testsuite/gcc.dg/dollar.c
@@ -6,4 +6,4 @@
 /* Test that -fno-dollars-in-identifiers is honoured.
    Neil Booth, 17 May 2003.  */
 
-int foobar$;   /* { dg-error "stray '\\$'" } */
+int foobar$;   /* { dg-error "11:stray '\\$'" } */

diff --git a/gcc/testsuite/gcc.dg/pragma-message.c b/gcc/testsuite/gcc.dg/pragma-message.c
index 0f9c6bf447b03722997dbc957bbf87c2052b2fcf..d4d1009fdef9b215d937fac94d499fb72c794ed3 100644 (file)
--- a/gcc/testsuite/gcc.dg/pragma-message.c
+++ b/gcc/testsuite/gcc.dg/pragma-message.c
@@ -16,13 +16,13 @@
    matching dg-message), dejagnu will report these as excess errors.  */
 
 #pragma message "
-/* { dg-error "missing terminating" "" { target *-*-* } 18 } */
+/* { dg-error "17:missing terminating" "" { target *-*-* } 18 } */
 /* { dg-warning "expected a string" "" { target *-*-* } 18 } */
 #pragma message "Bad 1
-/* { dg-error "missing terminating" "" { target *-*-* } 21 } */
+/* { dg-error "17:missing terminating" "" { target *-*-* } 21 } */
 /* { dg-warning "expected a string" "" { target *-*-* } 21 } */
 #pragma message ("Bad 2
-/* { dg-error "missing terminating" "" { target *-*-* } 24 } */
+/* { dg-error "18:missing terminating" "" { target *-*-* } 24 } */
 /* { dg-warning "expected a string" "" { target *-*-* } 24 } */
 #pragma message ("Bad 3"
 /* { dg-warning "malformed '#pragma message" "" { target *-*-* } 27 } */