octave-lyh: src/variables.cc comparison

comparison src/variables.cc @ 8131:10b63c4fd413

Add -file option to who/whos

author	David Bateman <dbateman@free.fr>
date	Tue, 23 Sep 2008 11:31:45 -0400
parents	16ab78b816bc
children	b93ac0586e4b

comparison

equal deleted inserted replaced

-:de8b07e95d1b
+:10b63c4fd413
 };
 static octave_value
 do_who (int argc, const string_vector& argv, bool return_list,
-	bool verbose = false)
+	bool verbose = false, std::string msg = std::string ())
 {
 octave_value retval;
 std::string my_name = argv[0];
 int i;
 for (i = 1; i < argc; i++)
 {
 if (argv[i] == "-file")
-	error ("%s: `-file' option not implemented", my_name.c_str ());
+	{
+	  // FIXME. This is an inefficient manner to implement this as the
+	  // variables are loaded in to a temporary context and then treated.
+	  // It would be better to refecat symbol_info_list to not store the
+	  // symbol records and then use it in load-save.cc (do_load) to
+	  // implement this option there so that the variables are never
+	  // stored at all.
+	  if (i == argc - 1)
+	    error ("whos: -file argument must be followed by a file name");
+	  else
+	    {
+	      std::string nm = argv [i + 1];
+	      symbol_table::scope_id tmp_scope = symbol_table::alloc_scope ();
+	      unwind_protect::begin_frame ("do_who_file");
+	      symbol_table::push_scope (tmp_scope);
+	      symbol_table::push_context ();
+	      octave_call_stack::push (0);
+	      unwind_protect::add (octave_call_stack::unwind_pop, 0);
+	      unwind_protect::add (symbol_table::clear_variables);
+	      feval ("load", octave_value (nm), 0);
+	      if (! error_state)
+		{
+		  std::string newmsg = std::string ("Variables in the file ") +
+		    nm + ":\n\n";
+		  retval =  do_who (i, argv, return_list, verbose, newmsg);
+		}
+	      unwind_protect::run_frame ("do_who_file");
+	      symbol_table::erase_scope (tmp_scope);
+	    }
+	  return retval;
+	}
 else if (argv[i] == "-regexp")
 	have_regexp = true;
 else if (argv[i] == "global")
 	global_only = true;
 else if (argv[i][0] == '-')
 else
 	retval = Cell (string_vector (symbol_names));
 }
 else if (! (symbol_stats.empty () && symbol_names.empty ()))
 {
-if (global_only)
+if (msg.length () == 0)
-	octave_stdout << "Global variables:\n\n";
+	if (global_only)
-else
+	  octave_stdout << "Global variables:\n\n";
-	octave_stdout << "Variables in the current scope:\n\n";
+	else
+	  octave_stdout << "Variables in the current scope:\n\n";
+else
+	octave_stdout << msg;
 if (verbose)
 	symbol_stats.display (octave_stdout);
 else
 	{
 List the variables in the global scope rather than the current scope.\n\
 @item -regexp\n\
 The patterns are considered as regular expressions and will be used\n\
 for matching the variables to display. The same pattern syntax as for\n\
 the @code{regexp} function is used.\n\
+@item -file\n\
+The following argument is treated as a filename, and the variables that\n\
+are found within this file are listed.\n\
 @end table\n\
 \n\
 Valid patterns are the same as described for the @code{clear} command\n\
 above.  If no patterns are supplied, all symbols from the given category\n\
 are listed.  By default, only user defined functions and variables\n\

Mercurial > hg > octave-lyh

comparison src/variables.cc @ 8131:10b63c4fd413