diff options
| author | Mark Mitchell <mark@codesourcery.com> | 2004-01-29 01:29:03 +0000 |
|---|---|---|
| committer | Mark Mitchell <mmitchel@gcc.gnu.org> | 2004-01-29 01:29:03 +0000 |
| commit | a7324e75d17b3baa22fbe33fc0a502681ad40f56 (patch) | |
| tree | a749774481323c60ee4d85c6ebcc2a24aceffaf9 /gcc | |
| parent | d173e68599639b825a1e12884fa35c00a024bee4 (diff) | |
| download | gcc-a7324e75d17b3baa22fbe33fc0a502681ad40f56.zip gcc-a7324e75d17b3baa22fbe33fc0a502681ad40f56.tar.gz gcc-a7324e75d17b3baa22fbe33fc0a502681ad40f56.tar.bz2 | |
re PR c++/13736 (Parser confused on compound casts)
PR c++/13736
* parser.c (cp_parser_direct_declarator): Do not prevent
backtracking inside a parenthesized declarator.
(cp_parser_parameter_declaration): Fix typo in comment.
PR c++/13736
* g++.dg/parse/cast2.C (main): New test.
From-SVN: r76825
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/ChangeLog | 7 | ||||
| -rw-r--r-- | gcc/cp/parser.c | 11 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/parse/cast2.C | 13 |
4 files changed, 33 insertions, 3 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index ba306b8..73451be 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,10 @@ +2004-01-28 Mark Mitchell <mark@codesourcery.com> + + PR c++/13736 + * parser.c (cp_parser_direct_declarator): Do not prevent + backtracking inside a parenthesized declarator. + (cp_parser_parameter_declaration): Fix typo in comment. + 2004-01-28 Jan Hubicka <jh@suse.cz> * semantics.c (expand_body) Do emit_associated_thunks before diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c index 0ca1dca..7c9be85 100644 --- a/gcc/cp/parser.c +++ b/gcc/cp/parser.c @@ -10285,15 +10285,20 @@ cp_parser_direct_declarator (cp_parser* parser, declarator. */ if (first) { + bool saved_in_type_id_in_expr_p; + parser->default_arg_ok_p = saved_default_arg_ok_p; parser->in_declarator_p = saved_in_declarator_p; /* Consume the `('. */ cp_lexer_consume_token (parser->lexer); /* Parse the nested declarator. */ + saved_in_type_id_in_expr_p = parser->in_type_id_in_expr_p; + parser->in_type_id_in_expr_p = true; declarator = cp_parser_declarator (parser, dcl_kind, ctor_dtor_or_conv_p, /*parenthesized_p=*/NULL); + parser->in_type_id_in_expr_p = saved_in_type_id_in_expr_p; first = false; /* Expect a `)'. */ if (!cp_parser_require (parser, CPP_CLOSE_PAREN, "`)'")) @@ -11048,11 +11053,11 @@ cp_parser_parameter_declaration (cp_parser *parser, if (!parser->in_template_argument_list_p /* In an expression context, having seen: - (int((char *)... + (int((char ... we cannot be sure whether we are looking at a - function-type (taking a "char*" as a parameter) or a cast - of some object of type "char*" to "int". */ + function-type (taking a "char" as a parameter) or a cast + of some object of type "char" to "int". */ && !parser->in_type_id_in_expr_p && cp_parser_parsing_tentatively (parser) && !cp_parser_committed_to_tentative_parse (parser) diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index e22e0e3..3c0df51 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2004-01-28 Mark Mitchell <mark@codesourcery.com> + + PR c++/13736 + * g++.dg/parse/cast2.C (main): New test. + 2004-01-27 James E Wilson <wilson@specifixinc.com> * objc.dg/encode-2.m (main): New local string. Set depending on diff --git a/gcc/testsuite/g++.dg/parse/cast2.C b/gcc/testsuite/g++.dg/parse/cast2.C new file mode 100644 index 0000000..d447bb4 --- /dev/null +++ b/gcc/testsuite/g++.dg/parse/cast2.C @@ -0,0 +1,13 @@ +// PR c++/13736 + +struct string +{ + string() {} + string(const string&) {} + string(const char*) {} +}; + +int main() +{ + string s2(string( (const char*)(""))); +} |