This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
[patch] cp/*.[ch]: Fix comment formatting.
- From: Kazu Hirata <kazu at cs dot umass dot edu>
- To: gcc-patches at gcc dot gnu dot org
- Date: Sun, 06 Jul 2003 19:23:55 -0400 (EDT)
- Subject: [patch] cp/*.[ch]: Fix comment formatting.
Hi,
Attached is a patch to fix comment formatting. Committed as obvious.
Kazu Hirata
2003-07-06 Kazu Hirata <kazu@cs.umass.edu>
* call.c: Fix comment formatting.
* class.c: Likewise.
* cp-tree.h: Likewise.
* decl.c: Likewise.
* decl2.c: Likewise.
* error.c: Likewise.
* method.c: Likewise.
* name-lookup.c: Likewise.
* parser.c: Likewise.
* pt.c: Likewise.
* rtti.c: Likewise.
* search.c: Likewise.
* typeck.c: Likewise.
Index: call.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/cp/call.c,v
retrieving revision 1.401
diff -u -r1.401 call.c
--- call.c 6 Jul 2003 03:30:55 -0000 1.401
+++ call.c 6 Jul 2003 23:18:41 -0000
@@ -2726,7 +2726,7 @@
/* Find the possibly overloaded set of functions corresponding to a
call of the form SCOPE::NAME (...). NAME might be a
- TEMPLATE_ID_EXPR, OVERLOAD, _DECL, IDENTIFIER_NODE or LOOKUP_EXPR. */
+ TEMPLATE_ID_EXPR, OVERLOAD, _DECL, IDENTIFIER_NODE or LOOKUP_EXPR. */
tree
resolve_scoped_fn_name (tree scope, tree name)
@@ -2916,7 +2916,7 @@
required by the allocation, and is updated if that is changed here.
*COOKIE_SIZE is non-NULL if a cookie should be used. If this
function determines that no cookie should be used, after all,
- *COOKIE_SIZE is set to NULL_TREE. */
+ *COOKIE_SIZE is set to NULL_TREE. */
tree
build_operator_new_call (tree fnname, tree args, tree *size, tree *cookie_size)
@@ -5786,7 +5786,7 @@
/* We don't want to complain about `X::operator T1 ()'
beating `X::operator T2 () const', when T2 is a no less
- cv-qualified version of T1. */
+ cv-qualified version of T1. */
if (DECL_CONTEXT (w->fn) == DECL_CONTEXT (l->fn)
&& !DECL_CONSTRUCTOR_P (w->fn) && !DECL_CONSTRUCTOR_P (l->fn))
{
Index: class.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/cp/class.c,v
retrieving revision 1.548
diff -u -r1.548 class.c
--- class.c 5 Jul 2003 03:02:02 -0000 1.548
+++ class.c 6 Jul 2003 23:18:45 -0000
@@ -2216,7 +2216,7 @@
return;
overrider_target = overrider_fn = TREE_PURPOSE (overrider);
- /* Check for adjusting covariant return types. */
+ /* Check for adjusting covariant return types. */
over_return = TREE_TYPE (TREE_TYPE (overrider_target));
base_return = TREE_TYPE (TREE_TYPE (target_fn));
@@ -2242,7 +2242,7 @@
if (!virtual_offset)
{
/* There was no existing virtual thunk (which takes
- precidence). */
+ precidence). */
tree thunk_binfo;
base_kind kind;
@@ -2279,7 +2279,7 @@
if (fixed_offset || virtual_offset)
/* Replace the overriding function with a covariant thunk. We
will emit the overriding function in its own slot as
- well. */
+ well. */
overrider_fn = make_thunk (overrider_target, /*this_adjusting=*/0,
fixed_offset, virtual_offset);
}
@@ -5061,7 +5061,7 @@
CLASSTYPE_KEY_METHOD (t) = key_method (t);
/* If a polymorphic class has no key method, we may emit the vtable
- in every translation unit where the class definition appears. */
+ in every translation unit where the class definition appears. */
if (CLASSTYPE_KEY_METHOD (t) == NULL_TREE)
keyed_classes = tree_cons (NULL_TREE, t, keyed_classes);
}
@@ -5622,7 +5622,7 @@
{
int i;
- /* The bases of a dependent type are unknown. */
+ /* The bases of a dependent type are unknown. */
if (dependent_type_p (t))
return NULL_TREE;
@@ -6522,7 +6522,7 @@
/* Dump the offsets of all the bases rooted at BINFO to STREAM.
INDENT should be zero when called from the top level; it is
incremented recursively. IGO indicates the next expected BINFO in
- inheritance graph ordering. */
+ inheritance graph ordering. */
static tree
dump_class_hierarchy_r (FILE *stream,
Index: cp-tree.h
===================================================================
RCS file: /cvs/gcc/gcc/gcc/cp/cp-tree.h,v
retrieving revision 1.868
diff -u -r1.868 cp-tree.h
--- cp-tree.h 6 Jul 2003 03:30:55 -0000 1.868
+++ cp-tree.h 6 Jul 2003 23:18:47 -0000
@@ -1470,7 +1470,7 @@
#define BINFO_VTABLE_PATH_MARKED(NODE) TREE_LANG_FLAG_3 (NODE)
/* Nonzero means B (a BINFO) has its own vtable. Any copies will not
- have this flag set. */
+ have this flag set. */
#define BINFO_NEW_VTABLE_MARKED(B) (TREE_LANG_FLAG_4 (B))
/* Any subobject that needs a new vtable must have a vptr and must not
@@ -1691,7 +1691,7 @@
DECL_THIS_THUNK_P does not hold, this is DECL_THUNKS. Both
this pointer and result pointer adjusting thunks are
chained here. This pointer thunks to return pointer thunks
- will be chained on the return pointer thunk. */
+ will be chained on the return pointer thunk. */
tree context;
/* In a FUNCTION_DECL, this is DECL_CLONED_FUNCTION. */
@@ -1911,7 +1911,7 @@
/* Nonzero if the DECL was initialized in the class definition itself,
rather than outside the class. This is used for both static member
- VAR_DECLS, and FUNTION_DECLS that are defined in the class. */
+ VAR_DECLS, and FUNTION_DECLS that are defined in the class. */
#define DECL_INITIALIZED_IN_CLASS_P(DECL) \
(DECL_LANG_SPECIFIC (DECL)->decl_flags.initialized_in_class)
@@ -2966,7 +2966,7 @@
/* The various kinds of access. BINFO_ACCESS depends on these being
two bit quantities. The numerical values are important; they are
used to initialize RTTI data structures, so changing them changes
- the ABI. */
+ the ABI. */
typedef enum access_kind {
ak_none = 0, /* Inaccessible. */
ak_public = 1, /* Accessible, as a `public' thing. */
@@ -3989,7 +3989,7 @@
extern void finish_repo (void);
/* in rtti.c */
-/* A varray of all tinfo decls that haven't been emitted yet. */
+/* A varray of all tinfo decls that haven't been emitted yet. */
extern GTY(()) varray_type unemitted_tinfo_decls;
extern void init_rtti_processing (void);
Index: decl.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/cp/decl.c,v
retrieving revision 1.1080
diff -u -r1.1080 decl.c
--- decl.c 6 Jul 2003 03:30:55 -0000 1.1080
+++ decl.c 6 Jul 2003 23:18:55 -0000
@@ -2377,7 +2377,7 @@
if (REAL_IDENTIFIER_TYPE_VALUE (id) != global_type_node)
POP_TIMEVAR_AND_RETURN (TV_NAME_LOOKUP, REAL_IDENTIFIER_TYPE_VALUE (id));
/* Have to search for it. It must be on the global level, now.
- Ask lookup_name not to return non-types. */
+ Ask lookup_name not to return non-types. */
id = lookup_name_real (id, 2, 1, 0, LOOKUP_COMPLAIN);
if (id)
POP_TIMEVAR_AND_RETURN (TV_NAME_LOOKUP, TREE_TYPE (id));
Index: decl2.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/cp/decl2.c,v
retrieving revision 1.641
diff -u -r1.641 decl2.c
--- decl2.c 5 Jul 2003 03:02:03 -0000 1.641
+++ decl2.c 6 Jul 2003 23:18:58 -0000
@@ -883,7 +883,7 @@
if (value == void_type_node)
return value;
- /* Pass friend decls back. */
+ /* Pass friend decls back. */
if ((TREE_CODE (value) == FUNCTION_DECL
|| TREE_CODE (value) == TEMPLATE_DECL)
&& DECL_CONTEXT (value) != current_class_type)
@@ -2641,7 +2641,7 @@
the virtual table for a template class may cause the
instantiation of members of that class. If we write out
vtables then we remove the class from our list so we don't
- have to look at it again. */
+ have to look at it again. */
while (keyed_classes != NULL_TREE
&& maybe_emit_vtables (TREE_VALUE (keyed_classes)))
@@ -2674,7 +2674,7 @@
cause other variables to be needed. We stick new elements
(and old elements that we may need to reconsider) at the end
of the array, then shift them back to the beginning once we're
- done. */
+ done. */
n_old = VARRAY_ACTIVE_SIZE (unemitted_tinfo_decls);
for (i = 0; i < n_old; ++i)
@@ -2688,7 +2688,7 @@
/* The only elements we want to keep are the new ones. Copy
them to the beginning of the array, then get rid of the
- leftovers. */
+ leftovers. */
n_new = VARRAY_ACTIVE_SIZE (unemitted_tinfo_decls) - n_old;
memmove (&VARRAY_TREE (unemitted_tinfo_decls, 0),
&VARRAY_TREE (unemitted_tinfo_decls, n_old),
@@ -2851,7 +2851,7 @@
}
while (reconsider);
- /* All used inline functions must have a definition at this point. */
+ /* All used inline functions must have a definition at this point. */
for (i = 0; i < deferred_fns_used; ++i)
{
tree decl = VARRAY_TREE (deferred_fns, i);
@@ -4304,7 +4304,7 @@
return NULL_TREE;
}
*name = DECL_NAME (decl);
- /* Make a USING_DECL. */
+ /* Make a USING_DECL. */
return push_using_decl (*scope, *name);
}
Index: error.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/cp/error.c,v
retrieving revision 1.217
diff -u -r1.217 error.c
--- error.c 2 Jul 2003 21:32:58 -0000 1.217
+++ error.c 6 Jul 2003 23:18:59 -0000
@@ -1514,7 +1514,7 @@
case COMPOUND_EXPR:
print_left_paren (scratch_buffer);
/* Within templates, a COMPOUND_EXPR has only one operand,
- containing a TREE_LIST of the two operands. */
+ containing a TREE_LIST of the two operands. */
if (TREE_CODE (TREE_OPERAND (t, 0)) == TREE_LIST)
{
if (TREE_OPERAND (t, 1))
Index: method.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/cp/method.c,v
retrieving revision 1.258
diff -u -r1.258 method.c
--- method.c 2 Jul 2003 00:12:09 -0000 1.258
+++ method.c 6 Jul 2003 23:19:04 -0000
@@ -218,7 +218,7 @@
tree thunk;
my_friendly_assert (TREE_CODE (function) == FUNCTION_DECL, 20021025);
- /* We can have this thunks to covariant thunks, but not vice versa. */
+ /* We can have this thunks to covariant thunks, but not vice versa. */
my_friendly_assert (!DECL_THIS_THUNK_P (function), 20021127);
/* Scale the VIRTUAL_OFFSET to be in terms of bytes. */
@@ -233,7 +233,7 @@
/* See if we already have the thunk in question. For this_adjusting
thunks VIRTUAL_OFFSET will be an INTEGER_CST, for covariant thunks it
- will be a BINFO. */
+ will be a BINFO. */
for (thunk = DECL_THUNKS (function); thunk; thunk = TREE_CHAIN (thunk))
if (DECL_THIS_THUNK_P (thunk) == this_adjusting
&& THUNK_FIXED_OFFSET (thunk) == d
@@ -313,7 +313,7 @@
/* Adjust PTR by the constant FIXED_OFFSET, and by the vtable
offset indicated by VIRTUAL_OFFSET, if that is
non-null. THIS_ADJUSTING is nonzero for a this adjusting thunk and
- zero for a result adjusting thunk. */
+ zero for a result adjusting thunk. */
static tree
thunk_adjust (tree ptr, bool this_adjusting,
@@ -417,7 +417,7 @@
HOST_WIDE_INT fixed_offset, virtual_value;
bool this_adjusting = DECL_THIS_THUNK_P (thunk_fndecl);
- /* We should have called finish_thunk to give it a name. */
+ /* We should have called finish_thunk to give it a name. */
my_friendly_assert (DECL_NAME (thunk_fndecl), 20021127);
if (TREE_ASM_WRITTEN (thunk_fndecl))
Index: name-lookup.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/cp/name-lookup.c,v
retrieving revision 1.7
diff -u -r1.7 name-lookup.c
--- name-lookup.c 19 May 2003 11:04:18 -0000 1.7
+++ name-lookup.c 6 Jul 2003 23:19:04 -0000
@@ -90,7 +90,7 @@
(table->chain_count * sizeof (binding_entry));
}
-/* Free TABLE by making its entries ready for reuse. */
+/* Free TABLE by making its entries ready for reuse. */
void
binding_table_free (binding_table table)
{
Index: parser.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/cp/parser.c,v
retrieving revision 1.74
diff -u -r1.74 parser.c
--- parser.c 5 Jul 2003 03:02:04 -0000 1.74
+++ parser.c 6 Jul 2003 23:19:10 -0000
@@ -115,7 +115,7 @@
cp_token_block *last;
} cp_token_cache;
-/* Prototypes. */
+/* Prototypes. */
static cp_token_cache *cp_token_cache_new
(void);
@@ -1065,7 +1065,7 @@
typedef enum cp_parser_declarator_kind
{
- /* We want an abstract declartor. */
+ /* We want an abstract declartor. */
CP_PARSER_DECLARATOR_ABSTRACT,
/* We want a named declarator. */
CP_PARSER_DECLARATOR_NAMED,
@@ -1264,7 +1264,7 @@
processing.
These lists can only be processed once the outermost class being
- defined is complete. */
+ defined is complete. */
tree unparsed_functions_queues;
/* The number of classes whose definitions are currently in
@@ -2439,7 +2439,7 @@
cp_parser_error (parser, "expected primary-expression");
return error_mark_node;
}
- /* Fall through. */
+ /* Fall through. */
/* An id-expression can start with either an identifier, a
`::' as the beginning of a qualified-id, or the "operator"
@@ -2748,7 +2748,7 @@
/* Const variables or static data members of integral
or enumeration types initialized with constant
expressions (or dependent expressions - in this case
- the check will be done at instantiation time). */
+ the check will be done at instantiation time). */
&& !(TREE_CODE (decl) == VAR_DECL
&& INTEGRAL_OR_ENUMERATION_TYPE_P (TREE_TYPE (decl))
&& DECL_INITIAL (decl)
@@ -4240,7 +4240,7 @@
cp_parser_require (parser, CPP_SCOPE, "`::'");
}
/* If the next token is not a `~', then there might be some
- additional qualification. */
+ additional qualification. */
else if (cp_lexer_next_token_is_not (parser->lexer, CPP_COMPL))
{
/* Look for the type-name. */
@@ -4313,7 +4313,7 @@
{
tree operand;
- /* Consume the `sizeof' token. */
+ /* Consume the `sizeof' token. */
cp_lexer_consume_token (parser->lexer);
/* Parse the operand. */
operand = cp_parser_sizeof_operand (parser, keyword);
@@ -6465,7 +6465,7 @@
init-declarator-list , init-declarator
If FUNCTION_DEFINITION_ALLOWED_P is TRUE, then we also recognize a
- function-definition as a simple-declaration. */
+ function-definition as a simple-declaration. */
static void
cp_parser_simple_declaration (cp_parser* parser,
@@ -8877,7 +8877,7 @@
Also, `new struct S' or `sizeof (struct S)' never results in the
definition of a new type; a new type can only be declared in a
- declaration context. */
+ declaration context. */
type = xref_tag (tag_type, identifier,
/*attributes=*/NULL_TREE,
@@ -9634,7 +9634,7 @@
/* If the entity being declared is a function, pretend that we
are in its scope. If it is a `friend', it may have access to
- things that would not otherwise be accessible. */
+ things that would not otherwise be accessible. */
if (TREE_CODE (decl) == FUNCTION_DECL)
{
saved_current_function_decl = current_function_decl;
@@ -9987,7 +9987,7 @@
goto handle_declarator;
}
- /* Otherwise, we must be done. */
+ /* Otherwise, we must be done. */
else
break;
}
@@ -11179,7 +11179,7 @@
Returns a TREE_LIST. The TREE_VALUE of each node is an expression
for the initializer. If the TREE_PURPOSE is non-NULL, it is the
- IDENTIFIER_NODE naming the field to initialize. */
+ IDENTIFIER_NODE naming the field to initialize. */
static tree
cp_parser_initializer_list (cp_parser* parser)
@@ -11413,7 +11413,7 @@
/* Start the class. */
type = begin_class_definition (type);
if (type == error_mark_node)
- /* If the type is erroneous, skip the entire body of the class. */
+ /* If the type is erroneous, skip the entire body of the class. */
cp_parser_skip_to_closing_brace (parser);
else
/* Parse the member-specification. */
Index: pt.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/cp/pt.c,v
retrieving revision 1.713
diff -u -r1.713 pt.c
--- pt.c 5 Jul 2003 03:02:04 -0000 1.713
+++ pt.c 6 Jul 2003 23:19:16 -0000
@@ -1009,7 +1009,7 @@
if (!duplicate_decls (spec, fn) && DECL_INITIAL (spec))
/* Dup decl failed, but this is a new
definition. Set the line number so any errors
- match this new definition. */
+ match this new definition. */
DECL_SOURCE_LOCATION (fn) = DECL_SOURCE_LOCATION (spec);
return fn;
@@ -7171,7 +7171,7 @@
class, rather than the instantiated class.
In addition, lookups that were not ambiguous before may be
- ambiguous now. Therefore, we perform the lookup again. */
+ ambiguous now. Therefore, we perform the lookup again. */
qualifying_scope = BINFO_TYPE (BASELINK_ACCESS_BINFO (t));
fns = BASELINK_FUNCTIONS (t);
if (TREE_CODE (fns) == TEMPLATE_ID_EXPR)
@@ -8319,7 +8319,7 @@
/* Verify that the instantiated ARGS are valid. For type arguments,
make sure that the type's linkage is ok. For non-type arguments,
make sure they are constants if they are integral or enumerations.
- Emit an error under control of COMPLAIN, and return TRUE on error. */
+ Emit an error under control of COMPLAIN, and return TRUE on error. */
static bool
check_instantiated_args (tree tmpl, tree args, tsubst_flags_t complain)
@@ -9472,7 +9472,7 @@
{
/* If ARG is an offset type, we're trying to unify '*T' with
'U C::*', which is ill-formed. See the comment in the
- POINTER_TYPE case about this ugliness. */
+ POINTER_TYPE case about this ugliness. */
if (TREE_CODE (arg) == OFFSET_TYPE)
return 1;
@@ -10345,7 +10345,7 @@
}
/* Called from do_type_instantiation through binding_table_foreach to
- do recursive instantiation for the type bound in ENTRY. */
+ do recursive instantiation for the type bound in ENTRY. */
static void
bt_instantiate_type_proc (binding_entry entry, void *data)
{
Index: rtti.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/cp/rtti.c,v
retrieving revision 1.166
diff -u -r1.166 rtti.c
--- rtti.c 4 Jul 2003 05:05:15 -0000 1.166
+++ rtti.c 6 Jul 2003 23:19:16 -0000
@@ -73,7 +73,7 @@
/* The IDENTIFIER_NODE naming the real class. */
#define TINFO_REAL_NAME(NODE) TREE_PURPOSE (NODE)
-/* A varray of all tinfo decls that haven't yet been emitted. */
+/* A varray of all tinfo decls that haven't yet been emitted. */
varray_type unemitted_tinfo_decls;
static tree build_headof (tree);
@@ -373,7 +373,7 @@
/* Remember the type it is for. */
TREE_TYPE (name) = type;
- /* Add decl to the global array of tinfo decls. */
+ /* Add decl to the global array of tinfo decls. */
my_friendly_assert (unemitted_tinfo_decls != 0, 20030312);
VARRAY_PUSH_TREE (unemitted_tinfo_decls, d);
}
Index: search.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/cp/search.c,v
retrieving revision 1.269
diff -u -r1.269 search.c
--- search.c 6 Jul 2003 22:21:35 -0000 1.269
+++ search.c 6 Jul 2003 23:19:17 -0000
@@ -1440,7 +1440,7 @@
tmp = methods[i];
/* This slot may be empty; we allocate more slots than we
need. In that case, the entry we're looking for is
- closer to the beginning of the list. */
+ closer to the beginning of the list. */
if (tmp)
tmp = DECL_NAME (OVL_CURRENT (tmp));
if (!tmp || tmp > name)
@@ -1685,7 +1685,7 @@
|| (TREE_CODE (base_return) == TREE_CODE (over_return)
&& POINTER_TYPE_P (base_return)))
{
- /* Potentially covariant. */
+ /* Potentially covariant. */
unsigned base_quals, over_quals;
fail = !POINTER_TYPE_P (base_return);
@@ -1716,7 +1716,7 @@
converting to void *, or qualification conversion. */
{
/* can_convert will permit user defined conversion from a
- (reference to) class type. We must reject them. */
+ (reference to) class type. We must reject them. */
over_return = TREE_TYPE (over_type);
if (TREE_CODE (over_return) == REFERENCE_TYPE)
over_return = TREE_TYPE (over_return);
@@ -2448,7 +2448,7 @@
/* BINFO is a base binfo in the complete type BINFO_TYPE (HERE).
Find the equivalent binfo within whatever graph HERE is located.
- This is the inverse of original_binfo. */
+ This is the inverse of original_binfo. */
tree
copied_binfo (tree binfo, tree here)
@@ -2499,7 +2499,7 @@
/* BINFO is some base binfo of HERE, within some other
hierarchy. Return the equivalent binfo, but in the hierarchy
dominated by HERE. This is the inverse of copied_binfo. If BINFO
- is not a base binfo of HERE, returns NULL_TREE. */
+ is not a base binfo of HERE, returns NULL_TREE. */
tree
original_binfo (tree binfo, tree here)
Index: typeck.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/cp/typeck.c,v
retrieving revision 1.473
diff -u -r1.473 typeck.c
--- typeck.c 6 Jul 2003 03:30:56 -0000 1.473
+++ typeck.c 6 Jul 2003 23:19:23 -0000
@@ -981,7 +981,7 @@
return compparms (TYPE_ARG_TYPES (t1), TYPE_ARG_TYPES (t2));
case ARRAY_TYPE:
- /* Target types must match incl. qualifiers. */
+ /* Target types must match incl. qualifiers. */
return comp_array_types (t1, t2, !!(strict & COMPARE_REDECLARATION));
case TEMPLATE_TYPE_PARM:
@@ -2975,12 +2975,12 @@
case MINUS_EXPR:
/* FIXME: Be careful of special pointer-arithmetic
cases. */
- /* Fall through. */
+ /* Fall through. */
case MAX_EXPR:
case MIN_EXPR:
/* These are GNU extensions; the result type is computed
as it would be for other arithmetic operators. */
- /* Fall through. */
+ /* Fall through. */
case BIT_AND_EXPR:
case BIT_XOR_EXPR:
case BIT_IOR_EXPR: