octave-nkf: src/oct-stream.cc comparison

[project @ 2008-01-07 18:54:45 by jwe]

comparison

equal deleted inserted replaced

-:8470a6b0b769
+:fab9bc33b949
 #include "lo-utils.h"
 #include "str-vec.h"
 #include "quit.h"
 #include "error.h"
+#include "gripes.h"
 #include "input.h"
 #include "oct-stdstrm.h"
 #include "oct-stream.h"
 #include "oct-obj.h"
 #include "utils.h"
 {
 public:
 enum state { ok, conversion_error };
-printf_value_cache (const octave_value_list& args)
+printf_value_cache (const octave_value_list& args, const std::string& who)
 : values (args), val_idx (0), elt_idx (0),
 n_vals (values.length ()), n_elts (0), data (0),
-curr_state (ok) { }
+curr_state (ok)
+{
+for (octave_idx_type i = 0; i < values.length (); i++)
+{
+	octave_value val = values(i);
+	if (val.is_map () || val.is_cell () || val.is_object ()
+	    || val.is_list ())
+	  {
+	    gripe_wrong_type_arg (who, val);
+	    break;
+	  }
+}
+}
 ~printf_value_cache (void) { }
 // Get the current value as a double and advance the internal pointer.
 double double_value (void);
 {
 std::ostream& os = *osp;
 const printf_format_elt *elt = fmt_list.first ();
-printf_value_cache val_cache (args);
+printf_value_cache val_cache (args, who);
+if (error_state)
+	return retval;
 for (;;)
 	{
 	  OCTAVE_QUIT;

Mercurial > octave-nkf