tb_optparse had a bug when parsing for LineSpecs when valid characters were repeated. Added unit test to ensure that parsing works correctly. Also cleaned up code to avoid code advisor warnings.

Closes #13.

Author: remo-pillat

test/toolbox/ttb_optparse.m

@@ -70,10 +70,6 @@ function validLineSpecString(testCase, pLineSpecValid)
         function validLineSpecRepeated(testCase)
             %validLineSpecRepeated Test for having repeated tokens
 
-            % This test case fails for now, because of a bug that is also
-            % triggered by chapter 5 code.
-            testCase.assumeFail("Waiting for fix");
-
             repeatedColor = ':kk';
             [~,~,actualLineSpec] = tb_optparse(struct, {repeatedColor});
             testCase.verifyEqual(actualLineSpec{1}, repeatedColor);

toolbox/internal/+rvc/+internal/isLineSpec.m

@@ -0,0 +1,50 @@
+function isLS = isLineSpec(s)
+%ISLINESPEC Determine if input character array is a linespec
+%   See LineSpec definition in https://www.mathworks.com/help/matlab/ref/plot.html
+%   documentation.
+
+% Copyright 2025 Peter Corke, Witold Jachimczyk, Remo Pillat
+
+%#ok<*AGROW>
+
+s = convertStringsToChars(s);
+
+if ~ischar(s)
+    isLS = false;
+    return;
+end
+
+s2 = '';
+
+% get color
+removeMask = false(1, length(s));
+[b,e] = regexp(s, '[rgbcmywk]');
+for j = 1:numel(b)
+    s2 = [s2,s(b(j):e(j))]; 
+    removeMask(b(j):e(j)) = true;
+end
+s(removeMask) = [];
+
+% get line style
+removeMask = false(1, length(s));
+[b,e] = regexp(s, '(--)|(-.)|-|:');
+for j = 1:numel(b)
+    s2 = [s2,s(b(j):e(j))];
+    removeMask(b(j):e(j)) = true;
+end
+s(removeMask) = [];
+
+% get marker style
+removeMask = false(1, length(s));
+[b,e] = regexp(s, '[o\+\*\.xsd\^v><ph]');
+for j = 1:numel(b)
+    s2 = [s2,s(b(j):e(j))];
+    removeMask(b(j):e(j)) = true;
+end
+s(removeMask) = [];
+
+% This is a LineSpec if all characters from s have been removed
+isLS = isempty(s);
+
+end
+

toolbox/tb_optparse.m

@@ -80,11 +80,9 @@
 
 % Copyright 2022-2023 Peter Corke, Witold Jachimczyk, Remo Pillat
 
-function [opt,others,ls] = tb_optparse(in, argvIn, cls)
+%#ok<*AGROW>
 
-if nargin == 1
-    argv = {};
-end
+function [opt,others,ls] = tb_optparse(in, argvIn, cls)
 
 if nargin < 3
     cls = [];
@@ -307,28 +305,11 @@
     ls = [];
     for i=1:length(arglist)
         s = arglist{i};
-        if ~ischar(s)
-            continue;
-        end
-        % get color
-        [b,e] = regexp(s, '[rgbcmywk]');
-        s2 = s(b:e);
-        s(b:e) = [];
-        
-        % get line style
-        [b,e] = regexp(s, '(--)|(-.)|-|:');
-        s2 = [s2 s(b:e)]; %#ok<*AGROW>
-        s(b:e) = [];
-        
-        % get marker style
-        [b,e] = regexp(s, '[o\+\*\.xsd\^v><ph]');
-        s2 = [s2 s(b:e)]; %#ok<*NASGU>
-        s(b:e) = [];
-        
+
         % found one
-        if isempty(s)
+        if rvc.internal.isLineSpec(s)
             ls = arglist{i};
-            arglist(i) = []; 
+            arglist(i) = [];
             break;
         end
     end