Fix PR c++/42634

[pf3gnuchains/gcc-fork.git] / gcc / cp / error.c

diff --git a/gcc/cp/error.c b/gcc/cp/error.c
index b50704a..54e9681 100644 (file)
--- a/gcc/cp/error.c
+++ b/gcc/cp/error.c
@@ -165,8 +165,7 @@ dump_template_argument (tree arg, int flags)
 static int
 count_non_default_template_args (tree args, tree params, int flags)
 {
-  tree inner_args = INNERMOST_TEMPLATE_ARGS (args);
-  int n = TREE_VEC_LENGTH (inner_args);
+  int n = TREE_VEC_LENGTH (args);
   int last;
 
   if (params == NULL_TREE
@@ -195,7 +194,7 @@ count_non_default_template_args (tree args, tree params, int flags)
                                       NULL_TREE, false, true);
          --processing_template_decl;
        }
-      if (!cp_tree_equal (TREE_VEC_ELT (inner_args, last), def))
+      if (!cp_tree_equal (TREE_VEC_ELT (args, last), def))
         break;
     }
 
@@ -311,7 +310,13 @@ dump_template_bindings (tree parms, tree args, VEC(tree,gc)* typenames)
          pp_equal (cxx_pp);
          pp_cxx_whitespace (cxx_pp);
          if (arg)
-           dump_template_argument (arg, TFF_PLAIN_IDENTIFIER);
+           {
+             if (ARGUMENT_PACK_P (arg))
+               pp_cxx_left_brace (cxx_pp);
+             dump_template_argument (arg, TFF_PLAIN_IDENTIFIER);
+             if (ARGUMENT_PACK_P (arg))
+               pp_cxx_right_brace (cxx_pp);
+           }
          else
            pp_string (cxx_pp, M_("<missing>"));
 
@@ -460,8 +465,11 @@ dump_type (tree t, int flags)
       break;
 
     case UNBOUND_CLASS_TEMPLATE:
-      dump_type (TYPE_CONTEXT (t), flags);
-      pp_cxx_colon_colon (cxx_pp);
+      if (! (flags & TFF_UNQUALIFIED_NAME))
+       {
+         dump_type (TYPE_CONTEXT (t), flags);
+         pp_cxx_colon_colon (cxx_pp);
+       }
       pp_cxx_ws_string (cxx_pp, "template");
       dump_type (DECL_NAME (TYPE_NAME (t)), flags);
       break;
@@ -559,10 +567,11 @@ dump_aggr_type (tree t, int flags)
     {
       typdef = !DECL_ARTIFICIAL (name);
 
-      if (typdef
-         && ((flags & TFF_CHASE_TYPEDEF)
-             || (!flag_pretty_templates && DECL_LANG_SPECIFIC (name)
-                 && DECL_TEMPLATE_INFO (name))))
+      if ((typdef
+          && ((flags & TFF_CHASE_TYPEDEF)
+              || (!flag_pretty_templates && DECL_LANG_SPECIFIC (name)
+                  && DECL_TEMPLATE_INFO (name))))
+         || DECL_SELF_REFERENCE_P (name))
        {
          t = TYPE_MAIN_VARIANT (t);
          name = TYPE_NAME (t);
@@ -899,7 +908,8 @@ dump_decl (tree t, int flags)
          dump_type (TREE_TYPE (t), flags);
          break;
        }
-      if (flags & TFF_DECL_SPECIFIERS)
+      if ((flags & TFF_DECL_SPECIFIERS)
+         && !DECL_SELF_REFERENCE_P (t))
        pp_cxx_ws_string (cxx_pp, "typedef");
       dump_simple_decl (t, DECL_ORIGINAL_TYPE (t)
                        ? DECL_ORIGINAL_TYPE (t) : TREE_TYPE (t),
@@ -941,7 +951,9 @@ dump_decl (tree t, int flags)
       break;
 
     case SCOPE_REF:
-      pp_expression (cxx_pp, t);
+      dump_type (TREE_OPERAND (t, 0), flags);
+      pp_string (cxx_pp, "::");
+      dump_decl (TREE_OPERAND (t, 1), flags|TFF_UNQUALIFIED_NAME);
       break;
 
     case ARRAY_REF:
@@ -1479,9 +1491,9 @@ dump_template_parms (tree info, int primary, int flags)
                     ? DECL_INNERMOST_TEMPLATE_PARMS (TI_TEMPLATE (info))
                     : NULL_TREE);
 
+      args = INNERMOST_TEMPLATE_ARGS (args);
       len = count_non_default_template_args (args, params, flags);
 
-      args = INNERMOST_TEMPLATE_ARGS (args);
       for (ix = 0; ix != len; ix++)
        {
          tree arg = TREE_VEC_ELT (args, ix);
@@ -2213,6 +2225,9 @@ dump_expr (tree t, int flags)
       break;
 
     case SCOPE_REF:
+      dump_decl (t, flags);
+      break;
+
     case EXPR_PACK_EXPANSION:
     case TYPEID_EXPR:
     case MEMBER_REF:
@@ -2870,20 +2885,57 @@ cp_printer (pretty_printer *pp, text_info *text, const char *spec,
 \f
 /* Warn about the use of C++0x features when appropriate.  */
 void
-maybe_warn_cpp0x (const char* str)
+maybe_warn_cpp0x (cpp0x_warn_str str)
 {
   if ((cxx_dialect == cxx98) && !in_system_header)
     /* We really want to suppress this warning in system headers,
        because libstdc++ uses variadic templates even when we aren't
        in C++0x mode. */
-    pedwarn (input_location, 0, "%s only available with -std=c++0x or -std=gnu++0x", str);
+    switch (str)
+      {
+      case CPP0X_INITIALIZER_LISTS:
+       pedwarn (input_location, 0, 
+                "extended initializer lists "
+                "only available with -std=c++0x or -std=gnu++0x");
+       break;
+      case CPP0X_EXPLICIT_CONVERSION:
+       pedwarn (input_location, 0,
+                "explicit conversion operators "
+                "only available with -std=c++0x or -std=gnu++0x"); 
+       break;
+      case CPP0X_VARIADIC_TEMPLATES:
+       pedwarn (input_location, 0,
+                "variadic templates "
+                "only available with -std=c++0x or -std=gnu++0x");
+       break;
+      case CPP0X_LAMBDA_EXPR:
+       pedwarn (input_location, 0,
+                "lambda expressions "
+                 "only available with -std=c++0x or -std=gnu++0x");
+       break;
+      case CPP0X_AUTO:
+       pedwarn (input_location, 0,
+                "C++0x auto only available with -std=c++0x or -std=gnu++0x");
+       break;
+      case CPP0X_SCOPED_ENUMS:
+       pedwarn (input_location, 0,
+                "scoped enums only available with -std=c++0x or -std=gnu++0x");
+       break;
+      case CPP0X_DEFAULTED_DELETED:
+       pedwarn (input_location, 0,
+                "defaulted and deleted functions "
+                "only available with -std=c++0x or -std=gnu++0x");
+       break;  
+      default:
+       gcc_unreachable();
+      }
 }
 
 /* Warn about the use of variadic templates when appropriate.  */
 void
 maybe_warn_variadic_templates (void)
 {
-  maybe_warn_cpp0x ("variadic templates");
+  maybe_warn_cpp0x (CPP0X_VARIADIC_TEMPLATES);
 }