Skip to content

Commit dc18c57

Browse files
authored
Merge branch 'main' into 607-fix-namespace-embedding-in-file
2 parents 0d1128e + 30bf24d commit dc18c57

File tree

2 files changed

+5
-11
lines changed

2 files changed

+5
-11
lines changed

+io/parseGroup.m

-6
Original file line numberDiff line numberDiff line change
@@ -55,12 +55,6 @@
5555
if isempty(Type.typename)
5656
parsed = types.untyped.Set(...
5757
[attributeProperties; datasetProperties; groupProperties; linkProperties]);
58-
59-
if isempty(parsed)
60-
%special case where a directory is simply empty. Return itself but
61-
%empty
62-
parsed(root) = [];
63-
end
6458
else
6559
if groupProperties.Count > 0
6660
%elide group properties

+types/+untyped/Set.m

+5-5
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@
7070
function cnt = Count(obj)
7171
cnt = obj.Map.Count;
7272
end
73-
73+
7474
%overloads size(obj)
7575
function varargout = size(obj, dim)
7676
if nargin > 1
@@ -80,7 +80,7 @@
8080
varargout{1} = obj.Count;
8181
end
8282
else
83-
if nargout == 1
83+
if nargout == 0 || nargout == 1
8484
varargout{1} = [obj.Count, 1];
8585
else
8686
varargout = num2cell( ones(1, nargout) );
@@ -193,9 +193,9 @@ function validateAll(obj)
193193

194194
methods(Access=protected)
195195
function displayEmptyObject(obj)
196-
hdr = [' Empty '...
197-
'<a href="matlab:helpPopup types.untyped.Set" style="font-weight:bold">'...
198-
'Set</a>'];
196+
hdr = sprintf(' %s with no elements.', ...
197+
['<a href="matlab:helpPopup types.untyped.Set" style="font-weight:bold">'...
198+
'Set</a>']);
199199
footer = getFooter(obj);
200200
disp([hdr newline footer]);
201201
end

0 commit comments

Comments
 (0)