aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorDavid Malcolm <dmalcolm@redhat.com>2017-04-25 14:03:55 +0000
committerDavid Malcolm <dmalcolm@gcc.gnu.org>2017-04-25 14:03:55 +0000
commit1c4ea66f24bc3801448d5c88847fc97d4e2767ee (patch)
tree1e26f9c2f74735c269776ad691d99a69ba534766 /gcc
parente0666fc62f436b35e9ad3b806cb081d95f2f66c6 (diff)
downloadgcc-1c4ea66f24bc3801448d5c88847fc97d4e2767ee.zip
gcc-1c4ea66f24bc3801448d5c88847fc97d4e2767ee.tar.gz
gcc-1c4ea66f24bc3801448d5c88847fc97d4e2767ee.tar.bz2
C: fix-it hint for removing stray semicolons
gcc/c/ChangeLog: * c-parser.c (c_parser_struct_or_union_specifier): Add fix-it hint for removing extra semicolon. gcc/testsuite/ChangeLog: * gcc.dg/semicolon-fixits.c: New test case. From-SVN: r247243
Diffstat (limited to 'gcc')
-rw-r--r--gcc/c/ChangeLog5
-rw-r--r--gcc/c/c-parser.c9
-rw-r--r--gcc/testsuite/ChangeLog4
-rw-r--r--gcc/testsuite/gcc.dg/semicolon-fixits.c17
4 files changed, 33 insertions, 2 deletions
diff --git a/gcc/c/ChangeLog b/gcc/c/ChangeLog
index 143aff9..5587e2f 100644
--- a/gcc/c/ChangeLog
+++ b/gcc/c/ChangeLog
@@ -1,3 +1,8 @@
+2017-04-25 David Malcolm <dmalcolm@redhat.com>
+
+ * c-parser.c (c_parser_struct_or_union_specifier): Add fix-it
+ hint for removing extra semicolon.
+
2017-04-21 Jakub Jelinek <jakub@redhat.com>
PR c/80468
diff --git a/gcc/c/c-parser.c b/gcc/c/c-parser.c
index 988369e..9398652 100644
--- a/gcc/c/c-parser.c
+++ b/gcc/c/c-parser.c
@@ -2948,8 +2948,13 @@ c_parser_struct_or_union_specifier (c_parser *parser)
/* Parse any stray semicolon. */
if (c_parser_next_token_is (parser, CPP_SEMICOLON))
{
- pedwarn (c_parser_peek_token (parser)->location, OPT_Wpedantic,
- "extra semicolon in struct or union specified");
+ location_t semicolon_loc
+ = c_parser_peek_token (parser)->location;
+ gcc_rich_location richloc (semicolon_loc);
+ richloc.add_fixit_remove ();
+ pedwarn_at_rich_loc
+ (&richloc, OPT_Wpedantic,
+ "extra semicolon in struct or union specified");
c_parser_consume_token (parser);
continue;
}
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index a8e24e9..b369bb5 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,5 +1,9 @@
2017-04-25 David Malcolm <dmalcolm@redhat.com>
+ * gcc.dg/semicolon-fixits.c: New test case.
+
+2017-04-25 David Malcolm <dmalcolm@redhat.com>
+
* g++.dg/lookup/missing-std-include.C: New test file.
2017-04-25 Ramana Radhakrishnan <ramana.radhakrishnan@arm.com>
diff --git a/gcc/testsuite/gcc.dg/semicolon-fixits.c b/gcc/testsuite/gcc.dg/semicolon-fixits.c
new file mode 100644
index 0000000..e7d5322
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/semicolon-fixits.c
@@ -0,0 +1,17 @@
+/* { dg-options "-fdiagnostics-show-caret -Wpedantic" } */
+
+/* Struct with extra semicolon. */
+struct s1 { int i;; }; /* { dg-warning "19: extra semicolon in struct or union specified" } */
+/* { dg-begin-multiline-output "" }
+ struct s1 { int i;; };
+ ^
+ -
+ { dg-end-multiline-output "" } */
+
+/* Union with extra semicolon. */
+union u1 { int i;; }; /* { dg-warning "18: extra semicolon in struct or union specified" } */
+/* { dg-begin-multiline-output "" }
+ union u1 { int i;; };
+ ^
+ -
+ { dg-end-multiline-output "" } */