From 13795658b50234d99cf2b671214000131b132952 Mon Sep 17 00:00:00 2001 From: Kazu Hirata Date: Tue, 14 Sep 2004 12:37:28 +0000 Subject: [PATCH] data.c, [...]: Fix comment typos. * data.c, decl.c, f95-lang.c, gfortran.h, match.c, trans-array.c, trans-common.c, trans-expr.c, trans-intrinsic.c, trans-stmt.c, trans-types.c, trans.h: Fix comment typos. Follow spelling conventions. From-SVN: r87492 --- gcc/fortran/ChangeLog | 7 +++++++ gcc/fortran/data.c | 2 +- gcc/fortran/decl.c | 2 +- gcc/fortran/f95-lang.c | 2 +- gcc/fortran/gfortran.h | 2 +- gcc/fortran/match.c | 2 +- gcc/fortran/trans-array.c | 6 +++--- gcc/fortran/trans-common.c | 2 +- gcc/fortran/trans-expr.c | 4 ++-- gcc/fortran/trans-intrinsic.c | 2 +- gcc/fortran/trans-stmt.c | 6 +++--- gcc/fortran/trans-types.c | 2 +- gcc/fortran/trans.h | 2 +- 13 files changed, 24 insertions(+), 17 deletions(-) diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 092cfe2ee04..1df48e16749 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,10 @@ +2004-09-14 Kazu Hirata + + * data.c, decl.c, f95-lang.c, gfortran.h, match.c, + trans-array.c, trans-common.c, trans-expr.c, + trans-intrinsic.c, trans-stmt.c, trans-types.c, trans.h: Fix + comment typos. Follow spelling conventions. + 2004-09-09 Paul Brook * scanner.c (get_file): Add ATTRIBUTE_UNUSED. diff --git a/gcc/fortran/data.c b/gcc/fortran/data.c index ceb6f318667..56479718d41 100644 --- a/gcc/fortran/data.c +++ b/gcc/fortran/data.c @@ -329,7 +329,7 @@ gfc_assign_data_value (gfc_expr * lvalue, gfc_expr * rvalue, mpz_t index) last_con->expr = expr; } -/* Similarly, but initialize REPEAT consectutive values in LVALUE the same +/* Similarly, but initialize REPEAT consecutive values in LVALUE the same value in RVALUE. For the nonce, LVALUE must refer to a full array, not an array section. */ diff --git a/gcc/fortran/decl.c b/gcc/fortran/decl.c index a3aa28b06df..cc948b13d8e 100644 --- a/gcc/fortran/decl.c +++ b/gcc/fortran/decl.c @@ -399,7 +399,7 @@ match_old_style_init (const char *name) } /* Match the stuff following a DATA statement. If ERROR_FLAG is set, - we are matching a DATA stement and are therefore issuing an error + we are matching a DATA statement and are therefore issuing an error if we encounter something unexpected, if not, we're trying to match an old-style intialization expression of the form INTEGER I /2/. */ diff --git a/gcc/fortran/f95-lang.c b/gcc/fortran/f95-lang.c index 69b22dfc2e7..107fb753f4c 100644 --- a/gcc/fortran/f95-lang.c +++ b/gcc/fortran/f95-lang.c @@ -354,7 +354,7 @@ static GTY(()) struct binding_level *global_binding_level; /* Binding level structures are initialized by copying this one. */ static struct binding_level clear_binding_level = { NULL, NULL, NULL }; -/* Return non-zero if we are currently in the global binding level. */ +/* Return nonzero if we are currently in the global binding level. */ int global_bindings_p (void) diff --git a/gcc/fortran/gfortran.h b/gcc/fortran/gfortran.h index 0e152526395..f33e79bac1b 100644 --- a/gcc/fortran/gfortran.h +++ b/gcc/fortran/gfortran.h @@ -974,7 +974,7 @@ typedef union gfc_simplify_f; /* Again like gfc_check_f, these specify the type of the resolution - function associated with an intrinsic. The fX are juse like in + function associated with an intrinsic. The fX are just like in gfc_check_f. f1m is used for MIN and MAX, s1 is used for abort(). */ diff --git a/gcc/fortran/match.c b/gcc/fortran/match.c index f9628e8164f..b468c8e4be6 100644 --- a/gcc/fortran/match.c +++ b/gcc/fortran/match.c @@ -2102,7 +2102,7 @@ cleanup: /* Given a name, return a pointer to the common head structure, - creating it if it does not exist. If FROM_MODULE is non-zero, we + creating it if it does not exist. If FROM_MODULE is nonzero, we mangle the name so that it doesn't interfere with commons defined in the using namespace. TODO: Add to global symbol tree. */ diff --git a/gcc/fortran/trans-array.c b/gcc/fortran/trans-array.c index a8e6dcfeefd..582bb338dc3 100644 --- a/gcc/fortran/trans-array.c +++ b/gcc/fortran/trans-array.c @@ -2245,7 +2245,7 @@ gfc_conv_ss_startstride (gfc_loopinfo * loop) } -/* Return true if the two SS could be aliased, ie. both point to the same data +/* Return true if the two SS could be aliased, i.e. both point to the same data object. */ /* TODO: resolve aliases based on frontend expressions. */ @@ -3060,7 +3060,7 @@ gfc_trans_auto_array_allocation (tree decl, gfc_symbol * sym, tree fnbody) gfc_trans_init_string_length (sym->ts.cl, &block); /* Emit a DECL_EXPR for this variable, which will cause the - gimplifier to allocate stoage, and all that good stuff. */ + gimplifier to allocate storage, and all that good stuff. */ tmp = build1 (DECL_EXPR, TREE_TYPE (decl), decl); gfc_add_expr_to_block (&block, tmp); } @@ -3572,7 +3572,7 @@ gfc_conv_expr_descriptor (gfc_se * se, gfc_expr * expr, gfc_ss * ss) /* A transformational function return value will be a temporary array descriptor. We still need to go through the scalarizer to create the descriptor. Elemental functions ar handled as - arbitary expressions, ie. copy to a temporary. */ + arbitary expressions, i.e. copy to a temporary. */ secss = ss; /* Look for the SS for this function. */ while (secss != gfc_ss_terminator diff --git a/gcc/fortran/trans-common.c b/gcc/fortran/trans-common.c index f692f3eee22..3f83d2e9d26 100644 --- a/gcc/fortran/trans-common.c +++ b/gcc/fortran/trans-common.c @@ -136,7 +136,7 @@ get_segment_info (gfc_symbol * sym, HOST_WIDE_INT offset) /* Create the segment_info and fill it in. */ s = (segment_info *) gfc_getmem (sizeof (segment_info)); s->sym = sym; - /* We will use this type when building the segment aggreagate type. */ + /* We will use this type when building the segment aggregate type. */ s->field = gfc_sym_type (sym); s->length = int_size_in_bytes (s->field); s->offset = offset; diff --git a/gcc/fortran/trans-expr.c b/gcc/fortran/trans-expr.c index 52d6969c4f6..358d4532233 100644 --- a/gcc/fortran/trans-expr.c +++ b/gcc/fortran/trans-expr.c @@ -1581,7 +1581,7 @@ gfc_trans_subcomponent_assign (tree dest, gfc_component * cm, gfc_expr * expr) } else if (expr->ts.type == BT_DERIVED) { - /* Nested dervived type. */ + /* Nested derived type. */ tmp = gfc_trans_structure_assign (dest, expr); gfc_add_expr_to_block (&block, tmp); } @@ -1603,7 +1603,7 @@ gfc_trans_subcomponent_assign (tree dest, gfc_component * cm, gfc_expr * expr) return gfc_finish_block (&block); } -/* Assign a derived type contructor to a variable. */ +/* Assign a derived type constructor to a variable. */ static tree gfc_trans_structure_assign (tree dest, gfc_expr * expr) diff --git a/gcc/fortran/trans-intrinsic.c b/gcc/fortran/trans-intrinsic.c index e986b5c1a0a..18f9ecfc619 100644 --- a/gcc/fortran/trans-intrinsic.c +++ b/gcc/fortran/trans-intrinsic.c @@ -1466,7 +1466,7 @@ gfc_conv_intrinsic_minmaxloc (gfc_se * se, gfc_expr * expr, int op) /* Initialize the position to the first element. If the array has zero size we need to return zero. Otherwise use the first element of the array, in case all elements are equal to the limit. - ie. pos = (ubound >= lbound) ? lbound, lbound - 1; */ + i.e. pos = (ubound >= lbound) ? lbound, lbound - 1; */ tmp = fold (build2 (MINUS_EXPR, gfc_array_index_type, loop.from[0], gfc_index_one_node)); cond = fold (build2 (GE_EXPR, boolean_type_node, diff --git a/gcc/fortran/trans-stmt.c b/gcc/fortran/trans-stmt.c index 7c63c9985e7..2407dcf6a2c 100644 --- a/gcc/fortran/trans-stmt.c +++ b/gcc/fortran/trans-stmt.c @@ -524,7 +524,7 @@ exit_label: TODO: Large loop counts Does not work loop counts which do not fit into a signed integer kind, - ie. Does not work for loop counts > 2^31 for integer(kind=4) variables + i.e. Does not work for loop counts > 2^31 for integer(kind=4) variables We must support the full range. */ tree @@ -1286,9 +1286,9 @@ gfc_trans_forall_loop (forall_info *forall_tmp, int nvar, tree body, int mask_fl /* Generate the body and loops according to MASK_FLAG and NEST_FLAG. - if MASK_FLAG is non-zero, the body is controlled by maskes in forall + if MASK_FLAG is nonzero, the body is controlled by maskes in forall nest, otherwise, the body is not controlled by maskes. - if NEST_FLAG is non-zero, generate loops for nested forall, otherwise, + if NEST_FLAG is nonzero, generate loops for nested forall, otherwise, only generate loops for the current forall level. */ static tree diff --git a/gcc/fortran/trans-types.c b/gcc/fortran/trans-types.c index a33e717ceb9..9dd8fe8a2d9 100644 --- a/gcc/fortran/trans-types.c +++ b/gcc/fortran/trans-types.c @@ -944,7 +944,7 @@ gfc_get_nodesc_array_type (tree etype, gfc_array_spec * as, int packed) mpz_init (delta); /* We don't use build_array_type because this does not include include - lang-specific information (ie. the bounds of the array) when checking + lang-specific information (i.e. the bounds of the array) when checking for duplicates. */ type = make_node (ARRAY_TYPE); diff --git a/gcc/fortran/trans.h b/gcc/fortran/trans.h index 9b7d355fb6e..363589bc98e 100644 --- a/gcc/fortran/trans.h +++ b/gcc/fortran/trans.h @@ -271,7 +271,7 @@ void gfc_conv_string_parameter (gfc_se * se); /* Add an item to the end of TREE_LIST. */ tree gfc_chainon_list (tree, tree); -/* When using the gfc_conv_* make sure you understand what they do, ie. +/* When using the gfc_conv_* make sure you understand what they do, i.e. when a POST chain may be created, and what the retured expression may be used for. Note that character strings have special handling. This should not be a problem as most statements/operations only deal with -- 2.30.2