aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorManuel López-Ibáñez <manu@gcc.gnu.org>2009-06-23 16:30:58 +0000
committerManuel López-Ibáñez <manu@gcc.gnu.org>2009-06-23 16:30:58 +0000
commita28fbdbac8af686640ab82d2360d2babce982351 (patch)
treebd32207e64e5475c4af5e36142b42db92f47401b /gcc
parent7eb3f1f7cab7f8ffc75b8010f619a76fba2808c0 (diff)
downloadgcc-a28fbdbac8af686640ab82d2360d2babce982351.zip
gcc-a28fbdbac8af686640ab82d2360d2babce982351.tar.gz
gcc-a28fbdbac8af686640ab82d2360d2babce982351.tar.bz2
directives.c (parse_include): Add location argument.
2009-06-23 Manuel Lopez-Ibanez <manu@gcc.gnu.org> libcpp/ * directives.c (parse_include): Add location argument. Update all calls. (parse_answer): Likewise. (do_include_common): Error with exact location. (parse_assertion): Likewise. testsuite/ * gcc.dg/cpp/empty-include.c: Update column info. * gcc.dg/cpp/assert2.c: Update column info. From-SVN: r148857
Diffstat (limited to 'gcc')
-rw-r--r--gcc/testsuite/ChangeLog5
-rw-r--r--gcc/testsuite/gcc.dg/cpp/assert2.c14
-rw-r--r--gcc/testsuite/gcc.dg/cpp/empty-include.c3
3 files changed, 14 insertions, 8 deletions
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 0425c18..1b59154 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2009-06-23 Manuel Lopez-Ibanez <manu@gcc.gnu.org>
+
+ * gcc.dg/cpp/empty-include.c: Update column info.
+ * gcc.dg/cpp/assert2.c: Update column info.
+
2009-06-23 Jakub Jelinek <jakub@redhat.com>
* g++.dg/ext/builtin-object-size1.C: New test.
diff --git a/gcc/testsuite/gcc.dg/cpp/assert2.c b/gcc/testsuite/gcc.dg/cpp/assert2.c
index 5228bcb..12b11b7 100644
--- a/gcc/testsuite/gcc.dg/cpp/assert2.c
+++ b/gcc/testsuite/gcc.dg/cpp/assert2.c
@@ -1,24 +1,24 @@
/* Malformed assertion tests. */
/* { dg-do preprocess } */
-/* { dg-options "-Wno-deprecated" } */
+/* { dg-options "-fshow-column -Wno-deprecated" } */
#assert /* { dg-error "without predicate" "assert w/o predicate" } */
-#assert % /* { dg-error "an identifier" "assert punctuation" } */
-#assert 12 /* { dg-error "an identifier" "assert number" } */
-#assert abc /* { dg-error "missing" "assert w/o answer" } */
+#assert % /* { dg-error "9:an identifier" "assert punctuation" } */
+#assert 12 /* { dg-error "9:an identifier" "assert number" } */
+#assert abc /* { dg-error "9:missing" "assert w/o answer" } */
#if # /* { dg-error "without predicate" "test w/o predicate" } */
#endif
-#if #% /* { dg-error "an identifier" "test punctuation" } */
+#if #% /* { dg-error "6:an identifier" "test punctuation" } */
#endif
-#if #12 /* { dg-error "an identifier" "test number" } */
+#if #12 /* { dg-error "6:an identifier" "test number" } */
#endif
#if #abc
#error /* { dg-bogus "error" "test w/o answer" } */
#endif
-#if #abc[def] /* { dg-error "is not valid" "test with malformed answer" } */
+#if #abc[def] /* { dg-error "9:is not valid" "test with malformed answer" } */
#endif
diff --git a/gcc/testsuite/gcc.dg/cpp/empty-include.c b/gcc/testsuite/gcc.dg/cpp/empty-include.c
index f0f5b40..6b6c075 100644
--- a/gcc/testsuite/gcc.dg/cpp/empty-include.c
+++ b/gcc/testsuite/gcc.dg/cpp/empty-include.c
@@ -9,5 +9,6 @@
*/
/* { dg-do preprocess } */
-#include "" /* { dg-error "empty" "error on empty filename in include" } */
+/* { dg-options "-fshow-column" } */
+#include "" /* { dg-error "10:empty" "error on empty filename in include" } */
int x; /* Otherwise we have an empty file and get more errors. */