LinkType extractor

Author: mpsonntag

src/nixgen.cc

@@ -39,18 +39,4 @@ mxArray *dataset_read_all(const nix::DataSet &da) {
     return data;
 }
 
-nix::LinkType get_link_type(uint8_t ltype)
-{
-    nix::LinkType link_type;
-
-    switch (ltype) {
-    case 0: link_type = nix::LinkType::Tagged; break;
-    case 1: link_type = nix::LinkType::Untagged; break;
-    case 2: link_type = nix::LinkType::Indexed; break;
-    default: throw std::invalid_argument("unkown link type");
-    }
-
-    return link_type;
-}
-
 } // namespace nixgen

src/nixgen.h

@@ -8,8 +8,6 @@ namespace nixgen {
 
     mxArray *dataset_read_all(const nix::DataSet &da);
 
-    nix::LinkType get_link_type(uint8_t ltype);
-
 } // namespace nixgen
 
 #endif

src/nixmultitag.cc

@@ -40,9 +40,7 @@ namespace nixmultitag {
     {
         nix::MultiTag currObj = input.entity<nix::MultiTag>(1);
 
-        nix::LinkType link_type = nixgen::get_link_type(input.num<uint8_t>(3));
-
-        nix::Feature newFeat = currObj.createFeature(input.str(2), link_type);
+        nix::Feature newFeat = currObj.createFeature(input.str(2), input.ltype(3));
         output.set(0, handle(newFeat));
     }
 

src/nixtag.cc

@@ -42,9 +42,7 @@ namespace nixtag {
     {
         nix::Tag currObj = input.entity<nix::Tag>(1);
 
-        nix::LinkType link_type = nixgen::get_link_type(input.num<uint8_t>(3));
-
-        nix::Feature newFeat = currObj.createFeature(input.str(2), link_type);
+        nix::Feature newFeat = currObj.createFeature(input.str(2), input.ltype(3));
         output.set(0, handle(newFeat));
     }
 

src/utils/arguments.h

@@ -106,6 +106,21 @@ class extractor : public argument_helper<const mxArray> {
         return dtype_mex2nix(array[pos]);
     }
 
+    nix::LinkType ltype(size_t pos) const
+    {
+        const uint8_t link_type = num<uint8_t>(pos);
+        nix::LinkType retLinkType;
+
+        switch (link_type) {
+        case 0: retLinkType = nix::LinkType::Tagged; break;
+        case 1: retLinkType = nix::LinkType::Untagged; break;
+        case 2: retLinkType = nix::LinkType::Indexed; break;
+        default: throw std::invalid_argument("unkown link type");
+        }
+
+        return retLinkType;
+    }
+
 	bool logical(size_t pos) const {
 		check_arg_type(pos, nix::DataType::Bool);