@@ -21287,17 +21287,30 @@ cp_parser_class_specifier_1 (cp_parser* parser)
closing brace. */
if (closing_brace && TYPE_P (type) && want_semicolon)
{
+ /* Locate the closing brace. */
cp_token_position prev
= cp_lexer_previous_token_position (parser->lexer);
cp_token *prev_token = cp_lexer_token_at (parser->lexer, prev);
location_t loc = prev_token->location;
+ /* We want to suggest insertion of a ';' immediately *after* the
+ closing brace, so, if we can, offset the location by 1 column. */
+ location_t next_loc = loc;
+ if (!linemap_location_from_macro_expansion_p (line_table, loc))
+ next_loc = linemap_position_for_loc_and_offset (line_table, loc, 1);
+
+ rich_location richloc (line_table, next_loc);
+ richloc.add_fixit_insert (next_loc, ";");
+
if (CLASSTYPE_DECLARED_CLASS (type))
- error_at (loc, "expected %<;%> after class definition");
+ error_at_rich_loc (&richloc,
+ "expected %<;%> after class definition");
else if (TREE_CODE (type) == RECORD_TYPE)
- error_at (loc, "expected %<;%> after struct definition");
+ error_at_rich_loc (&richloc,
+ "expected %<;%> after struct definition");
else if (TREE_CODE (type) == UNION_TYPE)
- error_at (loc, "expected %<;%> after union definition");
+ error_at_rich_loc (&richloc,
+ "expected %<;%> after union definition");
else
gcc_unreachable ();
@@ -13,7 +13,7 @@ class Foo { int foo() return 0; } };
// need make cp_parser_error() report more accurate column numbers.
// { dg-error "30:expected '\{' at end of input" "brace" { target *-*-* } 4 }
-// { dg-error "33:expected ';' after class definition" "semicolon" {target *-*-* } 4 }
+// { dg-error "34:expected ';' after class definition" "semicolon" {target *-*-* } 4 }
// { dg-error "35:expected declaration before '\}' token" "declaration" {target *-*-* } 4 }
new file mode 100644
@@ -0,0 +1,22 @@
+// { dg-options "-fdiagnostics-show-caret" }
+
+template<class T>
+class a {} // { dg-error "11: expected .;. after class definition" }
+class temp {};
+a<temp> b;
+struct b {
+} // { dg-error "2: expected .;. after struct definition" }
+
+/* Verify that we emit fixit hints. */
+
+/* { dg-begin-multiline-output "" }
+ class a {}
+ ^
+ ;
+ { dg-end-multiline-output "" } */
+
+/* { dg-begin-multiline-output "" }
+ }
+ ^
+ ;
+ { dg-end-multiline-output "" } */