Mercurial > forge

changeset 1228:f874cb443bb4 octave-forge

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
nargin is now a function, so don't use it as a variable
author pkienzle
date Tue, 27 Jan 2004 00:13:08 +0000
parents a4fc34de548f
children 5bd41c0dca78
files extra/graceplot/alternatives/__errcomm__.m extra/graceplot/alternatives/__errplot__.m extra/graceplot/alternatives/__plt__.m extra/tk_octave/tk_dialog.m main/miscellaneous/read_options.m main/path/addpath.m main/path/rmpath.m main/plot/legend.m main/plot/plot3.m main/struct/rmfield.m main/vrml/save_vrml.m main/vrml/vrml_cyl.m main/vrml/vrml_frame.m main/vrml/vrml_group.m main/vrml/vrml_lines.m main/vrml/vrml_points.m main/vrml/vrml_text.m
diffstat 17 files changed, 63 insertions(+), 72 deletions(-) [+]
line wrap: on
line diff
--- a/extra/graceplot/alternatives/__errcomm__.m	Mon Jan 26 14:34:02 2004 +0000
+++ b/extra/graceplot/alternatives/__errcomm__.m	Tue Jan 27 00:13:08 2004 +0000
@@ -36,7 +36,7 @@
     usage ("%s (...)", caller);
   endif
 
-  nargin--;
+  args = nargin - 1; # nargin is now a function
   hold_state = __grishold__();
   unwind_protect
     if (!hold_state)
@@ -44,9 +44,9 @@
     endif
     __grhold__("on");
     k = 1;
-    while (nargin)
+    while (args)
       a = varargin{k++};
-      nargin--;
+      args--;
       if (isvector (a))
         a = a(:);
       elseif (ismatrix (a))
@@ -57,8 +57,8 @@
       sz = size (a);
       ndata = 1;
       arg1 = a;
-      while (nargin)
-	nargin--;
+      while (args)
+	args--;
 	a = varargin{k++};
 	if (isstr (a))
 	  fmt = a;
--- a/extra/graceplot/alternatives/__errplot__.m	Mon Jan 26 14:34:02 2004 +0000
+++ b/extra/graceplot/alternatives/__errplot__.m	Tue Jan 27 00:13:08 2004 +0000
@@ -42,10 +42,8 @@
 
   fstr = " ";
   ndata = 0;
-  k = 1;
 
-  nargin--;
-  while (nargin--)
+  for k=1:length(varargin)
     a = varargin{k++};
     if (! isstr (a))
       ndata++;
--- a/extra/graceplot/alternatives/__plt__.m	Mon Jan 26 14:34:02 2004 +0000
+++ b/extra/graceplot/alternatives/__plt__.m	Tue Jan 27 00:13:08 2004 +0000
@@ -27,11 +27,12 @@
 
 function __plt__ (caller, varargin)
 
-  if (nargin == 2)
+  args = nargin; # nargin is now a function
+  if (args == 2)
 
     __plt1__ (varargin{1}, "");
 
-  elseif (nargin > 2)
+  elseif (args > 2)
 
     first_plot = 1;
     hold_state = __grishold__ ();
@@ -46,13 +47,13 @@
 
       k = 1;
       x = varargin{k++};
-      nargin = nargin - 2;
+      args = args - 2;
       x_set = 1;
       y_set = 0;
 
       ## Gather arguments, decode format, and plot lines.
 
-      while (nargin-- > 0)
+      while (args-- > 0)
 
 #	fmt = "";
         new = varargin{k++};
--- a/extra/tk_octave/tk_dialog.m	Mon Jan 26 14:34:02 2004 +0000
+++ b/extra/tk_octave/tk_dialog.m	Tue Jan 27 00:13:08 2004 +0000
@@ -60,14 +60,16 @@
 
 cmd = sprintf("tk_dialog .top_tk_dialog \"%s\" \"%s\" \"%s\" %d", title, text, bitmap, default);
 
-va_arg_cnt = 1;
-while(--nargin != 3)
-	arg = nth (varargin, va_arg_cnt++);
+## use the following for 2.1.38 and below
+#varargin = list(varargin, all_va_args);
+
+for argnum=1:length(varargin)
+	arg = nth (varargin, argnum);
 	if (! isstr(arg))
 		error("The arguments must be strings.\n");
 		return
 	endif
