diff options
| author | Andrew Pinski <pinskia@physics.uc.edu> | 2005-09-08 13:14:41 +0000 |
|---|---|---|
| committer | Andrew Pinski <pinskia@gcc.gnu.org> | 2005-09-08 06:14:41 -0700 |
| commit | d95036e3f8e8548ec9a568748a24db4f20ea65f5 (patch) | |
| tree | 5fe8311d52bb91902b19b5217da30bf4fb8068cd /gcc/cp/parser.c | |
| parent | 8f078c08371d600c4834f90831b9ba54316ab019 (diff) | |
| download | gcc-d95036e3f8e8548ec9a568748a24db4f20ea65f5.zip gcc-d95036e3f8e8548ec9a568748a24db4f20ea65f5.tar.gz gcc-d95036e3f8e8548ec9a568748a24db4f20ea65f5.tar.bz2 | |
re PR objc++/16816 (obj-c++ parser error with multi-colon selectors)
2005-09-08 Andrew Pinski <pinskia@physics.uc.edu>
PR obj-c++/16816
* obj-c++.dg/selector-5.mm: New test.
* obj-c++.dg/selector-6.mm: New test.
2005-09-08 Andrew Pinski <pinskia@physics.uc.edu>
PR obj-c++/16816
* parser.c (cp_parser_objc_selector_expression): Treat CPP_SCOPE as
two CPP_COLON.
From-SVN: r104033
Diffstat (limited to 'gcc/cp/parser.c')
| -rw-r--r-- | gcc/cp/parser.c | 44 |
1 files changed, 31 insertions, 13 deletions
diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c index 6feb114..e979e93 100644 --- a/gcc/cp/parser.c +++ b/gcc/cp/parser.c @@ -16500,27 +16500,45 @@ cp_parser_objc_selector_expression (cp_parser* parser) cp_parser_require (parser, CPP_OPEN_PAREN, "`('"); token = cp_lexer_peek_token (parser->lexer); - while (cp_parser_objc_selector_p (token->type) || token->type == CPP_COLON) + while (cp_parser_objc_selector_p (token->type) || token->type == CPP_COLON + || token->type == CPP_SCOPE) { tree selector = NULL_TREE; - if (token->type != CPP_COLON) + if (token->type != CPP_COLON + || token->type == CPP_SCOPE) selector = cp_parser_objc_selector (parser); - /* Detect if we have a unary selector. */ - if (maybe_unary_selector_p - && cp_lexer_next_token_is_not (parser->lexer, CPP_COLON)) + if (cp_lexer_next_token_is_not (parser->lexer, CPP_COLON) + && cp_lexer_next_token_is_not (parser->lexer, CPP_SCOPE)) { - sel_seq = selector; - goto finish_selector; + /* Detect if we have a unary selector. */ + if (maybe_unary_selector_p) + { + sel_seq = selector; + goto finish_selector; + } + else + { + cp_parser_error (parser, "expected %<:%>"); + } } - maybe_unary_selector_p = false; - cp_parser_require (parser, CPP_COLON, "`:'"); - - sel_seq - = chainon (sel_seq, - build_tree_list (selector, NULL_TREE)); + token = cp_lexer_consume_token (parser->lexer); + + if (token->type == CPP_SCOPE) + { + sel_seq + = chainon (sel_seq, + build_tree_list (selector, NULL_TREE)); + sel_seq + = chainon (sel_seq, + build_tree_list (NULL_TREE, NULL_TREE)); + } + else + sel_seq + = chainon (sel_seq, + build_tree_list (selector, NULL_TREE)); token = cp_lexer_peek_token (parser->lexer); } |