octave-dspies: src/parse.y comparison

comparison src/parse.y @ 5484:2ff5363a16bd

[project @ 2005-10-06 17:12:12 by jwe]

author	jwe
date	Thu, 06 Oct 2005 17:12:13 +0000
parents	e2f85b298a74
children	61d6cebd243b

comparison

equal deleted inserted replaced

-:d2df058c4319
+:2ff5363a16bd
 #include <cstdio>
 #ifdef YYBYACC
 #include <cstdlib>
 #endif
+#include <map>
 #include "Cell.h"
 #include "Matrix.h"
 #include "cmd-edit.h"
 #include "cmd-hist.h"
 std::stack<symbol_table*> symtab_context;
 // Name of parent function when parsing function files that might
 // contain nested functions.
 std::string parent_function_name;
+// TRUE means we are in the process of autoloading a function.
+static bool autoloading = false;
+// List of autoloads (function -> file mapping).
+static std::map<std::string, std::string> autoload_map;
 // Forward declarations for some functions defined at the bottom of
 // the file.
 // Generic error messages.
 // If input is coming from a file, issue a warning if the name of
 // the file does not match the name of the function stated in the
 // file.  Matlab doesn't provide a diagnostic (it ignores the stated
 // name).
-if (reading_fcn_file)
+if (reading_fcn_file || autoloading)
 {
-if (! lexer_flags.parsing_nested_function
+if (! (lexer_flags.parsing_nested_function || autoloading)
 && curr_fcn_file_name != id_name)
 	{
 	  if (Vwarn_function_name_clash)
 	    warning ("function name `%s' does not agree with function\
 file name `%s'", id_name.c_str (), curr_fcn_file_full_name.c_str ());
 return help_txt;
 }
 std::string
-get_help_from_file (const std::string& path)
+get_help_from_file (const std::string& nm, bool& symbol_found,
+		    bool include_file_info)
 {
 std::string retval;
-if (! path.empty ())
+std::string file = fcn_file_in_path (nm);
-{
-FILE *fptr = fopen (path.c_str (), "r");
+if (! file.empty ())
+{
+symbol_found = true;
+FILE *fptr = fopen (file.c_str (), "r");
 if (fptr)
 	{
 	  unwind_protect::add (safe_fclose, (void *) fptr);
 	  retval = gobble_leading_white_space (fptr, true, true, false);
+	  if (! retval.empty () && include_file_info)
+	    retval = nm + " is the file: " + file + "\n\n" + retval;
 	  unwind_protect::run ();
 	}
 }
 unwind_protect::run_frame ("parse_fcn_file");
 return script_file_executed;
 }
+std::string
+lookup_autoload (const std::string& nm)
+{
+return
+octave_env::make_absolute (Vload_path_dir_path.find (autoload_map[nm]),
+			       octave_env::getcwd ());
+}
 bool
 load_fcn_from_file (const std::string& nm, bool exec_script)
 {
+unwind_protect::begin_frame ("load_fcn_from_file");
 bool script_file_executed = false;
 string_vector names (2);
 int nm_len = nm.length ();
 {
 file = nm;
 }
 else
 {
-names[0] = nm + ".oct";
+file = lookup_autoload (nm);
-names[1] = nm + ".m";
+if (! file.empty ())
-file
+	{
-	= octave_env::make_absolute (Vload_path_dir_path.find_first_of (names),
+	  unwind_protect_bool (autoloading);
-				     octave_env::getcwd ());
+	  autoloading = true;
+	  exec_script = true;
+	}
+else
+	{
+	  names[0] = nm + ".oct";
+	  names[1] = nm + ".m";
+	  file = octave_env::make_absolute (Vload_path_dir_path.find_first_of (names),
+					    octave_env::getcwd ());
+	}
 }
 int len = file.length ();
 if (len > 4 && file.substr (len-4, len-1) == ".oct")
 }
 else if (len > 2)
 {
 // These are needed by yyparse.
-unwind_protect::begin_frame ("load_fcn_from_file");
 unwind_protect_str (curr_fcn_file_name);
 unwind_protect_str (curr_fcn_file_full_name);
 curr_fcn_file_name = nm;
 curr_fcn_file_full_name = file;
-script_file_executed = parse_fcn_file (file, exec_script);
+script_file_executed = parse_fcn_file (file, exec_script, autoloading);
-if (! (error_state || script_file_executed))
+if (! error_state)
-	force_link_to_function (nm);
+	{
+	  if (autoloading)
-unwind_protect::run_frame ("load_fcn_from_file");
+	    {
-}
+	      script_file_executed = false;
+	      force_link_to_function (nm);
+	    }
+	  else if (! script_file_executed)
+	    force_link_to_function (nm);
+	}
+}
+unwind_protect::run_frame ("load_fcn_from_file");
 return script_file_executed;
 }
 bool
 load_fcn_from_file (symbol_record *sym_rec, bool exec_script)
 {
 return load_fcn_from_file (sym_rec->name (), exec_script);
+}
+DEFCMD (autoload, args, ,
+"-*- texinfo -*-\n\
+@deftypefn {Built-in Function} {} autoload (@var{function}, @var{file})\n\
+Define @var{function} to autoload from @var{file}.\n\
+@end deftypefn")
+{
+octave_value_list retval;
+int nargin = args.length ();
+if (nargin == 2)
+{
+string_vector argv = args.make_argv ("autoload");
+if (! error_state)
+	autoload_map[argv[1]] = argv[2];
+}
+else
+print_usage ("autoload");
+return retval;
 }
 void
 source_file (const std::string file_name)
 {

Mercurial > octave-dspies

comparison src/parse.y @ 5484:2ff5363a16bd