PR c++/47277

	* parser.c (cp_parser_pseudo_destructor_name): Commit to parse
	after we see the ~.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@174385 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 269e0d1..1f39aeb 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,5 +1,9 @@
 2011-05-27  Jason Merrill  <jason@redhat.com>
 
+       PR c++/47277
+       * parser.c (cp_parser_pseudo_destructor_name): Commit to parse
+       after we see the ~.
+
        * mangle.c (mangle_decl_string): Make sure we don't try to mangle
        templates.
 

diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c
index a16ba89..75ad3f8 100644 (file)
--- a/gcc/cp/parser.c
+++ b/gcc/cp/parser.c
@@ -5642,6 +5642,11 @@ cp_parser_pseudo_destructor_name (cp_parser* parser,
 
   /* Look for the `~'.  */
   cp_parser_require (parser, CPP_COMPL, RT_COMPL);
+
+  /* Once we see the ~, this has to be a pseudo-destructor.  */
+  if (!processing_template_decl && !cp_parser_error_occurred (parser))
+    cp_parser_commit_to_tentative_parse (parser);
+
   /* Look for the type-name again.  We are not responsible for
      checking that it matches the first type-name.  */
   *type = cp_parser_nonclass_name (parser);

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 36edc22..8e55e4b 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,5 +1,7 @@
 2011-05-27  Jason Merrill  <jason@redhat.com>
 
+       * g++.dg/cpp0x/enum18.C: Adjust.
+
        * g++.dg/cpp0x/lambda/lambda-template2.C: New.
 
 2011-05-27  Tobias Burnus  <burnus@net-b.de>

diff --git a/gcc/testsuite/g++.dg/cpp0x/enum18.C b/gcc/testsuite/g++.dg/cpp0x/enum18.C
index 5575ca6..306ed82 100644 (file)
--- a/gcc/testsuite/g++.dg/cpp0x/enum18.C
+++ b/gcc/testsuite/g++.dg/cpp0x/enum18.C
@@ -2,7 +2,7 @@
 // { dg-options -std=c++0x }
 
 int main(void) {
-           enum e {};
-           e ev;
-           ev.e::~e_u();       // { dg-error "" }
+  enum e {};
+  e ev;
+  ev.e::~e_u();        // { dg-error "e_u. has not been declared" }
 }