error.c (dump_template_parameter): Use parm to determine how to print default value.

cp:
	* error.c (dump_template_parameter): Use parm to determine how
	to print default value.
testsuite:
	* g++.old_deja/g++.pt/error3.C: New test.

From-SVN: r38869

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 6146404b21e5f240977b382b9285c7aaa6aa15d0..c10022c677822a89051fdb8878ef4dd4e016af04 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+2001-01-10  Nathan Sidwell  <nathan@codesourcery.com>
+
+       * error.c (dump_template_parameter): Use parm to determine how
+       to print default value.
+
 2001-01-10  Nathan Sidwell  <nathan@codesourcery.com>
 
        * class.c (duplicate_tag_error): Clear more flags.

diff --git a/gcc/cp/error.c b/gcc/cp/error.c
index ce11ae1eda82f113e12ec2edb5a0253f7fcd2825..5ecdab71fedef7611dca6dec68e5fd2b8b98e98c 100644 (file)
--- a/gcc/cp/error.c
+++ b/gcc/cp/error.c
@@ -336,7 +336,7 @@ dump_template_parameter (parm, flags)
   if ((flags & TFF_FUNCTION_DEFAULT_ARGUMENTS) && a != NULL_TREE)
     {
       output_add_string (scratch_buffer, " = ");
-      if (TREE_CODE (a) == TYPE_DECL || TREE_CODE (a) == TEMPLATE_DECL)
+      if (TREE_CODE (p) == TYPE_DECL || TREE_CODE (p) == TEMPLATE_DECL)
         dump_type (a, flags & ~TFF_CHASE_TYPEDEF);
       else
         dump_expr (a, flags | TFF_EXPR_IN_PARENS);

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index c4ae1e2f917064b6e1bf556f8fc910e83210ab8f..8c95265f81765ca37e0bcb6841bf8dafb7696b19 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2001-01-10  Nathan Sidwell  <nathan@codesourcery.com>
+
+       * g++.old_deja/g++.pt/error3.C: New test.
+
 2001-01-10  Nathan Sidwell  <nathan@codesourcery.com>
 
        * g++.old_deja/g++.other/crash39.C: New test.

diff --git a/gcc/testsuite/g++.old-deja/g++.pt/error3.C b/gcc/testsuite/g++.old-deja/g++.pt/error3.C
new file mode 100644 (file)
index 0000000..60a2ad5
--- /dev/null
+++ b/gcc/testsuite/g++.old-deja/g++.pt/error3.C
@@ -0,0 +1,18 @@
+// Build don't link:
+
+// Copyright (C) 2000 Free Software Foundation, Inc.
+// Contributed by Nathan Sidwell 10 Jan 2001 <nathan@codesourcery.com>
+
+// Bug 1606. We sorry'd issuing an error.
+
+struct A {};
+template <class T = A> class Tpl {};
+
+struct B {
+  Tpl<int> s;
+};
+
+void foo (B *ptr)
+{
+  ptr->Tpl.t (); // ERROR - template as expression
+}