Mercurial > hg > octave-jordi

comparison libinterp/corefcn/pager.cc @ 20896:9aad16a799c9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
maint: Replace argc variable name with nargin in C++ code. * cellfun.cc (Fnum2cell): Remove extra space in nargin declaration. * error.cc (Fwarning): Rename argc variable to nargin and update code. * graphics.cc (create): Surround tertiary expression with parentheses before assignment to variable. * pager.cc (Fmore): Rename argc variable to nargin and update code. Replace make_argv() with xstring_value() call. Make error messages more specific. * pr-output.cc (Fformat): Return empty octave_value_list rather than declaring retval and then returning it. * variables.cc (Fwho, Fwhos): Remove unused variable retval. * variables.cc (Fclear): Return empty octave_value_list rather than declaring retval and then returning it. * pt-funcall.cc (print_raw): Rename variable "len" to "n" for clarity.
author Rik <rik@octave.org>
date Mon, 14 Dec 2015 15:34:39 -0800
parents 1142cf6abc0d
children b17fda023ca6
comparison
equal deleted inserted replaced
20895:5e16d687a701 20896:9aad16a799c9
606 \n\ 606 \n\
607 The current state can be determined via @code{page_screen_output}.\n\ 607 The current state can be determined via @code{page_screen_output}.\n\
608 @seealso{page_screen_output, page_output_immediately, PAGER, PAGER_FLAGS}\n\ 608 @seealso{page_screen_output, page_output_immediately, PAGER, PAGER_FLAGS}\n\
609 @end deftypefn") 609 @end deftypefn")
610 { 610 {
611 octave_value_list retval; 611 int nargin = args.length ();
612 612
613 int argc = args.length () + 1; 613 if (nargin > 1)
614
615 if (argc < 1 || argc > 2)
616 print_usage (); 614 print_usage ();
617 615
618 string_vector argv = args.make_argv ("more"); 616 if (nargin > 0)
619 617 {
620 if (argc == 2) 618 std::string arg = args(0).xstring_value ("more: argument must be string \"on\" or \"off\"");
621 {
622 std::string arg = argv[1];
623 619
624 if (arg == "on") 620 if (arg == "on")
625 Vpage_screen_output = true; 621 Vpage_screen_output = true;
626 else if (arg == "off") 622 else if (arg == "off")
627 Vpage_screen_output = false; 623 Vpage_screen_output = false;
628 else 624 else
629 error ("more: unrecognized argument '%s'", arg.c_str ()); 625 error ("more: argument must be \"on\" or \"off\"");
630 } 626 }
631 else 627 else
632 Vpage_screen_output = ! Vpage_screen_output; 628 Vpage_screen_output = ! Vpage_screen_output;
633 629
634 return retval; 630 return octave_value_list ();
635 } 631 }
636 632
637 DEFUN (terminal_size, , , 633 DEFUN (terminal_size, , ,
638 "-*- texinfo -*-\n\ 634 "-*- texinfo -*-\n\
639 @deftypefn {} {} terminal_size ()\n\ 635 @deftypefn {} {} terminal_size ()\n\