Mercurial > octave

changeset 20849:994c0859ab8b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
maint: Refactor C++ calls to print_usage to resemble m-files (2015 code sprint) * octave.cc (Ffopen): (F__version_info__, Fisguirunning, Fargv, Fprogram_invocation_name, Fprogram_name): Move nargin checking to the top of the function.
author Mike Miller <mtmiller@octave.org>
date Sat, 12 Dec 2015 09:44:37 -0500
parents 56d36905893f
children b36aa3044bca
files libinterp/octave.cc
diffstat 1 files changed, 15 insertions(+), 14 deletions(-) [+]
line wrap: on
line diff
--- a/libinterp/octave.cc	Sat Dec 12 15:38:40 2015 +0100
+++ b/libinterp/octave.cc	Sat Dec 12 09:44:37 2015 -0500
@@ -211,6 +211,9 @@
 
   int nargin = args.length ();
 
+  if (nargin != 0 && nargin != 4)
+    print_usage ();
+
   if (nargin == 4)
     {
       if (vinfo.nfields () == 0)
@@ -236,8 +239,6 @@
     }
   else if (nargin == 0)
     retval = vinfo;
-  else
-    print_usage ();
 
   return retval;
 }
@@ -1016,11 +1017,11 @@
 {
   octave_value retval;
 
-  if (args.length () == 0)
-    retval = start_gui;
-  else
+  if (args.length () != 0)
     print_usage ();
 
+  retval = start_gui;
+
   return retval;
 }
 
@@ -1051,11 +1052,11 @@
 {
   octave_value retval;
 
-  if (args.length () == 0)
-    retval = Cell (octave_argv);
-  else
+  if (args.length () != 0)
     print_usage ();
 
+  retval = Cell (octave_argv);
+
   return retval;
 }
 
@@ -1078,11 +1079,11 @@
 {
   octave_value retval;
 
-  if (args.length () == 0)
-    retval = octave_program_invocation_name;
-  else
+  if (args.length () != 0)
     print_usage ();
 
+  retval = octave_program_invocation_name;
+
   return retval;
 }
 
@@ -1101,11 +1102,11 @@
 {
   octave_value retval;
 
-  if (args.length () == 0)
-    retval = octave_program_name;
-  else
+  if (args.length () != 0)
     print_usage ();
 
+  retval = octave_program_name;
+
   return retval;
 }