From a83f01f0409ad496222c05be70d4cb5a1b3e132d Mon Sep 17 00:00:00 2001 From: Joseph Myers Date: Sun, 16 Dec 2001 16:23:50 +0000 Subject: [PATCH] ChangeLog, [...]: Fix spelling errors. * ChangeLog, Make-lang.in, class.c, expr.c, gcj.texi, java-tree.h, jcf-parse.c, jcf-write.c, lex.c, parse.h, parse.y, verify.c: Fix spelling errors. From-SVN: r48075 --- gcc/java/ChangeLog | 28 +++++++++++++++++----------- gcc/java/Make-lang.in | 2 +- gcc/java/class.c | 4 ++-- gcc/java/expr.c | 2 +- gcc/java/gcj.texi | 2 +- gcc/java/java-tree.h | 8 ++++---- gcc/java/jcf-parse.c | 2 +- gcc/java/jcf-write.c | 4 ++-- gcc/java/lex.c | 2 +- gcc/java/parse.h | 2 +- gcc/java/parse.y | 36 ++++++++++++++++++------------------ gcc/java/verify.c | 4 ++-- 12 files changed, 51 insertions(+), 45 deletions(-) diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog index 8436c52d78a..078a2e793b8 100644 --- a/gcc/java/ChangeLog +++ b/gcc/java/ChangeLog @@ -1,3 +1,9 @@ +2001-12-16 Joseph S. Myers + + * ChangeLog, Make-lang.in, class.c, expr.c, gcj.texi, java-tree.h, + jcf-parse.c, jcf-write.c, lex.c, parse.h, parse.y, verify.c: Fix + spelling errors. + 2001-12-16 Kaveh R. Ghazi * lex.c (java_read_unicode, java_lex): Use hex_p/hex_value. @@ -20,7 +26,7 @@ * class.c (build_method_symbols_entry): New function. (make_method_value): Set "index" to to method's vtable index for virtual methods when indirect-dispatch is not used. - (make_class_data): For indirect-dispatch, dont emit the dtable_decl, + (make_class_data): For indirect-dispatch, don't emit the dtable_decl, and set vtable_method_count to -1. Set otable and otable_syms field if indirect-dispatch is used and there was something to put in them. (build_method_symbols_entry): New function. @@ -2340,7 +2346,7 @@ Sun Feb 4 15:52:44 2001 Richard Kenner * jvgenmain.c (main_method_prefix): Global variable removed. (main_method_suffix): Likewise. (do_mangle_classname): New function. - (main): Call it. Format changed to accomodate new mangling scheme. + (main): Call it. Format changed to accommodate new mangling scheme. * lex.c: (utf8_cmp): Conditionally prototyped. (cxx_keywords): Moved from class.c, conditionally defined. (utf8_cmp, cxx_keyword_p): Likewise. @@ -2911,7 +2917,7 @@ Thu Nov 23 02:19:14 2000 J"orn Rennecke * jcf-parse.c (get_constant): Don't mess with obstacks. (read_class): Likewise. (jcf_parse): Likewise. - * lex.c (expresion_obstack): Remove. + * lex.c (expression_obstack): Remove. (java_lex): Don't use obstack_free. * parse.h (exit_java_complete_class): Don't mess with obstacks. (MANGLE_OUTER_LOCAL_VARIABLE_NAME): Adjust. @@ -2921,7 +2927,7 @@ Thu Nov 23 02:19:14 2000 J"orn Rennecke (add_inner_class_fields): Adjust calls to MANGLE_* macros. (lookup_field_wrapper): Likewise. (obtain_incomplete_type): Don't mess with obstacks. - (build_alias_initializer_paramter_list): Adjust calls to MANGLE_* + (build_alias_initializer_parameter_list): Adjust calls to MANGLE_* macros. (craft_constructor): Don't mess with obstacks. (safe_layout_class): Likewise. @@ -3460,7 +3466,7 @@ Sun Aug 6 00:47:24 2000 Ovidiu Predescu entering the function. `fprintf' format modified not to use INNER_QUALIFIER. (report_class_declaration): Assign `package_name' and - `current_class' to NULL separatly. + `current_class' to NULL separately. 2000-07-31 Alexandre Petit-Bianco @@ -4468,7 +4474,7 @@ Mon Mar 13 12:21:13 2000 Alexandre Petit-Bianco (maybe_make_nested_class_name): Mark nested class name as qualified when necessary. (end_class_declaration): Don't call java_parse_context_resume when - one or more error occured. + one or more error occurred. (add_inner_class_fields): Use SET_CPC_INITIALIZER_STMT. (register_fields): Use SET_CPC_STATIC_INITIALIZER_STMT and SET_CPC_INITIALIZER_STMT. @@ -4771,7 +4777,7 @@ Sat Feb 12 04:34:04 2000 Alexandre Petit-Bianco * parse.y (outer_field_access_fix): First parameter now a tree node. Check for assignement to final. First argument to - build_outer_field_access_fix modified to accomodate prototype. + build_outer_field_access_fix modified to accommodate prototype. (build_outer_field_access): Don't check for assignment to final here. (java_complete_lhs): MODIFY_EXPR case: Check for `error_mark_node' @@ -5729,7 +5735,7 @@ Wed Dec 1 04:25:06 1999 Alexandre Petit-Bianco Tue Nov 30 12:36:15 1999 Anthony Green * verify.c (verify_jvm_instructions): Create new return label - chain if non existant (don't rely on the verified state of the jsr + chain if non existent (don't rely on the verified state of the jsr target.) Tue Nov 30 12:28:34 1999 Alexandre Petit-Bianco @@ -11705,7 +11711,7 @@ Tue Apr 14 15:59:54 1998 Alexandre Petit-Bianco (yyerror): New static elc. Removed static error_line, error_pos. New local code_from_source. Save ctxp->elc into elc at the first pass. Call java_get_line_col to get a string of the line where - the error occured. + the error occurred. (debug_line): Removed static function. (parse_error_context, parse_warning_context): Parameter cl is now a WFL node. Use its value to initialize ctxp->elc. @@ -12277,7 +12283,7 @@ Fri Oct 17 15:56:37 1997 Per Bothner * java-tree.h (PUSH_FIELD): Set DECL_ARTIFICIAL. * class.c (make_class_data): Don't build fields_decl if no fields. - When building fields_decl, skip if DECL_ARTIFICAL. + When building fields_decl, skip if DECL_ARTIFICIAL. * expr.c (java_stack_swap): Update stack_type_map. * verify.c (merge_types): Handle array types better. @@ -12835,7 +12841,7 @@ Tue May 6 22:08:24 1997 Per Bothner * java-opcodes.h: Use javaop.def to avoid duplicated list. * javaop.def: Rename invokevirt -> invokevirtual. * lang.c (use_handles): Removed. - * parse.c: Add support for ConstantValue atribute. + * parse.c: Add support for ConstantValue attribute. Handle nested loading of a class. (JPOOL_UTF): New. Tue Mar 11 20:11:05 1997 Per Bothner diff --git a/gcc/java/Make-lang.in b/gcc/java/Make-lang.in index cb44d231d7f..1a8f595a822 100644 --- a/gcc/java/Make-lang.in +++ b/gcc/java/Make-lang.in @@ -53,7 +53,7 @@ GCJ = gcj java: jc1$(exeext) $(GCJ)$(exeext) jvgenmain$(exeext) \ gcjh$(exeext) jv-scan$(exeext) jcf-dump$(exeext) -# Define the name of target independant tools to be installed in $(bindir) +# Define the name of target independent tools to be installed in $(bindir) # Names are subject to changes JAVA_TARGET_INDEPENDENT_BIN_TOOLS = gcjh jv-scan jcf-dump diff --git a/gcc/java/class.c b/gcc/java/class.c index 6b05435c11e..3e56959715f 100644 --- a/gcc/java/class.c +++ b/gcc/java/class.c @@ -351,7 +351,7 @@ push_class (class_type, class_name) signature = identifier_subst (class_name, "L", '.', '/', ";"); IDENTIFIER_SIGNATURE_TYPE (signature) = build_pointer_type (class_type); - /* Setting DECL_ARTIFICAL forces dbxout.c to specific the type is + /* Setting DECL_ARTIFICIAL forces dbxout.c to specific the type is both a typedef and in the struct name-space. We may want to re-visit this later, but for now it reduces the changes needed for gdb. */ DECL_ARTIFICIAL (decl) = 1; @@ -786,7 +786,7 @@ set_constant_value (field, constant) if (field == NULL_TREE) warning ("misplaced ConstantValue attribute (not in any field)"); else if (DECL_INITIAL (field) != NULL_TREE) - warning ("duplicate ConstanValue atribute for field '%s'", + warning ("duplicate ConstantValue attribute for field '%s'", IDENTIFIER_POINTER (DECL_NAME (field))); else { diff --git a/gcc/java/expr.c b/gcc/java/expr.c index e5d141ea5e4..53234c17658 100644 --- a/gcc/java/expr.c +++ b/gcc/java/expr.c @@ -2395,7 +2395,7 @@ load_type_state (label) } /* Do the expansion of a Java switch. With Gcc, switches are front-end - dependant things, but they rely on gcc routines. This function is + dependent things, but they rely on gcc routines. This function is placed here because it uses things defined locally in parse.y. */ static tree diff --git a/gcc/java/gcj.texi b/gcc/java/gcj.texi index d9922e0e64e..43d4c936a7a 100644 --- a/gcc/java/gcj.texi +++ b/gcc/java/gcj.texi @@ -278,7 +278,7 @@ The classfile built by @code{gcj} for the class @code{java.lang.Object} attribute @code{gnu.gcj.gcj-compiled}. The compiler looks for this attribute when loading @code{java.lang.Object} and will report an error if it isn't found, unless it compiles to bytecode (the option -@code{-fforce-classes-archive-check} can be used to overide this +@code{-fforce-classes-archive-check} can be used to override this behavior in this particular case.) @table @gcctabopt diff --git a/gcc/java/java-tree.h b/gcc/java/java-tree.h index 17a06382815..649a288b27b 100644 --- a/gcc/java/java-tree.h +++ b/gcc/java/java-tree.h @@ -1263,7 +1263,7 @@ struct rtx_def * java_lang_expand_expr PARAMS ((tree, rtx, enum machine_mode, #define ID_INIT_P(ID) ((ID) == init_identifier_node) /* Match ID to either `$finit$' or `finit$', so that `$finit$' continues to be recognized as an equivalent to `finit$' which is - now the prefered name used for the field initialization special + now the preferred name used for the field initialization special method. */ #define ID_FINIT_P(ID) ((ID) == finit_identifier_node \ || (ID) == finit_leg_identifier_node) @@ -1322,7 +1322,7 @@ extern char *instruction_bits; #define BCODE_JUMP_TARGET 2 /* True iff there is a return to this location. - (I.e. the preceedng instruction was a call.) */ + (I.e. the preceding instruction was a call.) */ #define BCODE_RETURN_TARGET 4 /* True iff this is the start of an exception handler. */ @@ -1417,12 +1417,12 @@ extern tree *type_map; TYPE_LANG_FLAG_5 (TYPE) /* True if class TYPE is currently being laid out. Helps in detection - of inheritance cycle occuring as a side effect of performing the + of inheritance cycle occurring as a side effect of performing the layout of a class. */ #define CLASS_BEING_LAIDOUT(TYPE) TYPE_LANG_FLAG_6 (TYPE) /* True if class TYPE is currently being laid out. Helps in detection - of inheritance cycle occuring as a side effect of performing the + of inheritance cycle occurring as a side effect of performing the layout of a class. */ #define CLASS_BEING_LAIDOUT(TYPE) TYPE_LANG_FLAG_6 (TYPE) diff --git a/gcc/java/jcf-parse.c b/gcc/java/jcf-parse.c index 61d09729727..52de111b0dc 100644 --- a/gcc/java/jcf-parse.c +++ b/gcc/java/jcf-parse.c @@ -1260,7 +1260,7 @@ process_zip_dir (FILE *finput) class_name_in_zip_dir = ZIPDIR_FILENAME (zdir); /* We choose to not to process entries with a zero size or entries - not bearing the .class extention. */ + not bearing the .class extension. */ if (!zdir->size || !zdir->filename_offset || strncmp (&class_name_in_zip_dir[zdir->filename_length-6], ".class", 6)) diff --git a/gcc/java/jcf-write.c b/gcc/java/jcf-write.c index 43622f8b715..c6de1fe9b47 100644 --- a/gcc/java/jcf-write.c +++ b/gcc/java/jcf-write.c @@ -105,7 +105,7 @@ struct chunk to the beginning of the block. If (pc < 0), the jcf_block is not an actual block (i.e. it has no - assocated code yet), but it is an undefined label. + associated code yet), but it is an undefined label. */ struct jcf_block @@ -2671,7 +2671,7 @@ perform_relocations (state) /* new_ptr and old_ptr point into the old and new buffers, respectively. (If no relocations cause the buffer to grow, the buffer will be the same buffer, and new_ptr==old_ptr.) - The bytes at higher adress have been copied and relocations + The bytes at higher address have been copied and relocations handled; those at lower addresses remain to process. */ /* Lower old index of piece to be copied with no relocation. diff --git a/gcc/java/lex.c b/gcc/java/lex.c index 36e3827dea8..adc5951db4b 100644 --- a/gcc/java/lex.c +++ b/gcc/java/lex.c @@ -1657,7 +1657,7 @@ java_lex (java_lval) /* This is called by the parser to see if an error should be generated due to numeric overflow. This function only handles the particular case of the largest negative value, and is only called in the case - where this value is not preceeded by `-'. */ + where this value is not preceded by `-'. */ static void error_if_numeric_overflow (value) tree value; diff --git a/gcc/java/parse.h b/gcc/java/parse.h index ccb18ccada9..1cc4b0b01f5 100644 --- a/gcc/java/parse.h +++ b/gcc/java/parse.h @@ -235,7 +235,7 @@ extern tree stabilize_reference PARAMS ((tree)); } /* Build the string parm$ and store in into the identifier N. This - is used to contruct the name of hidden parameters used to + is used to construct the name of hidden parameters used to initialize outer scope aliases. */ #define MANGLE_ALIAS_INITIALIZER_PARAMETER_NAME_ID(N, O) \ { \ diff --git a/gcc/java/parse.y b/gcc/java/parse.y index 4dae766a695..296563ca9b8 100644 --- a/gcc/java/parse.y +++ b/gcc/java/parse.y @@ -1598,7 +1598,7 @@ switch_statement: switch_block { /* Make into "proper list" of COMPOUND_EXPRs. - I.e. make the last statment also have its own + I.e. make the last statement also have its own COMPOUND_EXPR. */ maybe_absorb_scoping_blocks (); TREE_OPERAND ($1, 1) = exit_block (); @@ -3852,7 +3852,7 @@ create_interface (flags, id, super) if ((flags & ACC_ABSTRACT) && flag_redundant) parse_warning_context (MODIFIER_WFL (ABSTRACT_TK), - "Redundant use of `abstract' modifier. Interface `%s' is implicitely abstract", IDENTIFIER_POINTER (raw_name)); + "Redundant use of `abstract' modifier. Interface `%s' is implicitly abstract", IDENTIFIER_POINTER (raw_name)); /* Create a new decl if DECL is NULL, otherwise fix it */ decl = maybe_create_class_interface_decl (decl, raw_name, q_name, id); @@ -4063,13 +4063,13 @@ static void end_class_declaration (resume) int resume; { - /* If an error occured, context weren't pushed and won't need to be + /* If an error occurred, context weren't pushed and won't need to be popped by a resume. */ - int no_error_occured = ctxp->next && GET_CPC () != error_mark_node; + int no_error_occurred = ctxp->next && GET_CPC () != error_mark_node; java_parser_context_pop_initialized_field (); POP_CPC (); - if (resume && no_error_occured) + if (resume && no_error_occurred) java_parser_context_resume (); /* We're ending a class declaration, this is a good time to reset @@ -5634,7 +5634,7 @@ java_complete_class () tree mdecl = JDEP_DECL (dep), signature; /* Recompute and reset the signature, check first that all types are now defined. If they're not, - dont build the signature. */ + don't build the signature. */ if (check_method_types_complete (mdecl)) { signature = build_java_signature (TREE_TYPE (mdecl)); @@ -6257,7 +6257,7 @@ java_check_methods (class_decl) } /* Check all the methods of CLASS_DECL. Methods are first completed - then checked according to regular method existance rules. If no + then checked according to regular method existence rules. If no constructor for CLASS_DECL were encountered, then build its declaration. */ @@ -6874,7 +6874,7 @@ read_import_dir (wfl) } /* Possibly find a type in the import on demands specified - types. Returns 1 if an error occured, 0 otherwise. Run throught the + types. Returns 1 if an error occurred, 0 otherwise. Run through the entire list, to detected potential double definitions. */ static int @@ -7374,7 +7374,7 @@ create_artificial_method (class, flags, type, name, args) return mdecl; } -/* Starts the body if an artifical method. */ +/* Starts the body if an artificial method. */ static void start_artificial_method_body (mdecl) @@ -9239,7 +9239,7 @@ static_ref_err (wfl, field_id, class_type) IDENTIFIER_POINTER (DECL_NAME (TYPE_NAME (class_type)))); } -/* 15.10.1 Field Acess Using a Primary and/or Expression Name. +/* 15.10.1 Field Access Using a Primary and/or Expression Name. We return something suitable to generate the field access. We also return the field decl in FIELD_DECL and its type in FIELD_TYPE. If recipient's address can be null. */ @@ -9536,7 +9536,7 @@ resolve_qualified_expression_name (wfl, found_decl, where_found, type_found) parse_error_context (wfl, "Can't reference `this' before the superclass constructor has been called"); return 1; } - /* We have to generate code for intermediate acess */ + /* We have to generate code for intermediate access */ if (!from_type || TREE_TYPE (TREE_TYPE (current_this)) == type) { *where_found = decl = current_this; @@ -9914,7 +9914,7 @@ not_accessible_p (reference, member, where, from_super) if (where && !inherits_from_p (reference, where)) return 1; - /* Otherwise, access is granted if occuring from the class where + /* Otherwise, access is granted if occurring from the class where member is declared or a subclass of it. Find the right context to perform the check */ if (PURE_INNER_CLASS_TYPE_P (reference)) @@ -9943,7 +9943,7 @@ not_accessible_p (reference, member, where, from_super) return 1; } - /* Default access are permitted only when occuring within the + /* Default access are permitted only when occurring within the package in which the type (REFERENCE) is declared. In other words, REFERENCE is defined in the current package */ if (ctxp->package) @@ -12274,7 +12274,7 @@ build_expr_block (body, decls) return node; } -/* Create a new function block and link it approriately to current +/* Create a new function block and link it appropriately to current function block chain */ static tree @@ -12535,7 +12535,7 @@ patch_assignment (node, wfl_op1) { lhs_type = TREE_TYPE (lvalue); } - /* Or Lhs can be a array acccess. Should that be lvalue ? FIXME + + /* Or Lhs can be a array access. Should that be lvalue ? FIXME + comment on reason why */ else if (TREE_CODE (wfl_op1) == ARRAY_REF) { @@ -13342,7 +13342,7 @@ patch_binop (node, wfl_op1, wfl_op2) } /* Unary numeric promotion (5.6.1) is performed on each operand - separatly */ + separately */ op1 = do_unary_numeric_promotion (op1); op2 = do_unary_numeric_promotion (op2); @@ -14813,7 +14813,7 @@ build_new_loop (loop_body) COMPOUND_EXPR (loop main body) EXIT_EXPR (this order is for while/for loops. LABELED_BLOCK_EXPR the order is reversed for do loops) - LABEL_DECL (a continue occuring here branches at the + LABEL_DECL (a continue occurring here branches at the BODY end of this labeled block) INCREMENT (if any) @@ -15449,7 +15449,7 @@ patch_throw_statement (node, wfl_op1) SET_WFL_OPERATOR (wfl_operator, node, wfl_op1); /* An instance can't throw a checked exception unless that exception - is explicitely declared in the `throws' clause of each + is explicitly declared in the `throws' clause of each constructor. This doesn't apply to anonymous classes, since they don't have declared constructors. */ if (!unchecked_ok diff --git a/gcc/java/verify.c b/gcc/java/verify.c index 6a03b865e71..f5542489b11 100644 --- a/gcc/java/verify.c +++ b/gcc/java/verify.c @@ -66,7 +66,7 @@ push_pending_label (target_label) /* Note that TARGET_LABEL is a possible successor instruction. Merge the type state etc. - Return NULL on sucess, or an error message on failure. */ + Return NULL on success, or an error message on failure. */ static const char * check_pending_block (target_label) @@ -414,7 +414,7 @@ pop_argument_types (arg_types) #define BCODE byte_ops /* Verify the bytecodes of the current method. - Return 1 on sucess, 0 on failure. */ + Return 1 on success, 0 on failure. */ int verify_jvm_instructions (jcf, byte_ops, length) JCF* jcf; -- 2.30.2