diff options
| author | Nathan Sidwell <nathan@codesourcery.com> | 2003-05-03 16:39:50 +0000 |
|---|---|---|
| committer | Nathan Sidwell <nathan@gcc.gnu.org> | 2003-05-03 16:39:50 +0000 |
| commit | 31423e30eeeb688c09434451706da181ad17ac2b (patch) | |
| tree | 0d5819f6b3ce73d7fa9752f37cbda68842d32200 /gcc/f/com.c | |
| parent | 5a43f8c419e41730a6d6cf824395f1de2fa9dd9e (diff) | |
| download | gcc-31423e30eeeb688c09434451706da181ad17ac2b.tar.gz | |
com.c (ffecom_do_entry_): Use location_t and input_location directly.
* com.c (ffecom_do_entry_): Use location_t and input_location
directly.
(ffecom_gen_sfuncdef_): Likewise.
(ffecom_start_progunit_): Likewise.
(ffecom_sym_transform_): Likewise.
(ffecom_sym_transform_assign_): Likewise.
* lex.c (ffelex_hash_): Likewise.
(ffelex_include_): Likewise.
* std.c (ffestd_exec_begin): Likewise.
(ffestd_exec_end): Likewise.
* ste.c (struct gbe_block): Likewise.
(ffeste_start_block_): Likewise.
(ffeste_start_stmt_): Likewise.
From-SVN: r66432
Diffstat (limited to 'gcc/f/com.c')
| -rw-r--r-- | gcc/f/com.c | 37 |
1 files changed, 14 insertions, 23 deletions
diff --git a/gcc/f/com.c b/gcc/f/com.c index a84f8076032..36658f2ce72 100644 --- a/gcc/f/com.c +++ b/gcc/f/com.c @@ -2582,9 +2582,9 @@ ffecom_do_entry_ (ffesymbol fn, int entrynum) CHARACTER. */ bool cmplxfunc; /* Use f2c way of returning COMPLEX. */ bool multi; /* Master fn has multiple return types. */ - bool altreturning = FALSE; /* This entry point has alternate returns. */ - int old_lineno = input_line; - const char *old_input_filename = input_filename; + bool altreturning = FALSE; /* This entry point has alternate + returns. */ + location_t old_loc = input_location; input_filename = ffesymbol_where_filename (fn); input_line = ffesymbol_where_filelinenum (fn); @@ -2917,9 +2917,8 @@ ffecom_do_entry_ (ffesymbol fn, int entrynum) finish_function (0); - input_line = old_lineno; - input_filename = old_input_filename; - + input_location = old_loc; + ffecom_doing_entry_ = FALSE; } @@ -6110,8 +6109,7 @@ ffecom_gen_sfuncdef_ (ffesymbol s, ffeinfoBasictype bt, ffeinfoKindtype kt) tree result; bool charfunc = (bt == FFEINFO_basictypeCHARACTER); static bool recurse = FALSE; - int old_lineno = input_line; - const char *old_input_filename = input_filename; + location_t old_loc = input_location; ffecom_nested_entry_ = s; @@ -6221,8 +6219,7 @@ ffecom_gen_sfuncdef_ (ffesymbol s, ffeinfoBasictype bt, ffeinfoKindtype kt) recurse = FALSE; - input_line = old_lineno; - input_filename = old_input_filename; + input_location = old_loc; ffecom_nested_entry_ = NULL; @@ -7080,8 +7077,7 @@ ffecom_start_progunit_ () && (ffecom_primary_entry_kind_ == FFEINFO_kindFUNCTION) && (ffecom_master_bt_ == FFEINFO_basictypeNONE); bool main_program = FALSE; - int old_lineno = input_line; - const char *old_input_filename = input_filename; + location_t old_loc = input_location; assert (fn != NULL); assert (ffesymbol_hook (fn).decl_tree == NULL_TREE); @@ -7269,8 +7265,7 @@ ffecom_start_progunit_ () /* Disallow temp vars at this level. */ current_binding_level->prep_state = 2; - input_line = old_lineno; - input_filename = old_input_filename; + input_location = old_loc; /* This handles any symbols still untransformed, in case -g specified. This used to be done in ffecom_finish_progunit, but it turns out to @@ -7298,9 +7293,8 @@ ffecom_sym_transform_ (ffesymbol s) ffeinfoBasictype bt; ffeinfoKindtype kt; ffeglobal g; - int old_lineno = input_line; - const char *old_input_filename = input_filename; - + location_t old_loc = input_location; + /* Must ensure special ASSIGN variables are declared at top of outermost block, else they'll end up in the innermost block when their first ASSIGN is seen, which leaves them out of scope when they're the @@ -8294,8 +8288,7 @@ ffecom_sym_transform_ (ffesymbol s) ffesymbol_hook (s).length_tree = tlen; ffesymbol_hook (s).addr = addr; - input_line = old_lineno; - input_filename = old_input_filename; + input_location = old_loc; return s; } @@ -8312,8 +8305,7 @@ static ffesymbol ffecom_sym_transform_assign_ (ffesymbol s) { tree t; /* Transformed thingy. */ - int old_lineno = input_line; - const char *old_input_filename = input_filename; + location_t old_loc = input_location; if (ffesymbol_sfdummyparent (s) == NULL) { @@ -8375,8 +8367,7 @@ ffecom_sym_transform_assign_ (ffesymbol s) ffesymbol_hook (s).assign_tree = t; - input_line = old_lineno; - input_filename = old_input_filename; + input_location = old_loc; return s; } |