Merge pull request #71 from asobolev/master

added none_t to GLUE + repository & mapping setters for section

Author: mpsonntag

+nix/Dynamic.m

@@ -23,8 +23,11 @@ function set_method(obj, val)
                     throwAsCaller(ME);
                 end
 
-                % TODO set appropriate method name template
-                nix_mx(strcat(obj.alias, '::set_', prop), obj.nix_handle);
+                if (isempty(val))
+                    nix_mx(strcat(obj.alias, '::set_none_', prop), obj.nix_handle, val);
+                else
+                    nix_mx(strcat(obj.alias, '::set_', prop), obj.nix_handle, val);
+                end
                 obj.info = nix_mx(strcat(obj.alias, '::describe'), obj.nix_handle);
             end
 

nix_mx.cc

@@ -55,7 +55,7 @@ static void on_exit() {
 }
 
 #define GETTER(type, class, name) static_cast<type(class::*)()const>(&class::name)
-//#define SETTER(type, class, name) static_cast<void(class::*)(type)>(&class::name)
+#define SETTER(type, class, name) static_cast<void(class::*)(type)>(&class::name)
 #define GETBYSTR(type, class, name) static_cast<type(class::*)(const std::string &)const>(&class::name)
 #define GETCONTENT(type, class, name) static_cast<type(class::*)()const>(&class::name)
 #define GETSOURCES(base__) static_cast<std::vector<nix::Source>(nix::base::EntityWithSources<nix::base::base__>::*)(std::function<bool(const nix::Source &)>)const>(&nix::base::EntityWithSources<nix::base::base__>::sources)
@@ -189,9 +189,12 @@ void mexFunction(int            nlhs,
             .reg("hasSection", GETBYSTR(bool, nix::Section, hasSection))
             .reg("link", GETCONTENT(nix::Section, nix::Section, link))
             .reg("parent", GETCONTENT(nix::Section, nix::Section, parent))
+            .reg("set_repository", SETTER(const std::string&, nix::Section, repository))
+            .reg("set_none_repository", SETTER(const boost::none_t, nix::Section, repository))
+            .reg("set_mapping", SETTER(const std::string&, nix::Section, mapping))
+            .reg("set_none_mapping", SETTER(const boost::none_t, nix::Section, mapping))
             .reg("createSection", &nix::Section::createSection)
             .reg("deleteSection", REMOVER(nix::Section, nix::Section, deleteSection));
-            //.reg("set_repository", SETTER(const std::string&, nix::Section, repository));
         methods->add("Section::properties", nixsection::properties);
 
         classdef<nix::Feature>("Feature", methods)

src/nixsection.cc

@@ -11,7 +11,7 @@
 
 namespace nixsection {
 
-    mxArray *describe(const nix::Section &section)
+mxArray *describe(const nix::Section &section)
 {
     struct_builder sb({ 1 }, { 
         "name", "id", "type", "repository", "mapping"

src/utils/glue.h

@@ -37,6 +37,14 @@ struct ex_getter < std::string > {
     }
 };
 
+template<>
+struct ex_getter < boost::none_t > {
+    static boost::none_t get(const extractor &input, int pos) {
+        boost::none_t t = nullptr;
+        return t;
+    }
+};
+
 template<typename Klazz>
 struct ex_getter < std::function<bool(const Klazz&)> > {
     static std::function<bool(const Klazz &)> get(const extractor &input, int pos) {

src/utils/mkarray.h

@@ -70,11 +70,12 @@ inline mxArray* make_mx_array(const std::vector<nix::Value> &v) {
 
 template<typename T>
 mxArray* make_mx_array(const boost::optional<T> &opt) {
-	if (opt) {
-		make_mx_array(*opt);
-	}
-
-	return nullptr;
+    if (opt) {
+        return make_mx_array(*opt);
+    }
+    else {
+        return nullptr;
+    }
 }
 
 template<typename T>

tests/TestSection.m

@@ -88,6 +88,28 @@
 
 function [] = test_attrs( varargin )
 %% Test: Access Attributes / Links
+    f = nix.File(fullfile(pwd, 'tests', 'testRW.h5'), nix.FileMode.Overwrite);
+    s1 = f.createSection('foo', 'bar');
+
+    assert(strcmp(s1.name, 'foo'));
+    assert(strcmp(s1.type, 'bar'));
+    assert(isempty(s1.repository));
+    assert(isempty(s1.mapping));
+
+    s1.repository = 'rep1';
+    s1.mapping = 'map1';
+    assert(strcmp(s1.repository, 'rep1'));
+    assert(strcmp(s1.mapping, 'map1'));
+    
+    s1.repository = '';
+    s1.mapping = '';
+    assert(isempty(s1.repository));
+    assert(isempty(s1.mapping));
+
+    assert(isempty(s1.link));
+    
+    % TODO rewrite tests for link / parent
+    
     f = nix.File(fullfile(pwd, 'tests', 'test.h5'), nix.FileMode.ReadOnly);
     s1 = f.sections{3};