Skip to content

Commit 9e1e99d

Browse files
committed
add stdlib.strempty()
1 parent 0a1d07f commit 9e1e99d

32 files changed

+127
-100
lines changed

+stdlib/+dotnet/create_symlink.m

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

33
ok = false;
44

5-
if ~stdlib.exists(target) || strlength(link) == 0 || stdlib.exists(link)
5+
if ~stdlib.exists(target) || stdlib.strempty(link) || stdlib.exists(link)
66
return
77
end
88

+stdlib/+dotnet/relative_to.m

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
function rel = relative_to(base, other)
22

3-
if strempty(other)
3+
if stdlib.strempty(other)
44
rel = base;
55
return
66
end
7-
if strempty(base)
7+
if stdlib.strempty(base)
88
rel = other;
99
return
1010
end

+stdlib/+python/create_symlink.m

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

33
ok = false;
44

5-
if ~stdlib.exists(target) || strlength(link) == 0 || stdlib.exists(link)
5+
if ~stdlib.exists(target) || stdlib.strempty(link) || stdlib.exists(link)
66
return
77
end
88

+stdlib/+python/private/pvt_python_version.m

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

55
pe = pyenv();
66
vs = pe.Version;
7-
if strlength(vs) == 0, return, end
7+
if stdlib.strempty(vs), return, end
88

99
vi = py.sys.version_info;
1010
v = [double(vi.major), double(vi.minor), double(vi.micro)];

+stdlib/+sys/create_symlink.m

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

44
ok = false;
55

6-
if ~stdlib.exists(target) || strlength(link) == 0 || stdlib.exists(link)
6+
if ~stdlib.exists(target) || stdlib.strempty(link) || stdlib.exists(link)
77
return
88
end
99

+stdlib/+sys/relative_to.m

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
function r = relative_to(base, other)
2+
3+
r = "";
4+
5+
if ~stdlib.exists(base) || ~stdlib.exists(other)
6+
return
7+
end
8+
9+
if ispc()
10+
cmd = sprintf('pwsh -c "Resolve-Path -Path ''%s'' -RelativeBasePath ''%s'' -Relative"', other, base);
11+
else
12+
cmd = sprintf('realpath --relative-to="%s" "%s"', base, other);
13+
end
14+
15+
[status, r] = system(cmd);
16+
if status ~= 0
17+
warning("stdlib:relative_to:OSError", "Failed to compute relative path: %s", r);
18+
end
19+
20+
r = string(strip(r));
21+
22+
if ispc()
23+
r = fullfile(stdlib.normalize(r));
24+
end
25+
26+
end

+stdlib/+sys/samepath.m

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

33
y = false;
44

5-
if strlength(path1) == 0 || strlength(path2) == 0
5+
if stdlib.strempty(path1) || stdlib.strempty(path2)
66
return
77
end
88

+stdlib/canonical.m

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
strict logical = false
1919
end
2020

21-
if strempty(p)
21+
if stdlib.stdlib.strempty(p)
2222
c = "";
2323
return
2424
end
@@ -28,7 +28,7 @@
2828
else
2929
pth = matlab.io.internal.filesystem.resolvePath(p);
3030
c = pth.ResolvedPath;
31-
if ~strict && strempty(c)
31+
if ~strict && stdlib.strempty(c)
3232
c = stdlib.normalize(p);
3333
end
3434
end
@@ -42,7 +42,7 @@
4242

4343
c = "";
4444

45-
if strempty(p), return, end
45+
if stdlib.strempty(p), return, end
4646

4747
[s, r] = fileattrib(p);
4848

+stdlib/create_symlink.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
% Matlab Java doesn't recognize the optional argument omitted.
2727
% see example/Filesystem.java for this working in plain Java.
2828
% see example/javaCreateSymbolicLink.m for a non-working attempt in Matlab.
29-
if strempty(target) || strempty(link), return, end
29+
if stdlib.strempty(target) || stdlib.strempty(link), return, end
3030

3131
if stdlib.has_python()
3232
ok = stdlib.python.create_symlink(target, link);

+stdlib/get_username.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
n = stdlib.python.get_username();
1313
end
1414

15-
if strempty(n)
15+
if stdlib.strempty(n)
1616
n = stdlib.sys.get_username();
1717
end
1818

0 commit comments

Comments
 (0)