Skip to content

Commit 604ba43

Browse files
committed
[Matlab] Refactor Section/Source index use
1 parent 0a9f7ea commit 604ba43

File tree

4 files changed

+15
-12
lines changed

4 files changed

+15
-12
lines changed

+nix/Section.m

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,8 @@
7070
r = nix.Utils.open_entity(obj, 'openSection', id_or_name, @nix.Section);
7171
end
7272

73-
function r = open_section_idx(obj, idx)
73+
function r = open_section_idx(obj, index)
74+
idx = nix.Utils.handle_index(index);
7475
r = nix.Utils.open_entity(obj, 'openSectionIdx', idx, @nix.Section);
7576
end
7677

@@ -144,7 +145,8 @@
144145
r = nix.Utils.open_entity(obj, 'openProperty', id_or_name, @nix.Property);
145146
end
146147

147-
function r = open_property_idx(obj, idx)
148+
function r = open_property_idx(obj, index)
149+
idx = nix.Utils.handle_index(index);
148150
r = nix.Utils.open_entity(obj, 'openPropertyIdx', idx, @nix.Property);
149151
end
150152

+nix/Source.m

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,8 @@
4949
r = nix.Utils.open_entity(obj, 'openSource', id_or_name, @nix.Source);
5050
end
5151

52-
function r = open_source_idx(obj, idx)
52+
function r = open_source_idx(obj, index)
53+
idx = nix.Utils.handle_index(index);
5354
r = nix.Utils.open_entity(obj, 'openSourceIdx', idx, @nix.Source);
5455
end
5556

tests/TestSection.m

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -106,9 +106,9 @@
106106
s2 = s.create_section('testSection2', 'nixSection');
107107
s3 = s.create_section('testSection3', 'nixSection');
108108

109-
assert(strcmp(f.sections{1}.open_section_idx(0).name, s1.name));
110-
assert(strcmp(f.sections{1}.open_section_idx(1).name, s2.name));
111-
assert(strcmp(f.sections{1}.open_section_idx(2).name, s3.name));
109+
assert(strcmp(f.sections{1}.open_section_idx(1).name, s1.name));
110+
assert(strcmp(f.sections{1}.open_section_idx(2).name, s2.name));
111+
assert(strcmp(f.sections{1}.open_section_idx(3).name, s3.name));
112112
end
113113

114114
function [] = test_parent( varargin )
@@ -292,9 +292,9 @@
292292
p2 = s.create_property('testProperty2', nix.DataType.Bool);
293293
p3 = s.create_property('testProperty3', nix.DataType.String);
294294

295-
assert(strcmp(f.sections{1}.open_property_idx(0).name, p1.name));
296-
assert(strcmp(f.sections{1}.open_property_idx(1).name, p2.name));
297-
assert(strcmp(f.sections{1}.open_property_idx(2).name, p3.name));
295+
assert(strcmp(f.sections{1}.open_property_idx(1).name, p1.name));
296+
assert(strcmp(f.sections{1}.open_property_idx(2).name, p2.name));
297+
assert(strcmp(f.sections{1}.open_property_idx(3).name, p3.name));
298298
end
299299

300300
%% Test: Property count

tests/TestSource.m

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -82,9 +82,9 @@
8282
s2 = s.create_source('testSource2', 'nixSource');
8383
s3 = s.create_source('testSource3', 'nixSource');
8484

85-
assert(strcmp(f.blocks{1}.sources{1}.open_source_idx(0).name, s1.name));
86-
assert(strcmp(f.blocks{1}.sources{1}.open_source_idx(1).name, s2.name));
87-
assert(strcmp(f.blocks{1}.sources{1}.open_source_idx(2).name, s3.name));
85+
assert(strcmp(f.blocks{1}.sources{1}.open_source_idx(1).name, s1.name));
86+
assert(strcmp(f.blocks{1}.sources{1}.open_source_idx(2).name, s2.name));
87+
assert(strcmp(f.blocks{1}.sources{1}.open_source_idx(3).name, s3.name));
8888
end
8989

9090
%% Test: Source count

0 commit comments

Comments
 (0)