Merge pull request #55 from gicmo/vanilla_mptr_ref

GLUE for non member functions

Author: asobolev

nix_mx.cc

@@ -53,12 +53,7 @@ struct fendpoint {
 };
 
 const std::vector<fendpoint> funcs = {
-    { "Entity::destroy", entity_destroy },
-    { "Entity::updatedAt", entity_updated_at },
-
     // File
-    { "File::open", nixfile::open },
-    { "File::describe", nixfile::describe },
     { "File::listBlocks", nixfile::list_blocks },
     { "File::listSections", nixfile::list_sections },
     { "File::createBlock", nixfile::create_block },
@@ -147,7 +142,12 @@ void mexFunction(int            nlhs,
 
         methods = new registry{};
 
+        methods->add("Entity::destory", entity_destroy);
+        methods->add("Entity::updatedAt", entity_updated_at);
+
         classdef<nix::File>("File", methods)
+            .desc(&nixfile::describe)
+            .add("open", nixfile::open)
             .reg("blocks", GETTER(std::vector<nix::Block>, nix::File, blocks))
             .reg("sections", GETTER(std::vector<nix::Section>, nix::File, sections))
             .reg("deleteBlock", REMOVER(nix::Block, nix::File, deleteBlock))

src/nixfile.cc

@@ -30,20 +30,17 @@ void open(const extractor &input, infusor &output)
     output.set(0, h);
 }
 
-void describe(const extractor &input, infusor &output)
-{
-    nix::File fd = input.entity<nix::File>(1);
-
+mxArray *describe(const nix::File &fd) {
     struct_builder sb({ 1 }, { "format", "version", "location", "createdAt", "updatedAt" });
     sb.set(fd.format());
     sb.set(fd.version());
     sb.set(fd.location());
     sb.set(static_cast<uint64_t>(fd.createdAt()));
     sb.set(static_cast<uint64_t>(fd.updatedAt()));
-  
-    output.set(0, sb.array());
+    return sb.array();
 }
 
+
 void list_blocks(const extractor &input, infusor &output)
 {
     nix::File fd = input.entity<nix::File>(1);

src/nixfile.h

@@ -7,7 +7,7 @@ namespace nixfile {
 
 void open(const extractor &input, infusor &output);
 
-void describe(const extractor &input, infusor &output);
+mxArray *describe(const nix::File &f);
 
 void list_blocks(const extractor &input, infusor &output);
 

src/utils/glue.h

@@ -211,6 +211,34 @@ struct funcbox : box {
     matryoshka_t args;
 };
 
+template<typename Klazz>
+struct getter : box {
+    typedef mxArray *(*get_fun)(const Klazz &k);
+
+    getter(get_fun f) : fun(f) { }
+
+    void operator()(const extractor &input, infusor &output) {
+        Klazz entity = input.entity<Klazz>(1);
+        mxArray *res = fun(entity);
+        output.set(0, res);
+    }
+
+    get_fun fun;
+};
+
+
+struct fntbox : box {
+    typedef void(*fn_t)(const extractor &input, infusor &output);
+
+    fntbox(fn_t f) : fun(f) { }
+
+    void operator()(const extractor &input, infusor &output) {
+        fun(input, output);
+    }
+
+private:
+    fn_t fun;
+};
 
 };
 
@@ -228,8 +256,14 @@ struct registry {
         return false;
     }
 
-    void add(const std::string &name, funky::box *b) {
+    registry& add(const std::string &name, funky::box *b) {
         funcs[name] = b;
+        return *this;
+    }
+
+    registry &add(const std::string &name, funky::fntbox::fn_t fun) {
+        funky::box *b = new funky::fntbox(fun);
+        return add(name, b);
     }
 
     ~registry() {
@@ -255,6 +289,18 @@ struct classdef {
         return *this;
     }
 
+    classdef &desc(typename funky::getter<Klass>::get_fun fun) {
+        funky::box *b = new funky::getter<Klass>(fun);
+        lib->add(prefix + "::describe", b);
+        return *this;
+    }
+
+    classdef &add(const std::string &name, funky::fntbox::fn_t fun) {
+        lib->add(prefix + "::" + name, fun);
+        return *this;
+    }
+
+
 private:
     std::string  prefix;
     registry    *lib;