diff mbox

[c++] Fix pr22138

Message ID 4C1088DD.1060400@oracle.com
State New
Headers show

Commit Message

Shujing Zhao June 10, 2010, 6:40 a.m. UTC 
Hi,

This patch is to fix pr22138. It would error "local template declarations is not 
allowed" instead of "expected primary-expression before 'template'". The 
"expected ‘;’ before ‘template’" error would not be output too.

Bootstrapped and tested on i686-pc-linux-gnu.
Is it ok?

Thanks
Pearly
gcc/cp/
2010-06-10  Shujing Zhao  <pearly.zhao@oracle.com>

	PR c++/22138
	* parser.c (cp_parser_primary_expression): Error if local template is
	declared.

gcc/testsuite/
2010-06-10  Shujing Zhao  <pearly.zhao@oracle.com>
	
	PR c++/22138
	* g++.dg/parse/template25.C: New.

Comments

Gabriel Dos Reis June 10, 2010, 7:44 a.m. UTC | #1 
On Thu, Jun 10, 2010 at 1:40 AM, Shujing Zhao <pearly.zhao@oracle.com> wrote:
> Hi,
>
> This patch is to fix pr22138. It would error "local template declarations is
> not allowed" instead of "expected primary-expression before 'template'".

that isn't grammatically correct.  What about

   a template declaration cannot appear at block scope

Also why don't you use the function at_function_scope_p() to test
whether you are at local scope?
diff mbox

Patch

Index: cp/parser.c
===================================================================
--- cp/parser.c	(revision 160431)
+++ cp/parser.c	(working copy)
@@ -3754,6 +3754,14 @@  cp_parser_primary_expression (cp_parser 
 	case RID_AT_SELECTOR:
 	  return cp_parser_objc_expression (parser);
 
+	case RID_TEMPLATE:
+	  if (parser->in_function_body)
+	    {
+	      error_at (token->location,
+			"local template declarations is not allowed");
+	      cp_parser_skip_to_end_of_block_or_statement (parser);
+	      return error_mark_node;
+	    }
 	default:
 	  cp_parser_error (parser, "expected primary-expression");
 	  return error_mark_node;
Index: testsuite/g++.dg/parse/template25.C
===================================================================
--- testsuite/g++.dg/parse/template25.C	(revision 0)
+++ testsuite/g++.dg/parse/template25.C	(revision 0)
@@ -0,0 +1,8 @@ 
+// PR c++/22318
+// { dg-do compile }
+void f(void)
+{
+  template<typename T> class A /* { dg-error "local template declarations is not allowed" } */
+  {
+  };
+}