parser.c (cp_parser_init_declarator, [...]): Reformat.

	* parser.c (cp_parser_init_declarator,
	cp_paser_member_declaration): Reformat.
	* pt.c (lookup_template_class, type_unification_real, unify,
	type_dependent_expression_p): Reformat.

From-SVN: r70047

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 07fffc2f97554cc880fe03b528a56fd55844733a..83b901e36dfe7deba46d9edb209b68e5598212fe 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,5 +1,10 @@
 2003-08-01  Nathan Sidwell  <nathan@codesourcery.com>
 
+       * parser.c (cp_parser_init_declarator,
+       cp_paser_member_declaration): Reformat.
+       * pt.c (lookup_template_class, type_unification_real, unify,
+       type_dependent_expression_p): Reformat.
+
        PR c++/11295
        * cp-tree.h (tubst_flags_t): Add tf_stmt_expr_cmpd,
        tf_stmt_expr_body.

diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c
index 51f4eda4a6afd264ac9176a8f626352b9cad6e96..63c81720caf94e992b57677714869250f8cd0798 100644 (file)
--- a/gcc/cp/parser.c
+++ b/gcc/cp/parser.c
@@ -9268,8 +9268,7 @@ cp_parser_init_declarator (cp_parser* parser,
   friend_p = cp_parser_friend_p (decl_specifiers);
 
   /* Check that the number of template-parameter-lists is OK.  */
-  if (!cp_parser_check_declarator_template_parameters (parser, 
-                                                      declarator))
+  if (!cp_parser_check_declarator_template_parameters (parser, declarator))
     return error_mark_node;
 
   /* Enter the newly declared entry in the symbol table.  If we're
@@ -9284,11 +9283,8 @@ cp_parser_init_declarator (cp_parser* parser,
                                       decl_specifiers);
          have_extern_spec = false;
        }
-      decl = start_decl (declarator,
-                        decl_specifiers,
-                        is_initialized,
-                        attributes,
-                        prefix_attributes);
+      decl = start_decl (declarator, decl_specifiers,
+                        is_initialized, attributes, prefix_attributes);
     }
 
   /* Enter the SCOPE.  That way unqualified names appearing in the
@@ -11850,10 +11846,8 @@ cp_parser_member_declaration (cp_parser* parser)
              else
                {
                  /* Create the declaration.  */
-                 decl = grokfield (declarator, 
-                                   decl_specifiers, 
-                                   initializer,
-                                   asm_specification,
+                 decl = grokfield (declarator, decl_specifiers, 
+                                   initializer, asm_specification,
                                    attributes);
                  /* Any initialization must have been from a
                     constant-expression.  */

diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c
index 9cfefb2ed0c37a7338e629460074be134740e2eb..ef6592a7e48201c55b8bd2d18fba15f38cabcd23 100644 (file)
--- a/gcc/cp/pt.c
+++ b/gcc/cp/pt.c
@@ -4126,9 +4126,9 @@ lookup_template_class (tree d1,
               i > 0 && t != NULL_TREE;
               --i, t = TREE_CHAIN (t))
            {
-             tree a = coerce_template_parms (TREE_VALUE (t), arglist,
-                                             template, complain,
-                                             /*require_all_args=*/1);
+             tree a = coerce_template_parms (TREE_VALUE (t),
+                                             arglist, template,
+                                             complain, /*require_all_args=*/1);
 
              /* Don't process further if one of the levels fails.  */
              if (a == error_mark_node)
@@ -8786,9 +8786,7 @@ type_unification_real (tree tparms,
   my_friendly_assert (TREE_CODE (tparms) == TREE_VEC, 289);
   my_friendly_assert (xparms == NULL_TREE 
                      || TREE_CODE (xparms) == TREE_LIST, 290);
-  /* ARGS could be NULL.  */
-  if (xargs)
-    my_friendly_assert (TREE_CODE (xargs) == TREE_LIST, 291);
+  my_friendly_assert (!xargs || TREE_CODE (xargs) == TREE_LIST, 291);
   my_friendly_assert (ntparms > 0, 292);
 
   switch (strict)
@@ -9489,8 +9487,8 @@ unify (tree tparms, tree targs, tree parm, tree arg, int strict)
               template <class T, class Allocator = allocator> 
               class vector.  */
 
-           if (coerce_template_parms (argtmplvec, parmvec, parmtmpl,
-                                      tf_none, 1) == error_mark_node)
+           if (coerce_template_parms (argtmplvec, parmvec, parmtmpl, 0, 1)
+               == error_mark_node)
              return 1;
          
            /* Deduce arguments T, i from TT<T> or TT<i>.  
@@ -11638,8 +11636,8 @@ type_dependent_expression_p (tree expression)
        expression = BASELINK_FUNCTIONS (expression);
       if (TREE_CODE (expression) == TEMPLATE_ID_EXPR)
        {
-         if (any_dependent_template_arguments_p (TREE_OPERAND (expression, 
-                                                               1)))
+         if (any_dependent_template_arguments_p
+             (TREE_OPERAND (expression, 1)))
            return true;
          expression = TREE_OPERAND (expression, 0);
        }