octave-nkf: src/error.cc comparison

comparison src/error.cc @ 3934:31393822395b

[project @ 2002-05-15 19:18:09 by jwe]

author	jwe
date	Wed, 15 May 2002 19:18:09 +0000
parents	c554ad71bafc
children	1ea29376e43e

comparison

equal deleted inserted replaced

-:f9ea3dcf58ee
+:31393822395b
 // TRUE means that Octave will try to enter the debugger when a warning
 // is encountered.
 static bool Vdebug_on_warning;
+// The text of the last warning message.
+static std::string Vlast_warning_message;
+// The warning frequency for Matlab handle graphics backwards
+// compatibility warnings (currently not used).
+static std::string Vwarning_frequency = "once";
+// The current warning state.  Valid values are "on", "off",
+// "backtrace", or "debug".
+static std::string Vwarning_option = "backtrace";
 // Current error state.
 int error_state = 0;
 // Current warning state.
 int warning_state = 0;
 output_buf << std::endl << std::ends;
 char *msg = output_buf.str ();
-octave_diary << msg;
+Vlast_warning_message = msg;
-std::cerr << msg;
 delete [] msg;
+octave_diary << Vlast_warning_message;
+std::cerr << Vlast_warning_message;
 }
 static void
 verror (const char *name, const char *fmt, va_list args)
 {
 }
 void
 warning (const char *fmt, ...)
 {
-va_list args;
+if (Vwarning_option != "off")
-va_start (args, fmt);
+{
-warning_state = 1;
+va_list args;
-vwarning ("warning", fmt, args);
+va_start (args, fmt);
-va_end (args);
+warning_state = 1;
+vwarning ("warning", fmt, args);
-pr_where ("warning");
+va_end (args);
-if ((interactive || forced_interactive)
+if (Vwarning_option == "backtrace")
-&& Vdebug_on_warning && curr_function)
+	pr_where ("warning");
-{
-unwind_protect_bool (Vdebug_on_warning);
+if ((interactive || forced_interactive)
-Vdebug_on_warning = false;
+	  && Vdebug_on_warning && curr_function)
+	{
-do_keyboard (octave_value_list ());
+	  unwind_protect_bool (Vdebug_on_warning);
+	  Vdebug_on_warning = false;
-unwind_protect::run ();
+	  do_keyboard (octave_value_list ());
+	  unwind_protect::run ();
+	}
 }
 }
 void
 error (const char *fmt, ...)
 typedef void (*error_fun)(const char *, ...);
 extern octave_value_list Fsprintf (const octave_value_list&, int);
-static octave_value_list
+static std::string
 handle_message (error_fun f, const char *msg, const octave_value_list& args)
 {
-octave_value_list retval;
+std::string retval;
 std::string tstr;
 int nargin = args.length ();
 if (len > 1)
 	{
 	  char *tmp_msg = strsave (msg);
 	  tmp_msg[len - 1] = '\0';
 	  f ("%s\n", tmp_msg);
+	  retval = tmp_msg;
 	  delete [] tmp_msg;
 	}
 }
 else
-f ("%s", msg);
+{
+f ("%s", msg);
+retval = msg;
+}
 return retval;
 }
 DEFUN (error, args, ,
 error: nargin != 1\n\
 @end group\n\
 @end example\n\
 @end deftypefn")
 {
-return handle_message (error, "unspecified error", args);
+octave_value_list retval;
-}
+handle_message (error, "unspecified error", args);
+return retval;
-DEFUN (warning, args, ,
+}
+static inline octave_value_list
+set_warning_option (const std::string& state,
+		   const std::string& frequency, int nargout)
+{
+octave_value_list retval;
+if (nargout > 1)
+retval(1) = Vwarning_frequency;
+if (nargout > 0)
+retval(0) = Vwarning_option;
+if (! state.empty ())
+Vwarning_option = state;
+if (! frequency.empty ())
+Vwarning_frequency = frequency;
+return retval;
+}
+DEFUN_TEXT (warning, args, nargout,
 "-*- texinfo -*-\n\
 @deftypefn {Built-in Function} {} warning (@var{msg})\n\
 Print a warning message @var{msg} prefixed by the string @samp{warning: }.  \n\
 After printing the warning message, Octave will continue to execute\n\
 commands.  You should use this function when you want to notify the user\n\
 of an unusual condition, but only when it makes sense for your program\n\
 to go on.\n\
 @end deftypefn")
 {
-return handle_message (warning, "unspecified warning", args);
+octave_value_list retval;
+int argc = args.length () + 1;
+string_vector argv = args.make_argv ("warning");
+if (! error_state)
+{
+bool done = false;
+if (argc == 1)
+	{
+	  retval = set_warning_option ("", "", nargout);
+	  done = true;
+	}
+else if (argc == 2)
+	{
+	  std::string arg = argv(1);
+	  if (arg == "on" || arg == "off" || arg == "backtrace")
+	    {
+	      retval = set_warning_option (arg, "", nargout);
+	      done = true;
+	    }
+	  else if (arg == "once" || arg == "always")
+	    {
+	      retval = set_warning_option ("", arg, nargout);
+	      done = true;
+	    }
+	  else if (arg == "debug")
+	    {
+	      bind_builtin_variable ("debug_on_warning", 1.0);
+	      retval = set_warning_option ("", "", nargout);
+	      done = true;
+	    }
+	}
+if (! done)
+	{
+	  std::string curr_msg
+	    = handle_message (warning, "unspecified warning", args);
+	  if (nargout > 0)
+	    retval(0) = Vlast_warning_message;
+	  Vlast_warning_message = curr_msg;
+	}
+}
+return retval;
+}
+DEFUN (lastwarn, args, ,
+"-*- texinfo -*-\n\
+@deftypefn {Built-in Function} {} lastwarn ()\n\
+@deftypefnx {Built-in Function} {} lastwarn (@var{msg})\n\
+Without any arguments, return the last error message.  With one\n\
+argument, set the last warning message to @var{msg}.\n\
+@end deftypefn")
+{
+octave_value_list retval;
+int argc = args.length () + 1;
+string_vector argv = args.make_argv ("lastwarn");
+if (argc == 1)
+retval(0) = Vlast_warning_message;
+else if (argc == 2)
+Vlast_warning_message = argv(1);
+else
+print_usage ("lastwarn");
+return retval;
 }
 DEFUN (usage, args, ,
 "-*- texinfo -*-\n\
 @deftypefn {Built-in Function} {} usage (@var{msg})\n\
 \n\
 @noindent\n\
 to check for the proper number of arguments.\n\
 @end deftypefn")
 {
-return handle_message (usage, "unknown", args);
+octave_value_list retval;
+handle_message (usage, "unknown", args);
+return retval;
 }
 void
 bind_global_error_variable (void)
 {

Mercurial > hg > octave-nkf

comparison src/error.cc @ 3934:31393822395b