From c9e3b2097b6cd7bd26fad8d5cf3ddd7335776a84 Mon Sep 17 00:00:00 2001
From: Paolo Carlini <paolo.carlini@oracle.com>
Date: Mon, 15 Oct 2012 19:13:41 +0000
Subject: [PATCH] PR c++/50080 (again)

/cp
2012-10-15  Paolo Carlini  <paolo.carlini@oracle.com>

	PR c++/50080 (again)
	* parser.c (cp_parser_optional_template_keyword): When -pedantic
	and C++98 mode restore pre-Core/468 behavior.

/testsuite
2012-10-15  Paolo Carlini  <paolo.carlini@oracle.com>

	PR c++/50080 (again)
	* g++.dg/parse/tmpl-outside2.C: Tweak, error in C++98.
	* g++.dg/parse/tmpl-outside1.C: Likewise.
	* g++.dg/template/qualttp18.C: Likewise.
	* g++.old-deja/g++.pt/memtemp87.C: Likewise.
	* g++.old-deja/g++.pt/overload13.C: Likewise.

From-SVN: r192470
---
 gcc/cp/ChangeLog                              |  6 +++++
 gcc/cp/parser.c                               | 26 ++++++++++++++++---
 gcc/testsuite/ChangeLog                       |  9 +++++++
 gcc/testsuite/g++.dg/parse/tmpl-outside1.C    |  2 +-
 gcc/testsuite/g++.dg/parse/tmpl-outside2.C    |  2 +-
 gcc/testsuite/g++.dg/template/qualttp18.C     |  2 +-
 gcc/testsuite/g++.old-deja/g++.pt/memtemp87.C |  2 +-
 .../g++.old-deja/g++.pt/overload13.C          |  2 +-
 8 files changed, 43 insertions(+), 8 deletions(-)

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 5239e7e33cf..555345f58a8 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+2012-10-15  Paolo Carlini  <paolo.carlini@oracle.com>
+
+	PR c++/50080 (again)
+	* parser.c (cp_parser_optional_template_keyword): When -pedantic
+	and C++98 mode restore pre-Core/468 behavior.
+
 2012-10-15  Paolo Carlini  <paolo.carlini@oracle.com>
 
 	PR c++/50080
diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c
index 965bc621277..853d789f987 100644
--- a/gcc/cp/parser.c
+++ b/gcc/cp/parser.c
@@ -23252,9 +23252,29 @@ cp_parser_optional_template_keyword (cp_parser *parser)
 {
   if (cp_lexer_next_token_is_keyword (parser->lexer, RID_TEMPLATE))
     {
-      /* Consume the `template' keyword.  */
-      cp_lexer_consume_token (parser->lexer);
-      return true;
+      /* In C++98 the `template' keyword can only be used within templates;
+	 outside templates the parser can always figure out what is a
+	 template and what is not.  In C++11,  per the resolution of DR 468,
+	 `template' is allowed in cases where it is not strictly necessary.  */
+      if (!processing_template_decl
+	  && pedantic && cxx_dialect == cxx98)
+	{
+	  cp_token *token = cp_lexer_peek_token (parser->lexer);
+	  pedwarn (token->location, OPT_Wpedantic,
+		   "in C++98 %<template%> (as a disambiguator) is only "
+		   "allowed within templates");
+	  /* If this part of the token stream is rescanned, the same
+	     error message would be generated.  So, we purge the token
+	     from the stream.  */
+	  cp_lexer_purge_token (parser->lexer);
+	  return false;
+	}
+      else
+	{
+	  /* Consume the `template' keyword.  */
+	  cp_lexer_consume_token (parser->lexer);
+	  return true;
+	}
     }
   return false;
 }
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index ea4a46fa454..99c7a70676a 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,12 @@
+2012-10-15  Paolo Carlini  <paolo.carlini@oracle.com>
+
+	PR c++/50080 (again)
+	* g++.dg/parse/tmpl-outside2.C: Tweak, error in C++98.
+	* g++.dg/parse/tmpl-outside1.C: Likewise.
+	* g++.dg/template/qualttp18.C: Likewise.
+	* g++.old-deja/g++.pt/memtemp87.C: Likewise.
+	* g++.old-deja/g++.pt/overload13.C: Likewise.
+
 2012-10-15  Uros Bizjak  <ubizjak@gmail.com>
 
 	* gcc.target/i386/avx256-unaligned-load-1.c: Update asm scan patterns.
diff --git a/gcc/testsuite/g++.dg/parse/tmpl-outside1.C b/gcc/testsuite/g++.dg/parse/tmpl-outside1.C
index 0713f170aa0..7d969e46858 100644
--- a/gcc/testsuite/g++.dg/parse/tmpl-outside1.C
+++ b/gcc/testsuite/g++.dg/parse/tmpl-outside1.C
@@ -7,4 +7,4 @@ struct X
    template <int i> struct Y {};
 };
 
-typedef X::template Y<0> y;
+typedef X::template Y<0> y; // { dg-error "template|invalid" "" { target c++98 } }
diff --git a/gcc/testsuite/g++.dg/parse/tmpl-outside2.C b/gcc/testsuite/g++.dg/parse/tmpl-outside2.C
index d35656f609e..54d39fa88db 100644
--- a/gcc/testsuite/g++.dg/parse/tmpl-outside2.C
+++ b/gcc/testsuite/g++.dg/parse/tmpl-outside2.C
@@ -15,5 +15,5 @@ void test()
 
 int main()
 {
-  typename A<double>::template B<int> b;
+  typename A<double>::template B<int> b; // { dg-error "template|expected" "" { target c++98 } }
 }
diff --git a/gcc/testsuite/g++.dg/template/qualttp18.C b/gcc/testsuite/g++.dg/template/qualttp18.C
index b4d28da5980..691517fd372 100644
--- a/gcc/testsuite/g++.dg/template/qualttp18.C
+++ b/gcc/testsuite/g++.dg/template/qualttp18.C
@@ -14,7 +14,7 @@ template <template <class> class TT> struct X
 
 struct C
 {
-	X<A::template B> x;
+	X<A::template B> x;  // { dg-error "template" "" { target c++98 } }
 };
 
 int main()
diff --git a/gcc/testsuite/g++.old-deja/g++.pt/memtemp87.C b/gcc/testsuite/g++.old-deja/g++.pt/memtemp87.C
index 2554518b4b4..51a66fd4116 100644
--- a/gcc/testsuite/g++.old-deja/g++.pt/memtemp87.C
+++ b/gcc/testsuite/g++.old-deja/g++.pt/memtemp87.C
@@ -12,4 +12,4 @@ public:
 template<template<class> class>
 class Y {
 };
-Q::template X<int> x;
+Q::template X<int> x; // { dg-error "template" "" { target c++98 } }
diff --git a/gcc/testsuite/g++.old-deja/g++.pt/overload13.C b/gcc/testsuite/g++.old-deja/g++.pt/overload13.C
index 78a5e6d6ab8..9c985141fd8 100644
--- a/gcc/testsuite/g++.old-deja/g++.pt/overload13.C
+++ b/gcc/testsuite/g++.old-deja/g++.pt/overload13.C
@@ -7,5 +7,5 @@ struct A {
 int main ()
 {
   A a;
-  return a.template f (0);
+  return a.template f (0); // { dg-error "template" "" { target c++98 } }
 }
-- 
2.34.1