Mercurial > hg > octave-lyh
changeset 339:94f0f219a946
[project @ 1994-02-07 07:26:24 by jwe]
author | jwe |
---|---|
date | Mon, 07 Feb 1994 07:29:19 +0000 |
parents | 82d30a23c979 |
children | 57cdcf21c1df |
files | src/input.cc src/input.h src/tree.h.old src/utils.h src/variables.cc |
diffstat | 5 files changed, 18 insertions(+), 18 deletions(-) [+] |
line wrap: on
line diff
--- a/src/input.cc +++ b/src/input.cc @@ -103,7 +103,7 @@ int reading_script_file = 0; // If we are reading from an M-file, this is it. -FILE *mf_instream = (FILE *) NULL; +FILE *ff_instream = (FILE *) NULL; // Nonzero means we are using readline. int using_readline = 1; @@ -224,7 +224,7 @@ { FILE *curr_stream = rl_instream; if (reading_fcn_file || reading_script_file) - curr_stream = mf_instream; + curr_stream = ff_instream; assert (curr_stream != (FILE *) NULL); @@ -283,7 +283,7 @@ warning ("%s: no such file or directory", name); if (reading_fcn_file || reading_script_file) - mf_instream = instream; + ff_instream = instream; else rl_instream = instream;
--- a/src/input.h +++ b/src/input.h @@ -49,7 +49,7 @@ extern int reading_script_file; // If we are reading from an M-file, this is it. -extern FILE *mf_instream; +extern FILE *ff_instream; // Nonzero means we are using readline. extern int using_readline;
--- a/src/tree.h.old +++ b/src/tree.h.old @@ -194,8 +194,8 @@ void bump_value (tree::expression_type); int parse_fcn_file (int exec_script = 1); - int parse_fcn_file (char *mf, int exec_script = 1); - void parse_fcn_file (FILE *mfile, char *mf); + int parse_fcn_file (char *ff, int exec_script = 1); + void parse_fcn_file (FILE *ffile, char *ff); tree *do_lookup (int& script_file_executed);
--- a/src/utils.h +++ b/src/utils.h @@ -79,8 +79,8 @@ extern int keyword_almost_match (const char **std, int *min_len, const char *s, int min_toks_to_match, int max_toks); -extern char **get_fcn_file_names (int& mfl_len, const char *dir, int no_suffix); -extern char **get_fcn_file_names (int& mfl_len, int no_suffix); +extern char **get_fcn_file_names (int& ffl_len, const char *dir, int no_suffix); +extern char **get_fcn_file_names (int& ffl_len, int no_suffix); extern int NINT (double x); extern double D_NINT (double x); extern void delete_ppchar (char **);
--- a/src/variables.cc +++ b/src/variables.cc @@ -82,12 +82,12 @@ tree *ans = sr->def (); if (ans != NULL_TREE) { - char *mf = ans->fcn_file_name (); - if (! (mf == (char *) NULL + char *ff = ans->fcn_file_name (); + if (! (ff == (char *) NULL || (ignore && ans->is_system_fcn_file ()))) { time_t tp = ans->time_parsed (); - char *fname = fcn_file_in_path (mf); + char *fname = fcn_file_in_path (ff); int status = is_newer (fname, tp); delete [] fname; if (status > 0) @@ -698,13 +698,13 @@ int glb_len = 0; int top_len = 0; int lcl_len = 0; - int mfl_len = 0; + int ffl_len = 0; char **key = (char **) NULL; char **glb = (char **) NULL; char **top = (char **) NULL; char **lcl = (char **) NULL; - char **mfl = (char **) NULL; + char **ffl = (char **) NULL; // Each of these functions returns a new vector of pointers to new // strings. @@ -714,9 +714,9 @@ top = top_level_sym_tab->list (top_len); if (top_level_sym_tab != curr_sym_tab) lcl = curr_sym_tab->list (lcl_len); - mfl = get_fcn_file_names (mfl_len, 1); + ffl = get_fcn_file_names (ffl_len, 1); - int total_len = key_len + glb_len + top_len + lcl_len + mfl_len; + int total_len = key_len + glb_len + top_len + lcl_len + ffl_len; char **list = new char * [total_len+1]; @@ -738,8 +738,8 @@ for (i = 0; i < lcl_len; i++) list[j++] = lcl[i]; - for (i = 0; i < mfl_len; i++) - list[j++] = mfl[i]; + for (i = 0; i < ffl_len; i++) + list[j++] = ffl[i]; list[j] = (char *) NULL; @@ -747,7 +747,7 @@ delete [] glb; delete [] top; delete [] lcl; - delete [] mfl; + delete [] ffl; return list; }