perl: more general/robust function calls

Author: scivision

+stdlib/+perl/device.m

@@ -2,21 +2,16 @@
 
 function [r, cmd] = device(file)
 
-c = '($f=shift) && -e $f or exit 1; print +(stat $f)[0]';
-if ispc()
-  k = sprintf('"%s"', c);
-else
-  k = sprintf('''%s''', c);
-end
-
 r = uint64.empty;
 
 exe = stdlib.perl_exe();
 if stdlib.strempty(exe)
   return
 end
 
-cmd = sprintf('"%s" -e %s "%s"', exe, k, file);
+c = stdlib.perl.perl2cmd('($f=shift) && -e $f or exit 1; print +(stat $f)[0]');
+
+cmd = sprintf('"%s" -e %s "%s"', exe, c, file);
 
 [s, r] = system(cmd);
 if s == 0

+stdlib/+perl/inode.m

@@ -1,20 +1,15 @@
 function [r, cmd] = inode(file)
 
-c = '($f=shift) && -e $f or exit 1; print +(stat $f)[1]';
-if ispc()
-  k = sprintf('"%s"', c);
-else
-  k = sprintf('''%s''', c);
-end
-
 r = uint64.empty;
 
 exe = stdlib.perl_exe();
 if stdlib.strempty(exe)
   return
 end
 
-cmd = sprintf('"%s" -e %s "%s"', exe, k, file);
+c = stdlib.perl.perl2cmd('($f=shift) && -e $f or exit 1; print +(stat $f)[1]');
+
+cmd = sprintf('"%s" -e %s "%s"', exe, c, file);
 
 [s, r] = system(cmd);
 if s == 0

+stdlib/+perl/perl2cmd.m

@@ -0,0 +1,13 @@
+%% PERL2CMD prepare Perl cmd for Matlab sprintf
+%
+% Windows wants double quotes, Unix wants single quotes
+
+function c = perl2cmd(p)
+
+if ispc()
+  c = sprintf('"%s"', p);
+else
+  c = sprintf('''%s''', p);
+end
+
+end

+stdlib/+perl/samepath.m

@@ -1,20 +1,15 @@
 function [r, cmd] = samepath(file1, file2)
 
-c = '(@ARGV==2) or exit 1; @s1 = stat shift or exit 1; @s2 = stat shift or exit 1; exit(($s1[0]==$s2[0] && $s1[1]==$s2[1]) ? 0 : 1)';
-if ispc()
-  k = sprintf('"%s"', c);
-else
-  k = sprintf('''%s''', c);
-end
-
 r = logical.empty;
 
 exe = stdlib.perl_exe();
 if stdlib.strempty(exe)
   return
 end
 
-cmd = sprintf('"%s" -e %s "%s" "%s"', exe, k, file1, file2);
+c = stdlib.perl.perl2cmd('(@ARGV==2) or exit 1; @s1 = stat shift or exit 1; @s2 = stat shift or exit 1; exit(($s1[0]==$s2[0] && $s1[1]==$s2[1]) ? 0 : 1)');
+
+cmd = sprintf('"%s" -e %s "%s" "%s"', exe, c, file1, file2);
 
 s = system(cmd);
 

+stdlib/perl_version.m

@@ -1,5 +1,6 @@
 %% PERL_VERSION get the Perl version used by MATLAB
 % cached for speed
+% to clear cache do "clear functions"
 %
 %%% Output
 % * v: 1x3 vector of major, minor, micro version e.g. Perl 5.32.1 = [5, 32, 1]
@@ -20,7 +21,7 @@
 exe = stdlib.perl_exe();
 
 if ~stdlib.strempty(exe)
-  cmd = sprintf('"%s" -e "print $^V"', exe);
+  cmd = sprintf('"%s" -e %s', exe, stdlib.perl.perl2cmd('print $^V'));
 
   [s, r] = system(cmd);
 

test/TestPlatform.m

@@ -51,6 +51,13 @@ function test_platform_tell(tc)
 end
 
 
+function test_perl(tc)
+tc.verifyNotEmpty(stdlib.perl_exe())
+tc.verifyNotEmpty(stdlib.perl_version())
+tc.verifyTrue(stdlib.has_perl(), "Matlab docs indicate that Perl should always be available")
+end
+
+
 function test_is_cygwin(tc)
 tc.verifyFalse(stdlib.is_cygwin())
 end