From: Paul K. <pki...@us...> - 2005-09-08 02:00:28
|
Update of /cvsroot/octave/octave-forge/main/time In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19391/main/time Modified Files: datenum.m datevec.m weekday.m Log Message: [for Bill Denney] isstr -> ischar Index: datevec.m =================================================================== RCS file: /cvsroot/octave/octave-forge/main/time/datevec.m,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- datevec.m 2 May 2005 15:30:16 -0000 1.6 +++ datevec.m 8 Sep 2005 02:00:18 -0000 1.7 @@ -38,7 +38,7 @@ endif if nargin < 2, P = []; endif - if (isstr(date) || iscellstr(date)) + if (ischar(date) || iscellstr(date)) ## handle strings if isempty(P) tm = localtime(time); Index: datenum.m =================================================================== RCS file: /cvsroot/octave/octave-forge/main/time/datenum.m,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- datenum.m 25 Jul 2004 06:09:12 -0000 1.7 +++ datenum.m 8 Sep 2005 02:00:18 -0000 1.8 @@ -32,10 +32,10 @@ function n = datenum(Y,M,D,h,m,s) persistent monthstart = [306,337,0,31,61,92,122,153,184,214,245,275]; - if nargin == 0 || (nargin > 2 && isstr(Y)) || nargin > 6 + if nargin == 0 || (nargin > 2 && ischar(Y)) || nargin > 6 usage("n=datenum('date' [, P]) or n=datenum(Y, M, D [, h, m [, s]])"); endif - if isstr(Y) + if ischar(Y) if nargin < 2, M=[]; endif [Y,M,D,h,m,s] = datevec(Y,M); else Index: weekday.m =================================================================== RCS file: /cvsroot/octave/octave-forge/main/time/weekday.m,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- weekday.m 28 Feb 2005 00:56:35 -0000 1.3 +++ weekday.m 8 Sep 2005 02:00:18 -0000 1.4 @@ -34,7 +34,7 @@ if (nargin < 1 || nargin > 2) usage("d = weekday(date [, P])"); endif - if isstr(date) + if ischar(date) if nargin < 2, P = []; endif date = datenum(date, P); endif |