-	cmd = [cmd " " '"' arg '"'];
+	cmd = [cmd, " ", '"', arg, '"'];
 endwhile
 
 value = str2num(tk_cmd( cmd ));
--- a/main/miscellaneous/read_options.m	Mon Jan 26 14:34:02 2004 +0000
+++ b/main/miscellaneous/read_options.m	Tue Jan 27 00:13:08 2004 +0000
@@ -56,13 +56,13 @@
 op0 = op1 = " ";
 skipnan = prefix = quiet = nocase = quiet = 0;
 
-nargin--;
-if rem (nargin, 2), error ("odd number of optional args"); end
+args = nargin-1;  # nargin is now a function
+if rem (args, 2), error ("odd number of optional args"); end
 
 
 ## beginpos 2.1.39
 i=1;
-while i<nargin
+while i<args
   if ! isstr (tmp = nth (varargin,i++)), error ("non-string option"); end
   if     strcmp (tmp, "op0")    , op0     = nth (varargin, i++);
   elseif strcmp (tmp, "op1")    , op1     = nth (varargin, i++);
@@ -78,8 +78,8 @@
 end
 ## endpos 2.1.39
 ## beginpre 2.1.39
-# while nargin
-#   nargin -= 2;
+# while args
+#   args -= 2;
 #   if ! isstr (tmp = va_arg ()), error ("non-string option"); end
 #   if     strcmp (tmp, "op0")    , op0     = va_arg ();
 #   elseif strcmp (tmp, "op1")    , op1     = va_arg ();
--- a/main/path/addpath.m	Mon Jan 26 14:34:02 2004 +0000
+++ b/main/path/addpath.m	Tue Jan 27 00:13:08 2004 +0000
@@ -35,9 +35,8 @@
 function addpath(varargin)
 
   app = 0 ;			# Append? Default is 'no'.
-  va_arg_cnt = 1;
-  while nargin--,
-    p = nth (varargin, va_arg_cnt++) ;
+  for arg=1:length(varargin)
+    p = nth (varargin, arg) ;
     if strcmp(p,"-end") | strcmp(p,"-END") ,
       app = 1 ;
     elseif strcmp(p,"-begin") | strcmp(p,"-BEGIN") ,
--- a/main/path/rmpath.m	Mon Jan 26 14:34:02 2004 +0000
+++ b/main/path/rmpath.m	Tue Jan 27 00:13:08 2004 +0000
@@ -18,17 +18,14 @@
 ##
 ## Removes dir1,... from the current LOADPATH.
 ## 
-## For m****b compat.
-## 
 
 ## Author:        Etienne Grossmann  <etienne@isr.ist.utl.pt>
 ## Last modified: January 2000
 
 function rmpath(varargin)
 
-  va_arg_cnt = 1;
-  while nargin--,
-    p = nth (varargin, va_arg_cnt++) ;
+  for arg=1:length(varargin)
+    p = nth (varargin, arg) ;
     lp = length(p) 
     printf("removing %s\n",p);
 				# Nothing like perl for strings!
--- a/main/plot/legend.m	Mon Jan 26 14:34:02 2004 +0000
+++ b/main/plot/legend.m	Tue Jan 27 00:13:08 2004 +0000
@@ -85,19 +85,23 @@
 ## PKG_ADD mark_as_command legend
 function legend (varargin)
 
+  ## Use the following for 2.1.39 and below
+  # varargin = list(varargin, all_va_args);
+  args = nargin; # silliness: nargin is now a function 
+
   ## Data type
 
   data_type = 0;
   va_arg_cnt = 1;
 
   str = "";
-  if (nargin > 0)
+  if (args > 0)
     str = nth (varargin, va_arg_cnt++);
   endif;
       
   ## Test for strings
 
-  if (isstr(str)) && (nargin == 1)
+  if (isstr(str)) && (args == 1)
     _str = tolower(deblank(str));
     _replot = 1;
     switch _str
