octave-nkf: src/variables.cc comparison

comparison src/variables.cc @ 1271:ffecaa9b9892

[project @ 1995-04-20 20:23:21 by jwe]

author	jwe
date	Thu, 20 Apr 1995 20:23:21 +0000
parents	8c3727b6d185
children	db4f4009d6e8

comparison

equal deleted inserted replaced

-:0a5e9e8892a0
+:ffecaa9b9892
 char *p1 = s;
 char *p2 = p1;
 char *pdest = retval;
 // Is this really a good way to do this?
 while (count >= 0)
 	{
 	  p2 = strstr (p1, prefix);
 FILE *ffile = get_input_from_file (ff, 0);
 if (ffile)
 {
-// Check to see if this file defines a function or is just a list of
+// Check to see if this file defines a function or is just a
-// commands.
+// list of commands.
 char *tmp_help_txt = gobble_leading_white_space (ffile);
 if (is_function_file (ffile))
 	{
 	      global_sym_tab->clear (curr_fcn_file_name);
 	    }
 	}
 else if (exec_script)
 	{
-// The value of `reading_fcn_file' will be restored to the proper value
+	  // We don't need this now.
-// when we unwind from this frame.
+	  delete [] tmp_help_txt;
+	  // The value of `reading_fcn_file' will be restored to the
+	  // proper value when we unwind from this frame.
 	  reading_fcn_file = old_reading_fcn_file_state;
 	  unwind_protect_int (reading_script_file);
 	  reading_script_file = 1;
 {
 int script_file_executed = 0;
 char *nm = sym_rec->name ();
 // This is needed by yyparse.
 curr_fcn_file_name = nm;
 #ifdef WITH_DLD
 }
 int
 lookup (symbol_record *sym_rec, int exec_script)
 {
-int script_file_executed = 0;
+int script_executed = 0;
 if (! sym_rec->is_linked_to_global ())
 {
 if (sym_rec->is_defined ())
 	{
 	  if (sym_rec->is_function () && symbol_out_of_date (sym_rec))
-	    script_file_executed = load_fcn_from_file (sym_rec, exec_script);
+	    script_executed = load_fcn_from_file (sym_rec, exec_script);
 	}
 else if (! sym_rec->is_formal_parameter ())
 	{
 	  link_to_builtin_or_function (sym_rec);
 	  if (! sym_rec->is_defined ())
-	    script_file_executed = load_fcn_from_file (sym_rec, exec_script);
+	    script_executed = load_fcn_from_file (sym_rec, exec_script);
 	  else if (sym_rec->is_function () && symbol_out_of_date (sym_rec))
-	    script_file_executed = load_fcn_from_file (sym_rec, exec_script);
+	    script_executed = load_fcn_from_file (sym_rec, exec_script);
 	}
 }
-return script_file_executed;
+return script_executed;
 }
 // Get the symbol record for the given name that is visible in the
 // current scope.  Reread any function definitions that appear to be
 // out of date.  If a function is available in a file but is not
 char *
 builtin_string_variable (const char *name)
 {
 symbol_record *sr = global_sym_tab->lookup (name, 0, 0);
 // It is a prorgramming error to look for builtins that aren't.
 assert (sr);
 char *retval = 0;
 builtin_real_scalar_variable (const char *name, double& d)
 {
 int status = -1;
 symbol_record *sr = global_sym_tab->lookup (name, 0, 0);
 // It is a prorgramming error to look for builtins that aren't.
 assert (sr);
 tree_fvc *defn = sr->def ();
 {
 tree_constant retval;
 symbol_record *sr = global_sym_tab->lookup (name, 0, 0);
 // It is a prorgramming error to look for builtins that aren't.
 assert (sr);
 tree_fvc *defn = sr->def ();
 {
 error ("can't make function parameter `%s' global", sr->name ());
 return;
 }
 // There must be a better way to do this.   XXX FIXME XXX
 if (sr->is_variable ())
 {
 // Would be nice not to have this cast.  XXX FIXME XXX
 tree_constant *tmp = (tree_constant *) sr->def ();
 if (tmp)
 	tmp = new tree_constant (*tmp);
 else
 	tmp = new tree_constant ();
 gsr->define (tmp);
 }
 else
 sr->clear ();
-// If the global symbol is currently defined as a function, we need to
+// If the global symbol is currently defined as a function, we need
-// hide it with a variable.
+// to hide it with a variable.
 if (gsr->is_function ())
 gsr->define ((tree_constant *) 0);
 sr->alias (gsr, 1);
 char **glb = 0;
 char **top = 0;
 char **lcl = 0;
 char **ffl = 0;
 // Each of these functions returns a new vector of pointers to new
 // strings.
 key = names (keyword_help (), key_len);
 glb = global_sym_tab->list (glb_len);
 top = top_level_sym_tab->list (top_len);
 if (top_level_sym_tab != curr_sym_tab)
 int total_len = key_len + glb_len + top_len + lcl_len + ffl_len;
 char **list = new char * [total_len+1];
 // Put all the symbols in one big list.  Only copy pointers, not the
 // strings they point to, then only delete the original array of
 // pointers, and not the strings they point to.
 int j = 0;
 int i = 0;
 for (i = 0; i < key_len; i++)
 list[j++] = key[i];
 	warning ("%s: unrecognized option `%s'", my_name, *argv);
 else
 	break;
 }
 // If the user specified -l and nothing else, show variables.  If
 // evaluating this at the top level, also show functions.
 if (show_verbose && ! (show_builtins || show_functions || show_variables))
 {
 show_functions = (curr_sym_tab == top_level_sym_tab);
 show_variables = 1;
 		       int protect, int eternal, sv_Function sv_fcn,
 		       const char *help)
 {
 symbol_record *sr = global_sym_tab->lookup (varname, 1, 0);
 // It is a programming error for a builtin symbol to be missing.
 // Besides, we just inserted it, so it must be there.
 assert (sr);
 sr->unprotect ();
 // Must do this before define, since define will call the special
 // variable function only if it knows about it, and it needs to, so
 // that user prefs can be properly initialized.
 if (sv_fcn)
 sr->set_sv_function (sv_fcn);
 sr->define_builtin_var (val);
 }
 void
 install_builtin_variables (void)
 {
 // XXX FIXME XX -- these should probably be moved to where they
 // logically belong instead of being all grouped here.
 DEFVAR ("EDITOR", SBV_EDITOR, editor, 0, 0, 1, sv_editor,
 "name of the editor to be invoked by the edit_history command");
 DEFVAR ("I", SBV_I, Complex (0.0, 1.0), 0, 1, 1, 0,
 DEFINE_ARGV("clear");
 argc--;
 argv++;
 // Always clear the local table, but don't clear currently compiled
-// functions unless we are at the top level.  (Allowing that to happen
+// functions unless we are at the top level.  (Allowing that to
-// inside functions would result in pretty odd behavior...)
+// happen inside functions would result in pretty odd behavior...)
 int clear_user_functions = (curr_sym_tab == top_level_sym_tab);
 if (argc == 0)
 {

Mercurial > octave-nkf

comparison src/variables.cc @ 1271:ffecaa9b9892