[Octave-cvsupdate] SF.net SVN: octave:[7785] trunk/octave-forge/extra/dataframe/inst/@ dataframe/dataframe.m

[<cde...@us...>]

Revision: 7785
          http://octave.svn.sourceforge.net/octave/?rev=7785&view=rev
Author:   cdemills
Date:     2010-09-30 14:47:00 +0000 (Thu, 30 Sep 2010)

Log Message:
-----------
  - only perform a switch() on varargin entries which are char

Modified Paths:
--------------
    trunk/octave-forge/extra/dataframe/inst/@dataframe/dataframe.m

Modified: trunk/octave-forge/extra/dataframe/inst/@dataframe/dataframe.m
===================================================================
--- trunk/octave-forge/extra/dataframe/inst/@dataframe/dataframe.m	2010-09-30 14:37:04 UTC (rev 7784)
+++ trunk/octave-forge/extra/dataframe/inst/@dataframe/dataframe.m	2010-09-30 14:47:00 UTC (rev 7785)
@@ -89,50 +89,54 @@
   indi = 1;
   %# loop over possible arguments
   while indi <= size(varargin, 2),
-    switch(varargin{indi})
-      case 'rownames'
-	switch class(varargin{indi+1})
-	  case {'cell'}
-	    df._name{1} = varargin{indi+1};
-	  case {'char'}
-	    df._name{1} = cellstr(varargin{indi+1});
-	  otherwise
-	    df._name{1} = cellstr(num2str(varargin{indi+1}));
-	endswitch
-	df._over{1}(1, 1:length(df._name{1})) = false;
-	df._cnt(1) = size(df._name{1}, 1);
-	df._ridx = (1:df._cnt(1))';
-	varargin(indi:indi+1) = [];
-      case 'colnames'
-	switch class(varargin{indi+1})
-	  case {'cell'}
-	    df._name{2} = varargin{indi+1};
-	  case {'char'}
-	    df._name{2} = cellstr(varargin{indi+1});
-	  otherwise
-	    df._name{2} = cellstr(num2str(varargin{indi+1}));
-	endswitch
-	%# detect assignment - functions calls - ranges
-	dummy = cellfun('size', cellfun(@(x) strsplit(x, ":=("), df._name{2}, \
-					"UniformOutput", false), 2);
-	if any(dummy > 1),
-	  warning('dataframe colnames taken literally and not interpreted');
-	endif
-	df._over{2}(1, 1:length(df._name{2})) = false;
-	varargin(indi:indi+1) = [];
-      case 'seeked',
-	seeked = varargin{indi + 1};
-	varargin(indi:indi+1) = [];
-      case 'unquot',
-	unquot = varargin{indi + 1};
-	varargin(indi:indi+1) = [];
-      case 'sep',
-	sep = varargin{indi + 1};
-	varargin(indi:indi+1) = [];
-      otherwise %# FIXME: just skip it for now
-	disp(sprintf("Ignoring unkown argument %s", varargin{indi}));
-	indi = indi + 1;
-    endswitch
+    if isa(varargin{indi}, 'char'),
+      switch(varargin{indi})
+	case 'rownames'
+	  switch class(varargin{indi+1})
+	    case {'cell'}
+	      df._name{1} = varargin{indi+1};
+	    case {'char'}
+	      df._name{1} = cellstr(varargin{indi+1});
+	    otherwise
+	      df._name{1} = cellstr(num2str(varargin{indi+1}));
+	  endswitch
+	  df._over{1}(1, 1:length(df._name{1})) = false;
+	  df._cnt(1) = size(df._name{1}, 1);
+	  df._ridx = (1:df._cnt(1))';
+	  varargin(indi:indi+1) = [];
+	case 'colnames'
+	  switch class(varargin{indi+1})
+	    case {'cell'}
+	      df._name{2} = varargin{indi+1};
+	    case {'char'}
+	      df._name{2} = cellstr(varargin{indi+1});
+	    otherwise
+	      df._name{2} = cellstr(num2str(varargin{indi+1}));
+	  endswitch
+	  %# detect assignment - functions calls - ranges
+	  dummy = cellfun('size', cellfun(@(x) strsplit(x, ":=("), df._name{2}, \
+					  "UniformOutput", false), 2);
+	  if any(dummy > 1),
+	    warning('dataframe colnames taken literally and not interpreted');
+	  endif
+	  df._over{2}(1, 1:length(df._name{2})) = false;
+	  varargin(indi:indi+1) = [];
+	case 'seeked',
+	  seeked = varargin{indi + 1};
+	  varargin(indi:indi+1) = [];
+	case 'unquot',
+	  unquot = varargin{indi + 1};
+	  varargin(indi:indi+1) = [];
+	case 'sep',
+	  sep = varargin{indi + 1};
+	  varargin(indi:indi+1) = [];
+	otherwise %# FIXME: just skip it for now
+	  disp(sprintf("Ignoring unkown argument %s", varargin{indi}));
+	  indi = indi + 1;    
+      endswitch
+    else
+      indi = indi + 1;    %# skip it
+    endif	  
   endwhile
 endif
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.