From: Ralf Wildenhues Date: Mon, 21 Jul 2008 19:29:07 +0000 (+0000) Subject: objc-act.c: Fix comment typos. X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=39a13be5cbfe0e9623782de3733cd8265e6230d4;p=gcc.git objc-act.c: Fix comment typos. gcc/objc/ * objc-act.c: Fix comment typos. gcc/cp/ * call.c: Fix comment typos. * class.c: Likewise. * cp-tree.h: Likewise. * cxx-pretty-print.c: Likewise. * decl.c: Likewise. * init.c: Likewise. * name-lookup.c: Likewise. * operators.def: Likewise. * parser.c: Likewise. * pt.c: Likewise. * tree.c: Likewise. * typeck.c: Likewise. From-SVN: r138042 --- diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 4f9e10c709d..da6a3773dcd 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,18 @@ +2008-07-21 Ralf Wildenhues + + * call.c: Fix comment typos. + * class.c: Likewise. + * cp-tree.h: Likewise. + * cxx-pretty-print.c: Likewise. + * decl.c: Likewise. + * init.c: Likewise. + * name-lookup.c: Likewise. + * operators.def: Likewise. + * parser.c: Likewise. + * pt.c: Likewise. + * tree.c: Likewise. + * typeck.c: Likewise. + 2008-07-21 Paolo Carlini PR c++/36871 diff --git a/gcc/cp/call.c b/gcc/cp/call.c index 3c54001e3bd..93ce4d8366d 100644 --- a/gcc/cp/call.c +++ b/gcc/cp/call.c @@ -3416,7 +3416,7 @@ build_conditional_expr (tree arg1, tree arg2, tree arg3, /* [expr.cond] - The first expr ession is implicitly converted to bool (clause + The first expression is implicitly converted to bool (clause _conv_). */ arg1 = perform_implicit_conversion (boolean_type_node, arg1, complain); diff --git a/gcc/cp/class.c b/gcc/cp/class.c index 12b17f3751c..0c7a76c697a 100644 --- a/gcc/cp/class.c +++ b/gcc/cp/class.c @@ -4197,7 +4197,7 @@ check_bases_and_members (tree t) |= (TYPE_HAS_USER_CONSTRUCTOR (t) || TYPE_CONTAINS_VPTR_P (t)); /* [dcl.init.aggr] - An aggregate is an arry or a class with no user-declared + An aggregate is an array or a class with no user-declared constructors ... and no virtual functions. Again, other conditions for being an aggregate are checked @@ -7386,7 +7386,7 @@ build_vtbl_initializer (tree binfo, We first check this in update_vtable_entry_for_fn, so we handle restored primary bases properly; we also need to do it here so we - zero out unused slots in ctor vtables, rather than filling themff + zero out unused slots in ctor vtables, rather than filling them with erroneous values (though harmless, apart from relocation costs). */ for (b = binfo; ; b = get_primary_binfo (b)) diff --git a/gcc/cp/cp-tree.h b/gcc/cp/cp-tree.h index b07effead05..6bc5d2d2782 100644 --- a/gcc/cp/cp-tree.h +++ b/gcc/cp/cp-tree.h @@ -853,7 +853,7 @@ struct language_function GTY(()) #define cp_function_chain (cfun->language) /* In a constructor destructor, the point at which all derived class - destroying/construction has been has been done. Ie. just before a + destroying/construction has been done. I.e., just before a constructor returns, or before any base class destroying will be done in a destructor. */ @@ -1917,7 +1917,7 @@ struct lang_decl GTY(()) /* 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 FUNCTION_DECLS that are defined in the class. */ #define DECL_INITIALIZED_IN_CLASS_P(DECL) \ (DECL_LANG_SPECIFIC (DECL)->decl_flags.initialized_in_class) @@ -3199,7 +3199,7 @@ more_aggr_init_expr_args_p (const aggr_init_expr_arg_iterator *iter) template struct S { friend void f(T) {}; }; the declaration of `void f(int)' generated when S is instantiated will not be a DECL_TEMPLATE_INSTANTIATION, but will be - a DECL_FRIEND_PSUEDO_TEMPLATE_INSTANTIATION. */ + a DECL_FRIEND_PSEUDO_TEMPLATE_INSTANTIATION. */ #define DECL_FRIEND_PSEUDO_TEMPLATE_INSTANTIATION(DECL) \ (DECL_TEMPLATE_INFO (DECL) && !DECL_USE_TEMPLATE (DECL)) diff --git a/gcc/cp/cxx-pretty-print.c b/gcc/cp/cxx-pretty-print.c index 62ff1fc3fc3..cf9ed482e84 100644 --- a/gcc/cp/cxx-pretty-print.c +++ b/gcc/cp/cxx-pretty-print.c @@ -452,7 +452,7 @@ pp_cxx_primary_expression (cxx_pretty_printer *pp, tree t) reinterpret_cast < type-id > ( expression ) const_cast < type-id > ( expression ) typeid ( expression ) - typeif ( type-id ) */ + typeid ( type-id ) */ static void pp_cxx_postfix_expression (cxx_pretty_printer *pp, tree t) @@ -810,7 +810,7 @@ pp_cxx_pm_expression (cxx_pretty_printer *pp, tree t) { switch (TREE_CODE (t)) { - /* Handle unfortunate OFFESET_REF overloading here. */ + /* Handle unfortunate OFFSET_REF overloading here. */ case OFFSET_REF: if (TYPE_P (TREE_OPERAND (t, 0))) { @@ -2016,7 +2016,7 @@ pp_cxx_template_parameter (cxx_pretty_printer *pp, tree t) pp_cxx_identifier (pp, "..."); if (DECL_NAME (parameter)) pp_cxx_tree_identifier (pp, DECL_NAME (parameter)); - /* FIXME: Chech if we should print also default argument. */ + /* FIXME: Check if we should print also default argument. */ break; case PARM_DECL: diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c index cd6f287c857..e3043455257 100644 --- a/gcc/cp/decl.c +++ b/gcc/cp/decl.c @@ -315,7 +315,7 @@ current_tmpl_spec_kind (int n_class_scopes) template void S::f(int); - The `class T' maches the `S', leaving no template headers + The `class T' matches the `S', leaving no template headers corresponding to the `f'. */ return tsk_none; else if (n_template_parm_scopes > n_class_scopes + 1) @@ -4345,7 +4345,7 @@ check_array_designated_initializer (const constructor_elt *ce) if (ce->index) { /* The parser only allows identifiers as designated - intializers. */ + initializers. */ gcc_assert (TREE_CODE (ce->index) == IDENTIFIER_NODE); error ("name %qD used in a GNU-style designated " "initializer for an array", ce->index); @@ -7050,7 +7050,7 @@ compute_array_index_type (tree name, tree size) if (!abi_version_at_least (2) && processing_template_decl) /* For abi-1, we handled all instances in templates the same way, - even when they were non-dependent. This effects the manglings + even when they were non-dependent. This affects the manglings produced. So, we do the normal checking for non-dependent sizes, but at the end we'll return the same type that abi-1 would have, but with TYPE_CANONICAL set to the "right" @@ -10839,7 +10839,7 @@ finish_enum (tree enumtype) underlying_type = integer_types[itk_unsigned_long_long]; } - /* Compute the minium and maximum values for the type. + /* Compute the minimum and maximum values for the type. [dcl.enum] @@ -12195,7 +12195,7 @@ maybe_register_incomplete_var (tree var) } /* Called when a class type (given by TYPE) is defined. If there are - any existing VAR_DECLs whose type hsa been completed by this + any existing VAR_DECLs whose type has been completed by this declaration, update them now. */ void @@ -12260,7 +12260,7 @@ cxx_maybe_build_cleanup (tree decl) initial checks on the attribute. Note that those checks include ensuring that the function found is not an overloaded function, or an object with an overloaded call operator, - etc.; we can rely on the fact that the functionfound is an + etc.; we can rely on the fact that the function found is an ordinary FUNCTION_DECL. */ fn = lookup_name (id); arg = build_address (decl); diff --git a/gcc/cp/init.c b/gcc/cp/init.c index add7596b97a..7319568b4b4 100644 --- a/gcc/cp/init.c +++ b/gcc/cp/init.c @@ -1578,7 +1578,7 @@ build_offset_ref (tree type, tree member, bool address_p) a class derived from that class (_class.base.init_). */ if (DECL_NONSTATIC_MEMBER_FUNCTION_P (member)) { - /* Build a representation of a the qualified name suitable + /* Build a representation of the qualified name suitable for use as the operand to "&" -- even though the "&" is not actually present. */ member = build2 (OFFSET_REF, TREE_TYPE (member), decl, member); diff --git a/gcc/cp/name-lookup.c b/gcc/cp/name-lookup.c index edf74f9c81f..477cfb367e8 100644 --- a/gcc/cp/name-lookup.c +++ b/gcc/cp/name-lookup.c @@ -131,7 +131,7 @@ struct binding_table_s GTY(()) binding_entry * GTY((length ("%h.chain_count"))) chain; /* The number of chains in this table. This is the length of the - the member "chain" considered as an array. */ + member "chain" considered as an array. */ size_t chain_count; /* Number of "binding_entry"s in this table. */ @@ -782,7 +782,7 @@ pushdecl_maybe_friend (tree x, bool is_friend) tree previous = function_binding->value; /* In case either x or previous is declared to throw an exception, - make sure both exception speficications are equal. */ + make sure both exception specifications are equal. */ if (decls_match (x, previous)) { tree x_exception_spec = NULL_TREE; diff --git a/gcc/cp/operators.def b/gcc/cp/operators.def index 6c24ba19251..9c2dd8b2ca1 100644 --- a/gcc/cp/operators.def +++ b/gcc/cp/operators.def @@ -5,7 +5,7 @@ non-overloadable operators (like the `?:' ternary operator). Written by Mark Mitchell - Copyright (C) 2000, 2001, 2002, 2003, 2005, 2007 + Copyright (C) 2000, 2001, 2002, 2003, 2005, 2007, 2008 Free Software Foundation, Inc. This file is part of GCC. @@ -56,7 +56,7 @@ along with GCC; see the file COPYING3. If not see A boolean value. If nonzero, this is an assignment operator. - Before including this file, you should define DEFOPERATOR + Before including this file, you should define DEF_OPERATOR to take these arguments. There is code (such as in grok_op_properties) that depends on the diff --git a/gcc/cp/parser.c b/gcc/cp/parser.c index b4d2440d0e4..03606084258 100644 --- a/gcc/cp/parser.c +++ b/gcc/cp/parser.c @@ -1372,7 +1372,7 @@ cp_parser_context_new (cp_parser_context* next) /* No errors have occurred yet in this context. */ context->status = CP_PARSER_STATUS_KIND_NO_ERROR; - /* If this is not the bottomost context, copy information that we + /* If this is not the bottommost context, copy information that we need from the previous context. */ if (next) { @@ -6319,7 +6319,7 @@ cp_parser_assignment_operator_opt (cp_parser* parser) enum tree_code op; cp_token *token; - /* Peek at the next toen. */ + /* Peek at the next token. */ token = cp_lexer_peek_token (parser->lexer); switch (token->type) @@ -10468,7 +10468,7 @@ cp_parser_template_argument (cp_parser* parser) { cp_parser_parse_tentatively (parser); argument = cp_parser_primary_expression (parser, - /*adress_p=*/false, + /*address_p=*/false, /*cast_p=*/false, /*template_arg_p=*/true, &idk); @@ -12586,7 +12586,7 @@ cp_parser_init_declarator (cp_parser* parser, cp_parser_perform_template_parameter_access_checks (checks); /* Perform the access control checks for the declarator and the - the decl-specifiers. */ + decl-specifiers. */ perform_deferred_access_checks (); /* Restore the saved value. */ @@ -12863,7 +12863,7 @@ cp_parser_direct_declarator (cp_parser* parser, int i (3); The first is the declaration of a function while the - second is a the definition of a variable, including its + second is the definition of a variable, including its initializer. Having seen only the parenthesis, we cannot know which of @@ -15006,9 +15006,9 @@ cp_parser_class_head (cp_parser* parser, } /* [dcl.meaning] - A declarator-id shall not be qualified exception of the + A declarator-id shall not be qualified except for the definition of a ... nested class outside of its class - ... [or] a the definition or explicit instantiation of a + ... [or] the definition or explicit instantiation of a class member of a namespace outside of its namespace. */ if (scope == nested_name_specifier) { diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c index 9434312a11d..c609bd0cc3a 100644 --- a/gcc/cp/pt.c +++ b/gcc/cp/pt.c @@ -4241,7 +4241,7 @@ fold_non_dependent_expr (tree expr) /* EXPR is an expression which is used in a constant-expression context. For instance, it could be a VAR_DECL with a constant initializer. - Extract the innest constant expression. + Extract the innermost constant expression. This is basically a more powerful version of integral_constant_value, which can be used also in templates where @@ -6401,7 +6401,7 @@ tsubst_friend_function (tree decl, tree args) /* Friend functions are looked up in the containing namespace scope. We must enter that scope, to avoid finding member functions of the - current cless with same name. */ + current class with same name. */ push_nested_namespace (ns); fns = tsubst_expr (DECL_TI_TEMPLATE (decl), args, tf_warning_or_error, NULL_TREE, @@ -7104,7 +7104,7 @@ instantiate_class_template (tree type) { tree r; - /* The the file and line for this declaration, to + /* The file and line for this declaration, to assist in error message reporting. Since we called push_tinst_level above, we don't need to restore these. */ @@ -7263,7 +7263,7 @@ instantiate_class_template (tree type) /* Build new DECL_FRIENDLIST. */ tree r; - /* The the file and line for this declaration, to + /* The file and line for this declaration, to assist in error message reporting. Since we called push_tinst_level above, we don't need to restore these. */ @@ -11173,7 +11173,7 @@ tsubst_copy_and_build (tree t, tree init = RECUR (TREE_OPERAND (t, 3)); if (TREE_OPERAND (t, 3) && !init) - /* If there was an initializer in the the original tree, but + /* If there was an initializer in the original tree, but it instantiated to an empty list, then we should pass on VOID_ZERO_NODE to tell build_new that it was an empty initializer () rather than no initializer. This can only @@ -13563,7 +13563,7 @@ unify (tree tparms, tree targs, tree parm, tree arg, int strict) /* CV qualifications for methods can never be deduced, they must match exactly. We need to check them explicitly here, because type_unification_real treats them as any other - cvqualified parameter. */ + cv-qualified parameter. */ if (TREE_CODE (parm) == METHOD_TYPE && (!check_cv_quals_for_unify (UNIFY_ALLOW_NONE, diff --git a/gcc/cp/tree.c b/gcc/cp/tree.c index b288c5bbfca..0522ae2786f 100644 --- a/gcc/cp/tree.c +++ b/gcc/cp/tree.c @@ -683,7 +683,7 @@ c_build_qualified_type (tree type, int type_quals) arrays correctly. In particular, if TYPE is an array of T's, and TYPE_QUALS is non-empty, returns an array of qualified T's. - FLAGS determines how to deal with illformed qualifications. If + FLAGS determines how to deal with ill-formed qualifications. If tf_ignore_bad_quals is set, then bad qualifications are dropped (this is permitted if TYPE was introduced via a typedef or template type parameter). If bad qualifications are dropped and tf_warning @@ -795,8 +795,8 @@ cp_build_qualified_type_real (tree type, return make_pack_expansion (t); } - /* A reference or method type shall not be cv qualified. - [dcl.ref], [dct.fct] */ + /* A reference or method type shall not be cv-qualified. + [dcl.ref], [dcl.fct] */ if (type_quals & (TYPE_QUAL_CONST | TYPE_QUAL_VOLATILE) && (TREE_CODE (type) == REFERENCE_TYPE || TREE_CODE (type) == METHOD_TYPE)) diff --git a/gcc/cp/typeck.c b/gcc/cp/typeck.c index ad297106a6e..3468bd41a12 100644 --- a/gcc/cp/typeck.c +++ b/gcc/cp/typeck.c @@ -1645,7 +1645,7 @@ decay_conversion (tree exp) return exp; } -/* Perform prepatory conversions, as part of the "usual arithmetic +/* Perform preparatory conversions, as part of the "usual arithmetic conversions". In particular, as per [expr]: Whenever an lvalue expression appears as an operand of an @@ -3299,7 +3299,7 @@ cp_build_binary_op (enum tree_code code, tree orig_op0, tree orig_op1, TREE_TYPE (type1))) return pointer_diff (op0, op1, common_type (type0, type1)); /* In all other cases except pointer - int, the usual arithmetic - rules aply. */ + rules apply. */ else if (!(code0 == POINTER_TYPE && code1 == INTEGER_TYPE)) { common = 1; @@ -3821,7 +3821,7 @@ cp_build_binary_op (enum tree_code code, tree orig_op0, tree orig_op1, For them, this optimization is safe only if both args are zero-extended or both are sign-extended. Otherwise, we might change the result. - Eg, (short)-1 | (unsigned short)-1 is (int)-1 + E.g., (short)-1 | (unsigned short)-1 is (int)-1 but calculated in (unsigned short) it would be (unsigned short)-1. */ if (shorten && none_complex) diff --git a/gcc/objc/ChangeLog b/gcc/objc/ChangeLog index 50bedc14c71..12291d5604f 100644 --- a/gcc/objc/ChangeLog +++ b/gcc/objc/ChangeLog @@ -1,3 +1,7 @@ +2008-07-21 Ralf Wildenhues + + * objc-act.c: Fix comment typos. + 2008-07-18 Kaveh R. Ghazi * objc-act.c (objc_start_class_interface, diff --git a/gcc/objc/objc-act.c b/gcc/objc/objc-act.c index 5230f556e5f..44c8648a781 100644 --- a/gcc/objc/objc-act.c +++ b/gcc/objc/objc-act.c @@ -801,7 +801,7 @@ objc_build_struct (tree klass, tree fields, tree super_name) && TREE_CODE (TREE_CHAIN (field)) == FIELD_DECL) field = TREE_CHAIN (field); - /* For ObjC ABI purposes, the "packed" size of a base class is the + /* For ObjC ABI purposes, the "packed" size of a base class is the sum of the offset and the size (in bits) of the last field in the class. */ DECL_SIZE (base) @@ -1525,7 +1525,7 @@ synth_module_prologue (void) const struct gcc_debug_hooks *const save_hooks = debug_hooks; /* Suppress outputting debug symbols, because - dbxout_init hasn'r been called yet. */ + dbxout_init hasn't been called yet. */ write_symbols = NO_DEBUG; debug_hooks = &do_nothing_debug_hooks;