diff options
| author | Volker Reichelt <v.reichelt@netcologne.de> | 2017-04-26 16:57:25 +0000 |
|---|---|---|
| committer | Volker Reichelt <reichelt@gcc.gnu.org> | 2017-04-26 16:57:25 +0000 |
| commit | a480422d0ad67c0ced6b1a3a21c228277381b053 (patch) | |
| tree | b28f928a76d6a463ea63897a80cf62a7e02fc9f7 /gcc | |
| parent | f88523e5bcc718aa4265f320014ab818ae700e30 (diff) | |
| download | gcc-a480422d0ad67c0ced6b1a3a21c228277381b053.zip gcc-a480422d0ad67c0ced6b1a3a21c228277381b053.tar.gz gcc-a480422d0ad67c0ced6b1a3a21c228277381b053.tar.bz2 | |
parser.c (cp_parser_nested_name_specifier_opt): Add fix-it information to diagnostic of invalid colon in nested-name-specifier.
* parser.c (cp_parser_nested_name_specifier_opt): Add fix-it
information to diagnostic of invalid colon in nested-name-specifier.
* g++.dg/diagnostic/nested-name-1.C: New test.
From-SVN: r247282
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/cp/parser.c | 7 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/diagnostic/nested-name-1.C | 13 |
4 files changed, 27 insertions, 2 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 1a9ca19..40d2cc2 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,8 @@ +2017-04-26 Volker Reichelt <v.reichelt@netcologne.de> + + * parser.c (cp_parser_nested_name_specifier_opt): Add fix-it + information to diagnostic of invalid colon in nested-name-specifier. + 2017-04-25 Volker Reichelt <v.reichelt@netcologne.de> * parser.c (cp_parser_elaborated_type_specifier): Add fix-it to diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c index 4714bc6..640a601 100644 --- a/gcc/cp/parser.c +++ b/gcc/cp/parser.c @@ -5931,8 +5931,11 @@ cp_parser_nested_name_specifier_opt (cp_parser *parser, && parser->colon_corrects_to_scope_p && cp_lexer_peek_nth_token (parser->lexer, 3)->type == CPP_NAME) { - error_at (token->location, - "found %<:%> in nested-name-specifier, expected %<::%>"); + gcc_rich_location richloc (token->location); + richloc.add_fixit_replace ("::"); + error_at_rich_loc (&richloc, + "found %<:%> in nested-name-specifier, " + "expected %<::%>"); token->type = CPP_SCOPE; } diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 696eb27..718de7e 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,7 @@ +2017-04-26 Volker Reichelt <v.reichelt@netcologne.de> + + * g++.dg/diagnostic/nested-name-1.C: New test. + 2017-04-26 Martin Liska <mliska@suse.cz> * gcc.dg/guality/guality.h: Add prefix to test verification. diff --git a/gcc/testsuite/g++.dg/diagnostic/nested-name-1.C b/gcc/testsuite/g++.dg/diagnostic/nested-name-1.C new file mode 100644 index 0000000..a02761c --- /dev/null +++ b/gcc/testsuite/g++.dg/diagnostic/nested-name-1.C @@ -0,0 +1,13 @@ +// { dg-options "-fdiagnostics-show-caret" } + +namespace N +{ + struct A {}; +} + +N:A a; /* { dg-error "nested-name-specifier" } + { dg-begin-multiline-output "" } + N:A a; + ^ + :: + { dg-end-multiline-output "" } */ |