@@ -134,7 +138,7 @@
       data = cellstr( nth (varargin, va_arg_cnt++));
     endif
     nb_data = length(data);
-    nargin--;
+    args--;
   endif;
 
   pos_leg = 1;
@@ -212,13 +216,13 @@
 
     ## Get the legend string
 
-    if (((data_type == 0) && (nargin <= 0)) || \
+    if (((data_type == 0) && (args <= 0)) || \
         ((data_type == 1) && (fig >= nb_data)))
       leg = "\"\"";
     else
       if (data_type == 0)
         leg = nth (varargin, va_arg_cnt++);
-        nargin--;
+        args--;
       else
         leg = data{fig+1};
       endif;
@@ -262,7 +266,7 @@
 
   ## Check for the last argument if we don't already get it
   
-  while (nargin-- > 0)
+  while (args-- > 0)
     pos_leg = nth (varargin, va_arg_cnt++) ;
     if (isstr(pos_leg))
       pos_leg = 0;
--- a/main/plot/plot3.m	Mon Jan 26 14:34:02 2004 +0000
+++ b/main/plot/plot3.m	Tue Jan 27 00:13:08 2004 +0000
@@ -39,6 +39,9 @@
 
 function plot3(varargin)
 
+  ## use the following for 2.1.38 and below
+  # varargin = list(varargin, all_va_args);
+
   hold_state = ishold ();
   
   unwind_protect
@@ -48,11 +51,8 @@
     z_set = 0;
     
     ## Gather arguments, decode format, and plot lines.
-    
-    va_arg_cnt = 1;
-    while (nargin-- > 0)
-      
-      new = nth (varargin, va_arg_cnt++);
+    for arg = 1:length(varargin)
+      new = nth (varargin, arg);
       
       if (isstr (new))
 	if (! z_set)
--- a/main/struct/rmfield.m	Mon Jan 26 14:34:02 2004 +0000
+++ b/main/struct/rmfield.m	Tue Jan 27 00:13:08 2004 +0000
@@ -19,8 +19,6 @@
 ## Removes key1, key2, ...  from structure s. 
 ## Return s if s is not a struct. Any better behavior?
 ## 
-## For m****b compatibility and flexibility. 
-##
 ## Basically, does a 'filtering' copy of s.
 ##
 ## See also cmpstruct, fields, setfield, isstruct, getfield, isfield,
@@ -37,12 +35,10 @@
   t = s ;
   return
 end
-va_arg_cnt = 1 ; 
 
-rmf = ' ' ;
-nargin-- ;
-while nargin-- ,
-  tmp = nth (varargin, va_arg_cnt++) ;
+rmf = ' ';
+for arg=1:length(varargin)
+  tmp = nth (varargin, arg) ;
   if ! isstr(tmp) ,
     error('rmfield: called with non-string key');
   else
--- a/main/vrml/save_vrml.m	Mon Jan 26 14:34:02 2004 +0000
+++ b/main/vrml/save_vrml.m	Tue Jan 27 00:13:08 2004 +0000
@@ -60,7 +60,8 @@
 
 
 i = 1;
-while --nargin,
+args = nargin; # nargin is now a function
+while --args,
 
   tmp = nth (varargin, i++);
   if     strcmp (tmp, "nobg"),
@@ -70,9 +71,9 @@
   else				# Reached non-options
     ## beginpre 2.1.39
     # va_start ();
-    # n = ++nargin ;
+    # n = ++args ;
     # while n++ < ninit, va_arg (); end
-    ## nargin, ninit
+    ## args, ninit
     ## endpre 2.1.39
     i--; 			# pos 2.1.39
     break;
--- a/main/vrml/vrml_cyl.m	Mon Jan 26 14:34:02 2004 +0000
+++ b/main/vrml/vrml_cyl.m	Tue Jan 27 00:13:08 2004 +0000
@@ -46,8 +46,6 @@
   [rad, tran, col, hcol, emit, verbose, balls, noemit, arrow, brad] = \
       getfield (s, "rad", "tran", "col", "hcol", "emit", "verbose", \
 		"balls", "noemit", "arrow", "brad");
-  ## nargin-- ;
-  ## read_options_old 
 end
 
 if isnan (brad), brad = rad; end
--- a/main/vrml/vrml_frame.m	Mon Jan 26 14:34:02 2004 +0000
+++ b/main/vrml/vrml_frame.m	Tue Jan 27 00:13:08 2004 +0000
@@ -33,19 +33,20 @@
 ######################################################################
 ## Read options
 numeric_args = 0;
-while nargin && numeric_args<2,
+args = nargin; # nargin is now a function
+while args && numeric_args<2,
 
 
   tmp = nth (varargin, numeric_args + 1);
   if isstr (tmp), break; end
-  --nargin;
+  --args;
   numeric_args++;
   if numeric_args == 1, t = tmp ; 
   else                  r = tmp ;  break;
   end
 end
 
-if nargin
+if args
 
   leftover_args = varargin;	# pos 2.1.39
   leftover_args = leftover_args (numeric_args+1:length(leftover_args));
--- a/main/vrml/vrml_group.m	Mon Jan 26 14:34:02 2004 +0000
+++ b/main/vrml/vrml_group.m	Tue Jan 27 00:13:08 2004 +0000
@@ -11,20 +11,15 @@
 
 s = "";
 
-				# beginpost 2.1.39
+				# beginpre 2.1.38
+# if (nargin > 0) 
+#   varargin = list(varargin, all_va_args); 
+# end
+				# endpre 2.1.38
 if nargin > 0, s = nth (varargin, 1); end
 if nargin > 1
   for i = 2:nargin, s = [s,",\n", nth (varargin, i)]; end
 end
-
-				# beginpre 2.1.38
-# if nargin--,
-#   s = va_arg (); 
-#   while nargin--,
-#     s = [s,",\n",va_arg ()];
-#   end
-# end
-				# endpre 2.1.38
 ## indent s
 ni = 4;
 s = [blanks (ni), strrep (s,"\n",["\n",blanks(ni)])(:)'];
--- a/main/vrml/vrml_lines.m	Mon Jan 26 14:34:02 2004 +0000
+++ b/main/vrml/vrml_lines.m	Tue Jan 27 00:13:08 2004 +0000
@@ -19,6 +19,7 @@
 
 function s = vrml_lines(x,f,varargin)
 
+args = nargin; # nargin is now a function
 col = [1, 0, 0] ;
 
 opt1 = " col " ;
@@ -26,10 +27,10 @@
 
 verbose = 0 ;
 
-nargin -= 2 ;
+args -= 2 ;
 i=1;
 
-while nargin>=i ,
+while args>=i ,
 
   tmp = nth (varagin, i++) ;	# pos 2.1.39
   if ! isstr(tmp) ,
@@ -41,7 +42,7 @@
     
 
     tmp2 = nth (varargin, i++); # pos 2.1.39
-    ## nargin-- ;
+    ## args-- ;
     eval([tmp,"=tmp2;"]) ;
 
     if verbose , printf ("vrml_lines : Read option : %s.\n",tmp); end
--- a/main/vrml/vrml_points.m	Mon Jan 26 14:34:02 2004 +0000
+++ b/main/vrml/vrml_points.m	Tue Jan 27 00:13:08 2004 +0000
@@ -49,10 +49,10 @@
 emit = 1;
 tran = 0;
 
-i = 1; nargin--;		# pos 2.1.39
+i = 1; 			# pos 2.1.39
 
 
-while i <= nargin
+while i <= nargin-1
 
   tmp = nth (varargin,i++);
   if strcmp(tmp,"hide") ,
--- a/main/vrml/vrml_text.m	Mon Jan 26 14:34:02 2004 +0000
+++ b/main/vrml/vrml_text.m	Tue Jan 27 00:13:08 2004 +0000
@@ -36,8 +36,6 @@
   s = read_options (varargin{:}, "op1",op1,"op0",op0, "default",df);
   [col,size,family,justify,style,verbose] = \
       getfield (s, "col","size","family","justify","style","verbose");
-  ## nargin-- ;
-  ## read_options_old 
 end
 s = sprintf (["Shape {\n",\
 	      "  appearance Appearance {\n",\