migrateToGlue: refactor Section entity

Author: mpsonntag

+nix/Section.m

@@ -82,9 +82,12 @@
                 'Section::sections', obj.nix_handle, obj.sectionsCache, @nix.Section);
         end
 
-        function section = open_section(obj, id_or_name)
-           sh = nix_mx('Section::openSection', obj.nix_handle, id_or_name); 
-           section = nix.Section(sh);
+        function retObj = open_section(obj, id_or_name)
+            handle = nix_mx('Section::openSection', obj.nix_handle, id_or_name);
+            retObj = {};
+            if handle ~= 0
+                retObj = nix.Section(handle);
+            end;
         end;
 
         function hs = has_section(obj, id_or_name)

nix_mx.cc

@@ -115,12 +115,8 @@ const std::vector<fendpoint> funcs = {
 
     // Section
     { "Section::describe", nixsection::describe },
-    { "Section::link", nixsection::link },
-    { "Section::parent", nixsection::parent },
     { "Section::hasSection", nixsection::has_section },
-    { "Section::openSection", nixsection::open_section },
     { "Section::listSections", nixsection::list_sections },
-    { "Section::sections", nixsection::sections },
     { "Section::hasProperty", nixsection::has_property },
     { "Section::listProperties", nixsection::list_properties }
 };
@@ -208,6 +204,12 @@ void mexFunction(int            nlhs,
             .reg("openFeature", GETBYSTR(nix::Feature, nix::MultiTag, getFeature))
             .reg("openSource", GETBYSTR(nix::Source, nix::MultiTag, getSource));
 
+        classdef<nix::Section>("Section", methods)
+            .reg("sections", &nix::Section::sections)
+            .reg("openSection", GETBYSTR(nix::Section, nix::Section, getSection))
+            .reg("link", GETCONTENT(nix::Section, nix::Section, link))
+            .reg("parent", GETCONTENT(nix::Section, nix::Section, parent));
+
         mexAtExit(on_exit);
     });
 

src/nixsection.cc

@@ -29,32 +29,12 @@ void describe(const extractor &input, infusor &output)
     output.set(0, sb.array());
 }
 
-void link(const extractor &input, infusor &output)
-{
-    nix::Section section = input.entity<nix::Section>(1);
-    output.set(0, nixgen::get_handle_or_none(section.link()));
-}
-
-void parent(const extractor &input, infusor &output)
-{
-    nix::Section section = input.entity<nix::Section>(1);
-    output.set(0, nixgen::get_handle_or_none(section.parent()));
-}
-
 void has_section(const extractor &input, infusor &output)
 {
     nix::Section section = input.entity<nix::Section>(1);
     output.set(0, nixgen::has_entity(section.hasSection(input.str(2)), { "hasSection" }));
 }
 
-void open_section(const extractor &input, infusor &output)
-{
-    nix::Section section = input.entity<nix::Section>(1);
-    nix::Section sec = section.getSection(input.str(2));
-    handle h = handle(sec);
-    output.set(0, h);
-}
-
 void list_sections(const extractor &input, infusor &output)
 {
     nix::Section section = input.entity<nix::Section>(1);
@@ -73,13 +53,6 @@ void list_sections(const extractor &input, infusor &output)
     output.set(0, sb.array());
 }
 
-void sections(const extractor &input, infusor &output)
-{
-    nix::Section section = input.entity<nix::Section>(1);
-    std::vector<nix::Section> sections = section.sections();
-    output.set(0, sections);
-}
-
 void has_property(const extractor &input, infusor &output)
 {
     nix::Section section = input.entity<nix::Section>(1);

src/nixsection.h

@@ -7,18 +7,12 @@ namespace nixsection {
 
 void describe(const extractor &input, infusor &output);
 
-void link(const extractor &input, infusor &output);
-
-void parent(const extractor &input, infusor &output);
-
 void has_section(const extractor &input, infusor &output);
 
 void open_section(const extractor &input, infusor &output);
 
 void list_sections(const extractor &input, infusor &output);
 
-void sections(const extractor &input, infusor &output);
-
 void has_property(const extractor &input, infusor &output);
 
 void list_properties(const extractor &input, infusor &output);

tests/TestSection.m

@@ -32,6 +32,10 @@
     name = s1.sections{1}.name;
     s2 = s1.open_section(name);
     assert(strcmp(s2.id, s1.sections{1}.id));
+    
+    %-- test open non existing section
+    getSection = s1.open_section('I dont exist');
+    assert(isempty(getSection));
 end
 
 function [] = test_parent( varargin )