aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorMarek Polacek <polacek@redhat.com>2015-09-02 21:00:38 +0000
committerMarek Polacek <mpolacek@gcc.gnu.org>2015-09-02 21:00:38 +0000
commitd04ff41777d999fe5f387f46ec8b9cb22422c513 (patch)
tree3901f7d42cdbd8c3a98a30c77f0966011f7cd54d /gcc
parentdb3015e9e3b5bd8bae0cf6c629f4f8333a01f855 (diff)
downloadgcc-d04ff41777d999fe5f387f46ec8b9cb22422c513.zip
gcc-d04ff41777d999fe5f387f46ec8b9cb22422c513.tar.gz
gcc-d04ff41777d999fe5f387f46ec8b9cb22422c513.tar.bz2
re PR c/67432 (Improve error message on empty enum)
PR c/67432 * c-parser.c (c_parser_enum_specifier): Give a better error for an empty enum. * gcc.dg/pr67432.c: New test. From-SVN: r227421
Diffstat (limited to 'gcc')
-rw-r--r--gcc/c/ChangeLog6
-rw-r--r--gcc/c/c-parser.c11
-rw-r--r--gcc/testsuite/ChangeLog5
-rw-r--r--gcc/testsuite/gcc.dg/pr67432.c6
4 files changed, 27 insertions, 1 deletions
diff --git a/gcc/c/ChangeLog b/gcc/c/ChangeLog
index 1536b1b..47461d1 100644
--- a/gcc/c/ChangeLog
+++ b/gcc/c/ChangeLog
@@ -1,3 +1,9 @@
+2015-09-02 Marek Polacek <polacek@redhat.com>
+
+ PR c/67432
+ * c-parser.c (c_parser_enum_specifier): Give a better error for
+ an empty enum.
+
2015-08-18 Trevor Saunders <tbsaunde@tbsaunde.org>
* c-aux-info.c, c-parser.c, c-tree.h: Remove useless typedefs.
diff --git a/gcc/c/c-parser.c b/gcc/c/c-parser.c
index 1a58798..11a2b0f 100644
--- a/gcc/c/c-parser.c
+++ b/gcc/c/c-parser.c
@@ -2555,7 +2555,16 @@ c_parser_enum_specifier (c_parser *parser)
location_t decl_loc, value_loc;
if (c_parser_next_token_is_not (parser, CPP_NAME))
{
- c_parser_error (parser, "expected identifier");
+ /* Give a nicer error for "enum {}". */
+ if (c_parser_next_token_is (parser, CPP_CLOSE_BRACE)
+ && !parser->error)
+ {
+ error_at (c_parser_peek_token (parser)->location,
+ "empty enum is invalid");
+ parser->error = true;
+ }
+ else
+ c_parser_error (parser, "expected identifier");
c_parser_skip_until_found (parser, CPP_CLOSE_BRACE, NULL);
values = error_mark_node;
break;
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 8c7175f..0432853 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2015-09-02 Marek Polacek <polacek@redhat.com>
+
+ PR c/67432
+ * gcc.dg/pr67432.c: New test.
+
2015-09-02 Christophe Lyon <christophe.lyon@linaro.org>
* lib/target-supports.exp (clear_effective_target_cache): New.
diff --git a/gcc/testsuite/gcc.dg/pr67432.c b/gcc/testsuite/gcc.dg/pr67432.c
new file mode 100644
index 0000000..74367a9
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/pr67432.c
@@ -0,0 +1,6 @@
+/* PR c/67432 */
+/* { dg-do compile } */
+
+enum {}; /* { dg-error "empty enum is invalid" } */
+enum E {}; /* { dg-error "empty enum is invalid" } */
+enum F {} e; /* { dg-error "empty enum is invalid" } */