removeLists from Section

Author: mpsonntag

+nix/Section.m

@@ -73,10 +73,6 @@
         % Section methods
         % ----------------
 
-        function lst = list_sections(obj)
-            lst = nix_mx('Section::listSections', obj.nix_handle);
-        end;
-        
         function sections = get.sections(obj)
             [obj.sectionsCache, sections] = nix.Utils.fetchObjList(obj.updatedAt, ...
                 'Section::sections', obj.nix_handle, obj.sectionsCache, @nix.Section);
@@ -100,7 +96,7 @@
 
         function props = get.properties_cell(obj)
             [obj.propsCache, props] = nix.Utils.fetchPropList(obj.updatedAt, ...
-                'Section::listProperties', obj.nix_handle, obj.propsCache);
+                'Section::properties', obj.nix_handle, obj.propsCache);
         end
 
         function p_map = get.properties_map(obj)

nix_mx.cc

@@ -83,8 +83,7 @@ const std::vector<fendpoint> funcs = {
 
     // Section
     { "Section::describe", nixsection::describe },
-    { "Section::listSections", nixsection::list_sections },
-    { "Section::listProperties", nixsection::list_properties }
+    { "Section::properties", nixsection::properties }
 };
 
 //glue "globals"

src/nixsection.cc

@@ -29,25 +29,7 @@ void describe(const extractor &input, infusor &output)
     output.set(0, sb.array());
 }
 
-void list_sections(const extractor &input, infusor &output)
-{
-    nix::Section section = input.entity<nix::Section>(1);
-    std::vector<nix::Section> sections = section.sections();
-
-    struct_builder sb({ sections.size() }, { "name", "id", "type" });
-
-    for (const auto &b : sections) {
-        sb.set(b.name());
-        sb.set(b.id());
-        sb.set(b.type());
-
-        sb.next();
-    }
-
-    output.set(0, sb.array());
-}
-
-void list_properties(const extractor &input, infusor &output)
+void properties(const extractor &input, infusor &output)
 {
     nix::Section section = input.entity<nix::Section>(1);
     std::vector<nix::Property> properties = section.properties();

src/nixsection.h

@@ -7,9 +7,7 @@ namespace nixsection {
 
 void describe(const extractor &input, infusor &output);
 
-void list_sections(const extractor &input, infusor &output);
-
-void list_properties(const extractor &input, infusor &output);
+void properties(const extractor &input, infusor &output);
 
 } // namespace nixfile
 

tests/TestSection.m

@@ -16,7 +16,6 @@
     f = nix.File(fullfile(pwd, 'tests', 'test.h5'), nix.FileMode.ReadOnly);
     s1 = f.sections{3};
 
-    assert(size(s1.list_sections(),1) == 4);
     assert(size(s1.sections, 1) == 4);
 end