gras: function registry is more flexible

2 files changed, 17 insertions, 0 deletions

diff --git a/lib/block_props.cpp b/lib/block_props.cpp
index ae687be..fc4c755 100644
--- a/lib/block_props.cpp
+++ b/lib/block_props.cpp
@@ -5,6 +5,9 @@
 
 using namespace gras;
 
+FunctionRegistry::FunctionRegistry(void){}
+FunctionRegistry::~FunctionRegistry(void){}
+
 PropertyRegistry::PropertyRegistry(void){}
 PropertyRegistry::~PropertyRegistry(void){}
 
@@ -113,3 +116,15 @@ PMCC Block::_get_property(const std::string &key)
 {
     return prop_access_dispatcher((*this)->block_actor, key, PMCC(), false);
 }
+
+
+void Block::_register_function(const std::string &key, void *fr)
+{
+    (*this)->block_data->function_registry[key].reset(reinterpret_cast<FunctionRegistry *>(fr));
+}
+
+PMCC Block::_handle_function_access(const std::string &key, const std::vector<PMCC> &args)
+{
+    //TODO this is testing -- needs to call actor instead
+    return (*this)->block_data->function_registry[key]->call(args);
+}
diff --git a/lib/gras_impl/block_data.hpp b/lib/gras_impl/block_data.hpp
index cbc657e..664ee5a 100644
--- a/lib/gras_impl/block_data.hpp
+++ b/lib/gras_impl/block_data.hpp
@@ -18,6 +18,7 @@
 namespace gras
 {
 
+typedef boost::shared_ptr<FunctionRegistry> FunctionRegistrySptr;
 typedef boost::shared_ptr<PropertyRegistry> PropertyRegistrySptr;
 struct PropertyRegistryPair
 {
@@ -82,6 +83,7 @@ struct BlockData
 
     //property stuff
     std::map<std::string, PropertyRegistryPair> property_registry;
+    std::map<std::string, FunctionRegistrySptr> function_registry;
 
     BlockStats stats;
 };