diff mbox

C++ PATCH for c++/60361 (decl/expr ambiguity)

Message ID 53176065.9010603@redhat.com
State New
Headers show

Commit Message

Jason Merrill March 5, 2014, 5:35 p.m. UTC 
The problem in this testcase was that we were initially tentatively 
parsing int(A) as a parameter declaration, then complaining about using 
that parameter as a template-argument.  We should treat it as a parse 
error rather than a semantic error until we know how we really want to 
parse  things.

The second patch fixes the diagnostic location of the pedwarn about 
using list-initialization in C++98 mode.

Tested x86_64-pc-linux-gnu, applying to trunk.

Comments

Paolo Carlini March 5, 2014, 6:06 p.m. UTC | #1 
Hi,

On 03/05/2014 06:35 PM, Jason Merrill wrote:
> +	  cp_token *token = cp_lexer_peek_token (parser->lexer);
> +	  cp_lexer_set_source_position_from_token (token);
Shall we add a static inline void cp_lexer_set_source_position (cp_lexer 
*lexer)? We do have a couple of existing instances too...

Paolo.
diff mbox

Patch

commit 575a4d70513faec5d8a66fe818a48a6abcf91500
Author: Jason Merrill <jason@redhat.com>
Date:   Mon Mar 3 16:39:46 2014 -0500

    	* parser.c (cp_parser_mem_initializer): Set input_location
    	properly for init-list warning.
    	(cp_parser_postfix_open_square_expression): Likewise.
    	(cp_parser_parenthesized_expression_list): Likewise.
    	(cp_parser_new_initializer): Likewise.
    	(cp_parser_jump_statement): Likewise.
    	(cp_parser_initializer): Likewise.
    	(cp_parser_functional_cast): Likewise.

diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c
index bb7d268..5b3e489 100644
--- a/gcc/cp/parser.c
+++ b/gcc/cp/parser.c
@@ -6359,6 +6359,8 @@  cp_parser_postfix_open_square_expression (cp_parser *parser,
       if (cp_lexer_next_token_is (parser->lexer, CPP_OPEN_BRACE))
 	{
 	  bool expr_nonconst_p;
+	  cp_token *token = cp_lexer_peek_token (parser->lexer);
+	  cp_lexer_set_source_position_from_token (token);
 	  maybe_warn_cpp0x (CPP0X_INITIALIZER_LISTS);
 	  index = cp_parser_braced_list (parser, &expr_nonconst_p);
 	  if (flag_cilkplus
@@ -6671,6 +6673,8 @@  cp_parser_parenthesized_expression_list (cp_parser* parser,
 	    if (cp_lexer_next_token_is (parser->lexer, CPP_OPEN_BRACE))
 	      {
 		/* A braced-init-list.  */
+		cp_token *token = cp_lexer_peek_token (parser->lexer);
+		cp_lexer_set_source_position_from_token (token);
 		maybe_warn_cpp0x (CPP0X_INITIALIZER_LISTS);
 		expr = cp_parser_braced_list (parser, &expr_non_constant_p);
 		if (non_constant_p && expr_non_constant_p)
@@ -7519,6 +7523,8 @@  cp_parser_new_initializer (cp_parser* parser)
     {
       tree t;
       bool expr_non_constant_p;
+      cp_token *token = cp_lexer_peek_token (parser->lexer);
+      cp_lexer_set_source_position_from_token (token);
       maybe_warn_cpp0x (CPP0X_INITIALIZER_LISTS);
       t = cp_parser_braced_list (parser, &expr_non_constant_p);
       CONSTRUCTOR_IS_DIRECT_INIT (t) = 1;
@@ -10675,6 +10681,8 @@  cp_parser_jump_statement (cp_parser* parser)
 
 	if (cp_lexer_next_token_is (parser->lexer, CPP_OPEN_BRACE))
 	  {
+	    cp_token *token = cp_lexer_peek_token (parser->lexer);
+	    cp_lexer_set_source_position_from_token (token);
 	    maybe_warn_cpp0x (CPP0X_INITIALIZER_LISTS);
 	    expr = cp_parser_braced_list (parser, &expr_non_constant_p);
 	  }
@@ -12353,6 +12361,8 @@  cp_parser_mem_initializer (cp_parser* parser)
   if (cp_lexer_next_token_is (parser->lexer, CPP_OPEN_BRACE))
     {
       bool expr_non_constant_p;
+      cp_token *token = cp_lexer_peek_token (parser->lexer);
+      cp_lexer_set_source_position_from_token (token);
       maybe_warn_cpp0x (CPP0X_INITIALIZER_LISTS);
       expression_list = cp_parser_braced_list (parser, &expr_non_constant_p);
       CONSTRUCTOR_IS_DIRECT_INIT (expression_list) = 1;
@@ -18801,6 +18811,8 @@  cp_parser_initializer (cp_parser* parser, bool* is_direct_init,
     }
   else if (token->type == CPP_OPEN_BRACE)
     {
+      cp_token *token = cp_lexer_peek_token (parser->lexer);
+      cp_lexer_set_source_position_from_token (token);
       maybe_warn_cpp0x (CPP0X_INITIALIZER_LISTS);
       init = cp_parser_braced_list (parser, non_constant_p);
       CONSTRUCTOR_IS_DIRECT_INIT (init) = 1;
@@ -23236,6 +23248,8 @@  cp_parser_functional_cast (cp_parser* parser, tree type)
 
   if (cp_lexer_next_token_is (parser->lexer, CPP_OPEN_BRACE))
     {
+      cp_token *token = cp_lexer_peek_token (parser->lexer);
+      cp_lexer_set_source_position_from_token (token);
       maybe_warn_cpp0x (CPP0X_INITIALIZER_LISTS);
       expression_list = cp_parser_braced_list (parser, &nonconst_p);
       CONSTRUCTOR_IS_DIRECT_INIT (expression_list) = 1;
diff --git a/gcc/testsuite/g++.dg/template/crash90.C b/gcc/testsuite/g++.dg/template/crash90.C
index 6fe247c..4cfc408 100644
--- a/gcc/testsuite/g++.dg/template/crash90.C
+++ b/gcc/testsuite/g++.dg/template/crash90.C
@@ -4,5 +4,4 @@  template < unsigned >
 struct A ;
 template < typename >
 struct B ;
-template < typename T , A < B < T > // { dg-error "initializer|parse error|valid type|expected" }
-{ }
+template < typename T , A < B < T > {}// { dg-error "initializer|parse error|type|expected" }