Skip to content

Commit df4abe1

Browse files
committed
no lookbehind
1 parent 2d0ba47 commit df4abe1

File tree

6 files changed

+25
-9
lines changed

6 files changed

+25
-9
lines changed

+stdlib/h5get_version.m

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,11 @@
22

33
function v = h5get_version()
44

5-
[major, minor, rel] = H5.get_libversion();
6-
7-
v = sprintf('%d.%d.%d', major, minor, rel);
5+
try
6+
[major, minor, rel] = H5.get_libversion();
7+
v = sprintf('%d.%d.%d', major, minor, rel);
8+
catch
9+
v = '';
10+
end
811

912
end

+stdlib/nc_get_version.m

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22

33
function v = nc_get_version()
44

5-
v = netcdf.inqLibVers;
5+
try
6+
v = netcdf.inqLibVers;
7+
catch
8+
v = '';
9+
end
610

711
end

+stdlib/perl_exe.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
ps = [fileparts(mfilename("fullpath")), '/private/executable.pl'];
1414

15-
exe = string.empty;
15+
exe = '';
1616

1717
try
1818
[r, s] = perl(ps);

+stdlib/platform_tell.m

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,8 @@
4444
raw.xcode_version = stdlib.xcode_version();
4545
end
4646

47+
if ~stdlib.isoctave()
48+
4749
langs = {'C', 'Cpp', 'Fortran'};
4850
for i = 1:length(langs)
4951
lang = langs{i};
@@ -59,6 +61,8 @@
5961
end
6062
end
6163

64+
end
65+
6266
try
6367
json = jsonencode(raw, 'PrettyPrint', true);
6468
catch e

+stdlib/root_dir.m

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,11 @@
1313
if startsWith(p, ["/", filesep])
1414
r = extractBefore(p, 2);
1515
elseif ispc()
16-
r = regexp(p, '(?<=^[A-Za-z]:)([\\/])', 'match', 'once');
17-
if ismissing(r)
18-
r = "";
16+
m = regexp(p, '^[A-Za-z]:([\\/])', 'tokens', 'once');
17+
if isempty(m)
18+
r = extractBefore(p, 1);
19+
else
20+
r = m{1};
1921
end
2022
else
2123
r = extractBefore(p, 1);

+stdlib/xcode_version.m

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,10 @@
77
if ismac()
88
[s, m] = system('pkgutil --pkg-info com.apple.pkg.CLTools_Executables');
99
if s == 0
10-
v = regexp(m, '(?<=version:\s*)(\d+\.\d+(\.\d+)+)', 'match', 'once');
10+
t = regexp(m, 'version:\s*(\d+\.\d+(\.\d+)+)', 'tokens', 'once');
11+
if ~isempty(t)
12+
v = t{1};
13+
end
1114
else
1215
warning("stdlib:xcode_version:runtimeError", "%d failed to get Command Line Tools Xcode version", s)
1316
end

0 commit comments

Comments
 (0)