# HG changeset patch # User Rik # Date 1450484321 28800 # Node ID a4f5da7c54636b007796664b82c5fafd22fa897e # Parent 48b2ad5ee801cbb1a69aa4a9467dd2cfb5d558f9 maint: Replace "octave_value_list ()" with "ovl ()". * debug.cc, det.cc, ellipj.cc, error.cc, file-io.cc, graphics.cc, hess.cc, input.cc, inv.cc, load-path.cc, lu.cc, octave-link.cc, pager.cc, pinv.cc, pr-output.cc, profiler.cc, schur.cc, symtab.cc, sysdep.cc, urlwrite.cc, variables.cc, __magick_read__.cc, audioread.cc, chol.cc, ov-classdef.h, ov-cs-list.cc, ov-flt-re-mat.cc, ov-re-mat.cc, ov-usr-fcn.cc: maint: Replace "octave_value_list ()" with "ovl ()". diff -r 48b2ad5ee801 -r a4f5da7c5463 libinterp/corefcn/debug.cc --- a/libinterp/corefcn/debug.cc Fri Dec 18 16:04:56 2015 -0800 +++ b/libinterp/corefcn/debug.cc Fri Dec 18 16:18:41 2015 -0800 @@ -1404,7 +1404,7 @@ tree_evaluator::dbstep_flag = 1; } - return octave_value_list (); + return ovl (); } DEFALIAS (dbnext, dbstep); @@ -1426,7 +1426,7 @@ tree_evaluator::reset_debug_state (); - return octave_value_list (); + return ovl (); } DEFUN (dbquit, args, , @@ -1449,7 +1449,7 @@ octave_throw_interrupt_exception (); - return octave_value_list (); + return ovl (); } DEFUN (isdebugmode, args, , @@ -1486,6 +1486,6 @@ tree_evaluator::quiet_breakpoint_flag = state; - return octave_value_list (); + return ovl (); } diff -r 48b2ad5ee801 -r a4f5da7c5463 libinterp/corefcn/det.cc --- a/libinterp/corefcn/det.cc Fri Dec 18 16:04:56 2015 -0800 +++ b/libinterp/corefcn/det.cc Fri Dec 18 16:18:41 2015 -0800 @@ -77,14 +77,14 @@ int arg_is_empty = empty_arg ("det", nr, nc); if (arg_is_empty < 0) - return octave_value_list (); + return ovl (); if (arg_is_empty > 0) return octave_value (1.0); if (nr != nc) { gripe_square_matrix_required ("det"); - return octave_value_list (); + return ovl (); } octave_value_list retval (2); diff -r 48b2ad5ee801 -r a4f5da7c5463 libinterp/corefcn/ellipj.cc --- a/libinterp/corefcn/ellipj.cc Fri Dec 18 16:04:56 2015 -0800 +++ b/libinterp/corefcn/ellipj.cc Fri Dec 18 16:18:41 2015 -0800 @@ -284,7 +284,7 @@ } } // m matrix - return octave_value_list (); + return ovl (); } /* diff -r 48b2ad5ee801 -r a4f5da7c5463 libinterp/corefcn/error.cc --- a/libinterp/corefcn/error.cc Fri Dec 18 16:04:56 2015 -0800 +++ b/libinterp/corefcn/error.cc Fri Dec 18 16:18:41 2015 -0800 @@ -1988,7 +1988,7 @@ if (nargin == 0 || nargout > 0) return ovl (prev_error_message, prev_error_id); else - return octave_value_list (); + return ovl (); } DEFUN (lastwarn, args, nargout, @@ -2031,7 +2031,7 @@ if (nargin == 0 || nargout > 0) return ovl (prev_warning_message, prev_warning_id); else - return octave_value_list (); + return ovl (); } /* FIXME: Deprecated in 4.0 and scheduled for removal in 4.4 */ diff -r 48b2ad5ee801 -r a4f5da7c5463 libinterp/corefcn/file-io.cc --- a/libinterp/corefcn/file-io.cc Fri Dec 18 16:04:56 2015 -0800 +++ b/libinterp/corefcn/file-io.cc Fri Dec 18 16:18:41 2015 -0800 @@ -267,7 +267,7 @@ os.clearerr (); - return octave_value_list (); + return ovl (); } DEFUN (fflush, args, , @@ -424,7 +424,7 @@ if (! err) return ovl (tmp); else - return octave_value_list (); + return ovl (); } @@ -711,7 +711,7 @@ if (nargout > 0) return ovl (result); else - return octave_value_list (); + return ovl (); } DEFUN (fseek, args, , @@ -818,7 +818,7 @@ if (nargout > 0) return octave_value (result); else - return octave_value_list (); + return ovl (); } DEFUN (printf, args, nargout, @@ -866,7 +866,7 @@ if (nargout > 0) return ovl (result); else - return octave_value_list (); + return ovl (); } DEFUN (fputs, args, , @@ -1926,7 +1926,7 @@ if (status >= 0) return ovl (status); else - return octave_value_list (); + return ovl (); } static octave_value diff -r 48b2ad5ee801 -r a4f5da7c5463 libinterp/corefcn/graphics.cc --- a/libinterp/corefcn/graphics.cc Fri Dec 18 16:04:56 2015 -0800 +++ b/libinterp/corefcn/graphics.cc Fri Dec 18 16:18:41 2015 -0800 @@ -10119,7 +10119,7 @@ else if (vals_len == 1) return octave_value (vals(0)); else - return octave_value_list (); + return ovl (); } static octave_value @@ -10488,7 +10488,7 @@ delete_graphics_objects (vals); - return octave_value_list (); + return ovl (); } DEFUN (__go_axes_init__, args, , @@ -10525,7 +10525,7 @@ if (! h.ok ()) error ("__go_axes_init__: axis deleted during initialization (= %g)", val); - return octave_value_list (); + return ovl (); } DEFUN (__go_handles__, args, , @@ -10586,7 +10586,7 @@ else gh_manager::execute_callback (h, name, args(2)); - return octave_value_list (); + return ovl (); } DEFUN (__image_pixel_size__, args, , @@ -10731,7 +10731,7 @@ gtk_manager::register_toolkit (name); - return octave_value_list (); + return ovl (); } DEFUN (loaded_graphics_toolkits, , , @@ -10821,7 +10821,7 @@ gh_manager::unlock (); - return octave_value_list (); + return ovl (); } } @@ -10853,7 +10853,7 @@ gh_manager::unlock (); - return octave_value_list (); + return ovl (); } else if (pos_c == std::string::npos) { @@ -10861,7 +10861,7 @@ gh_manager::unlock (); - return octave_value_list (); + return ovl (); } else if (pos_p != std::string::npos && pos_p < pos_c) { @@ -10885,7 +10885,7 @@ gh_manager::unlock (); - return octave_value_list (); + return ovl (); } } } @@ -10922,7 +10922,7 @@ gh_manager::unlock (); - return octave_value_list (); + return ovl (); } DEFUN (addlistener, args, , @@ -10987,7 +10987,7 @@ go.add_property_listener (pname, args(2), PERSISTENT); } - return octave_value_list (); + return ovl (); } DEFUN (dellistener, args, , @@ -11050,7 +11050,7 @@ go.delete_property_listener (pname, args(2), POSTSET); } - return octave_value_list (); + return ovl (); } DEFUN (addproperty, args, , @@ -11153,7 +11153,7 @@ go.get_properties ().insert_property (name, p); - return octave_value_list (); + return ovl (); } octave_value @@ -11285,7 +11285,7 @@ waitfor_results[id] = true; } - return octave_value_list (); + return ovl (); } static octave_value_list @@ -11298,7 +11298,7 @@ waitfor_results[id] = true; } - return octave_value_list (); + return ovl (); } DEFUN (waitfor, args, , @@ -11535,7 +11535,7 @@ } } - return octave_value_list (); + return ovl (); } DEFUN (__zoom__, args, , @@ -11589,6 +11589,6 @@ Vdrawnow_requested = true; } - return octave_value_list (); -} - + return ovl (); +} + diff -r 48b2ad5ee801 -r a4f5da7c5463 libinterp/corefcn/hess.cc --- a/libinterp/corefcn/hess.cc Fri Dec 18 16:04:56 2015 -0800 +++ b/libinterp/corefcn/hess.cc Fri Dec 18 16:18:41 2015 -0800 @@ -75,14 +75,14 @@ int arg_is_empty = empty_arg ("hess", nr, nc); if (arg_is_empty < 0) - return octave_value_list (); + return ovl (); else if (arg_is_empty > 0) return octave_value_list (2, Matrix ()); if (nr != nc) { gripe_square_matrix_required ("hess"); - return octave_value_list (); + return ovl (); } octave_value_list retval; diff -r 48b2ad5ee801 -r a4f5da7c5463 libinterp/corefcn/input.cc --- a/libinterp/corefcn/input.cc Fri Dec 18 16:04:56 2015 -0800 +++ b/libinterp/corefcn/input.cc Fri Dec 18 16:18:41 2015 -0800 @@ -931,7 +931,7 @@ do_keyboard (args); - return octave_value_list (); + return ovl (); } DEFUN (echo, args, , @@ -1015,7 +1015,7 @@ break; } - return octave_value_list (); + return ovl (); } /* @@ -1185,7 +1185,7 @@ command_editor::read_init_file (file); } - return octave_value_list (); + return ovl (); } DEFUN (readline_re_read_init_file, args, , @@ -1203,7 +1203,7 @@ command_editor::re_read_init_file (); - return octave_value_list (); + return ovl (); } static int @@ -1288,7 +1288,7 @@ if (input_event_hook_functions.empty ()) command_editor::remove_event_hook (internal_input_event_hook_fcn); - return octave_value_list (); + return ovl (); } DEFUN (PS1, args, nargout, @@ -1444,7 +1444,7 @@ else Vdrawnow_requested = args(0).bool_value (); - return octave_value_list (); + return ovl (); } DEFUN (__gud_mode__, args, , diff -r 48b2ad5ee801 -r a4f5da7c5463 libinterp/corefcn/inv.cc --- a/libinterp/corefcn/inv.cc Fri Dec 18 16:04:56 2015 -0800 +++ b/libinterp/corefcn/inv.cc Fri Dec 18 16:18:41 2015 -0800 @@ -69,14 +69,14 @@ int arg_is_empty = empty_arg ("inverse", nr, nc); if (arg_is_empty < 0) - return octave_value_list (); + return ovl (); else if (arg_is_empty > 0) return octave_value (Matrix ()); if (nr != nc) { gripe_square_matrix_required ("inverse"); - return octave_value_list (); + return ovl (); } octave_value result; diff -r 48b2ad5ee801 -r a4f5da7c5463 libinterp/corefcn/load-path.cc --- a/libinterp/corefcn/load-path.cc Fri Dec 18 16:04:56 2015 -0800 +++ b/libinterp/corefcn/load-path.cc Fri Dec 18 16:18:41 2015 -0800 @@ -2545,5 +2545,5 @@ { load_path::display (octave_stdout); - return octave_value_list (); + return ovl (); } diff -r 48b2ad5ee801 -r a4f5da7c5463 libinterp/corefcn/lu.cc --- a/libinterp/corefcn/lu.cc Fri Dec 18 16:04:56 2015 -0800 +++ b/libinterp/corefcn/lu.cc Fri Dec 18 16:18:41 2015 -0800 @@ -195,7 +195,7 @@ if (issparse) { if (arg_is_empty < 0) - return octave_value_list (); + return ovl (); else if (arg_is_empty > 0) return octave_value_list (5, SparseMatrix ()); @@ -335,7 +335,7 @@ else { if (arg_is_empty < 0) - return octave_value_list (); + return ovl (); else if (arg_is_empty > 0) return octave_value_list (3, Matrix ()); diff -r 48b2ad5ee801 -r a4f5da7c5463 libinterp/corefcn/octave-link.cc --- a/libinterp/corefcn/octave-link.cc Fri Dec 18 16:04:56 2015 -0800 +++ b/libinterp/corefcn/octave-link.cc Fri Dec 18 16:18:41 2015 -0800 @@ -195,7 +195,7 @@ @end deftypefn") { if (args.length () != 6) - return octave_value_list (); + return ovl (); octave_value_list retval (3); @@ -265,7 +265,7 @@ @end deftypefn") { if (args.length () != 8) - return octave_value_list (); + return ovl (); Cell list = args(0).cell_value (); const Array tlist = list.cellstr_value (); @@ -323,7 +323,7 @@ @end deftypefn") { if (args.length () != 4) - return octave_value_list (); + return ovl (); Cell prompt = args(0).cell_value (); Array tmp = prompt.cellstr_value (); diff -r 48b2ad5ee801 -r a4f5da7c5463 libinterp/corefcn/pager.cc --- a/libinterp/corefcn/pager.cc Fri Dec 18 16:04:56 2015 -0800 +++ b/libinterp/corefcn/pager.cc Fri Dec 18 16:18:41 2015 -0800 @@ -574,7 +574,7 @@ } } - return octave_value_list (); + return ovl (); } DEFUN (__diaryfile__, , , @@ -627,7 +627,7 @@ else Vpage_screen_output = ! Vpage_screen_output; - return octave_value_list (); + return ovl (); } DEFUN (terminal_size, , , diff -r 48b2ad5ee801 -r a4f5da7c5463 libinterp/corefcn/pinv.cc --- a/libinterp/corefcn/pinv.cc Fri Dec 18 16:04:56 2015 -0800 +++ b/libinterp/corefcn/pinv.cc Fri Dec 18 16:18:41 2015 -0800 @@ -64,7 +64,7 @@ int arg_is_empty = empty_arg ("pinv", arg.rows (), arg.columns ()); if (arg_is_empty < 0) - return octave_value_list (); + return ovl (); else if (arg_is_empty > 0) return octave_value (Matrix ()); diff -r 48b2ad5ee801 -r a4f5da7c5463 libinterp/corefcn/pr-output.cc --- a/libinterp/corefcn/pr-output.cc Fri Dec 18 16:04:56 2015 -0800 +++ b/libinterp/corefcn/pr-output.cc Fri Dec 18 16:18:41 2015 -0800 @@ -3556,7 +3556,7 @@ else error ("fdisp: stream FID not open for writing"); - return octave_value_list (); + return ovl (); } /* @@ -4031,7 +4031,7 @@ set_format_style (argc, argv); - return octave_value_list (); + return ovl (); } DEFUN (__compactformat__, args, nargout, diff -r 48b2ad5ee801 -r a4f5da7c5463 libinterp/corefcn/profiler.cc --- a/libinterp/corefcn/profiler.cc Fri Dec 18 16:04:56 2015 -0800 +++ b/libinterp/corefcn/profiler.cc Fri Dec 18 16:18:41 2015 -0800 @@ -421,7 +421,7 @@ profiler.reset (); - return octave_value_list (); + return ovl (); } // Query the timings collected by the profiler. diff -r 48b2ad5ee801 -r a4f5da7c5463 libinterp/corefcn/schur.cc --- a/libinterp/corefcn/schur.cc Fri Dec 18 16:04:56 2015 -0800 +++ b/libinterp/corefcn/schur.cc Fri Dec 18 16:18:41 2015 -0800 @@ -159,7 +159,7 @@ { warning ("schur: incorrect ordered schur argument '%s'", ord.c_str ()); - return octave_value_list (); + return ovl (); } } @@ -169,7 +169,7 @@ if (nr != nc) { gripe_square_matrix_required ("schur"); - return octave_value_list (); + return ovl (); } octave_value_list retval; diff -r 48b2ad5ee801 -r a4f5da7c5463 libinterp/corefcn/symtab.cc --- a/libinterp/corefcn/symtab.cc Fri Dec 18 16:04:56 2015 -0800 +++ b/libinterp/corefcn/symtab.cc Fri Dec 18 16:18:41 2015 -0800 @@ -1847,7 +1847,7 @@ symbol_table::assign (name, args(1)); - return octave_value_list (); + return ovl (); } DEFUN (variable_value, args, , "VALUE = variable_value (NAME)") diff -r 48b2ad5ee801 -r a4f5da7c5463 libinterp/corefcn/sysdep.cc --- a/libinterp/corefcn/sysdep.cc Fri Dec 18 16:04:56 2015 -0800 +++ b/libinterp/corefcn/sysdep.cc Fri Dec 18 16:18:41 2015 -0800 @@ -590,7 +590,7 @@ command_editor::clear_screen (skip_redisplay); - return octave_value_list (); + return ovl (); } DEFALIAS (home, clc); @@ -733,7 +733,7 @@ retval = s; } - return octave_value_list (); + return ovl (); } DEFUN (pause, args, , @@ -800,7 +800,7 @@ octave_kbhit (); } - return octave_value_list (); + return ovl (); } /* diff -r 48b2ad5ee801 -r a4f5da7c5463 libinterp/corefcn/urlwrite.cc --- a/libinterp/corefcn/urlwrite.cc Fri Dec 18 16:04:56 2015 -0800 +++ b/libinterp/corefcn/urlwrite.cc Fri Dec 18 16:18:41 2015 -0800 @@ -559,7 +559,7 @@ curl.cwd (path); - return octave_value_list (); + return ovl (); } DEFUN (__ftp_dir__, args, nargout, @@ -650,7 +650,7 @@ curl.ascii (); - return octave_value_list (); + return ovl (); } DEFUN (__ftp_binary__, args, , @@ -669,7 +669,7 @@ curl.binary (); - return octave_value_list (); + return ovl (); } DEFUN (__ftp_close__, args, , @@ -688,7 +688,7 @@ ch_manager::free (h); - return octave_value_list (); + return ovl (); } DEFUN (__ftp_mode__, args, , @@ -728,7 +728,7 @@ curl.del (file); - return octave_value_list (); + return ovl (); } DEFUN (__ftp_rmdir__, args, , @@ -751,7 +751,7 @@ curl.rmdir (dir); - return octave_value_list (); + return ovl (); } DEFUN (__ftp_mkdir__, args, , @@ -772,7 +772,7 @@ curl.mkdir (dir); - return octave_value_list (); + return ovl (); } DEFUN (__ftp_rename__, args, , @@ -794,7 +794,7 @@ curl.rename (oldname, newname); - return octave_value_list (); + return ovl (); } DEFUN (__ftp_mput__, args, nargout, @@ -856,7 +856,7 @@ if (nargout > 0) return ovl (file_list); else - return octave_value_list (); + return ovl (); } DEFUN (__ftp_mget__, args, , @@ -930,5 +930,5 @@ if (n == 0) error ("__ftp_mget__: file not found"); - return octave_value_list (); + return ovl (); } diff -r 48b2ad5ee801 -r a4f5da7c5463 libinterp/corefcn/variables.cc --- a/libinterp/corefcn/variables.cc Fri Dec 18 16:04:56 2015 -0800 +++ b/libinterp/corefcn/variables.cc Fri Dec 18 16:18:41 2015 -0800 @@ -1992,7 +1992,7 @@ fcn->lock (); - return octave_value_list (); + return ovl (); } DEFUN (munlock, args, , @@ -2026,7 +2026,7 @@ fcn->unlock (); } - return octave_value_list (); + return ovl (); } @@ -2484,7 +2484,7 @@ } } - return octave_value_list (); + return ovl (); } DEFUN (whos_line_format, args, nargout, diff -r 48b2ad5ee801 -r a4f5da7c5463 libinterp/dldfcn/__magick_read__.cc --- a/libinterp/dldfcn/__magick_read__.cc Fri Dec 18 16:04:56 2015 -0800 +++ b/libinterp/dldfcn/__magick_read__.cc Fri Dec 18 16:18:41 2015 -0800 @@ -1537,7 +1537,7 @@ write_file (filename, ext, imvec); - return octave_value_list (); + return ovl (); #else gripe_disabled_feature ("imwrite", "Image IO"); diff -r 48b2ad5ee801 -r a4f5da7c5463 libinterp/dldfcn/audioread.cc --- a/libinterp/dldfcn/audioread.cc Fri Dec 18 16:04:56 2015 -0800 +++ b/libinterp/dldfcn/audioread.cc Fri Dec 18 16:18:41 2015 -0800 @@ -277,7 +277,7 @@ else if (args(1).is_integer_type ()) { gripe_wrong_type_arg ("audiowrite", args(1)); - return octave_value_list (); + return ovl (); } Matrix audio = args(1).matrix_value (); @@ -416,7 +416,7 @@ // FIXME: shouldn't we return something to indicate whether the file // was written successfully? - return octave_value_list (); + return ovl (); #else diff -r 48b2ad5ee801 -r a4f5da7c5463 libinterp/dldfcn/chol.cc --- a/libinterp/dldfcn/chol.cc Fri Dec 18 16:04:56 2015 -0800 +++ b/libinterp/dldfcn/chol.cc Fri Dec 18 16:18:41 2015 -0800 @@ -180,7 +180,7 @@ int arg_is_empty = empty_arg ("chol", nr, nc); if (arg_is_empty < 0) - return octave_value_list (); + return ovl (); if (arg_is_empty > 0) return octave_value (Matrix ()); diff -r 48b2ad5ee801 -r a4f5da7c5463 libinterp/octave-value/ov-classdef.h --- a/libinterp/octave-value/ov-classdef.h Fri Dec 18 16:04:56 2015 -0800 +++ b/libinterp/octave-value/ov-classdef.h Fri Dec 18 16:18:41 2015 -0800 @@ -111,7 +111,7 @@ int, size_t&, const cdef_class&, bool) { gripe_invalid_object ("subsref"); - return octave_value_list (); + return ovl (); } virtual octave_value diff -r 48b2ad5ee801 -r a4f5da7c5463 libinterp/octave-value/ov-cs-list.cc --- a/libinterp/octave-value/ov-cs-list.cc Fri Dec 18 16:04:56 2015 -0800 +++ b/libinterp/octave-value/ov-cs-list.cc Fri Dec 18 16:18:41 2015 -0800 @@ -56,6 +56,6 @@ const std::list&, int) { gripe_indexed_cs_list (); - return octave_value_list (); + return ovl (); } diff -r 48b2ad5ee801 -r a4f5da7c5463 libinterp/octave-value/ov-flt-re-mat.cc --- a/libinterp/octave-value/ov-flt-re-mat.cc Fri Dec 18 16:04:56 2015 -0800 +++ b/libinterp/octave-value/ov-flt-re-mat.cc Fri Dec 18 16:18:41 2015 -0800 @@ -895,7 +895,7 @@ octave_float_scalar); } - return octave_value_list (); + return ovl (); } /* diff -r 48b2ad5ee801 -r a4f5da7c5463 libinterp/octave-value/ov-re-mat.cc --- a/libinterp/octave-value/ov-re-mat.cc Fri Dec 18 16:04:56 2015 -0800 +++ b/libinterp/octave-value/ov-re-mat.cc Fri Dec 18 16:18:41 2015 -0800 @@ -1030,7 +1030,7 @@ OCTAVE_TYPE_CONV_BODY3 (double, octave_matrix, octave_scalar); } - return octave_value_list (); + return ovl (); } /* diff -r 48b2ad5ee801 -r a4f5da7c5463 libinterp/octave-value/ov-usr-fcn.cc --- a/libinterp/octave-value/ov-usr-fcn.cc Fri Dec 18 16:04:56 2015 -0800 +++ b/libinterp/octave-value/ov-usr-fcn.cc Fri Dec 18 16:18:41 2015 -0800 @@ -1080,7 +1080,7 @@ else gripe_wrong_type_arg ("isargout", args(0)); - return octave_value_list (); + return ovl (); } /*