diff options
author | Josh Blum | 2013-07-05 14:13:37 -0700 |
---|---|---|
committer | Josh Blum | 2013-07-05 14:13:37 -0700 |
commit | 086cf85eca88941819909f5877d9558aaa761b72 (patch) | |
tree | 750197523499df923b69dc2cdf0f8003e7d8a02a /lib | |
parent | bc8165bcc3a2703d8fd3d17925b6bcb55ddff6ef (diff) | |
download | sandhi-086cf85eca88941819909f5877d9558aaa761b72.tar.gz sandhi-086cf85eca88941819909f5877d9558aaa761b72.tar.bz2 sandhi-086cf85eca88941819909f5877d9558aaa761b72.zip |
gras: revert block changes, test w/ callable now
Diffstat (limited to 'lib')
-rw-r--r-- | lib/block_props.cpp | 15 | ||||
-rw-r--r-- | lib/gras_impl/block_data.hpp | 2 |
2 files changed, 0 insertions, 17 deletions
diff --git a/lib/block_props.cpp b/lib/block_props.cpp index fc4c755..ae687be 100644 --- a/lib/block_props.cpp +++ b/lib/block_props.cpp @@ -5,9 +5,6 @@ using namespace gras; -FunctionRegistry::FunctionRegistry(void){} -FunctionRegistry::~FunctionRegistry(void){} - PropertyRegistry::PropertyRegistry(void){} PropertyRegistry::~PropertyRegistry(void){} @@ -116,15 +113,3 @@ 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 664ee5a..cbc657e 100644 --- a/lib/gras_impl/block_data.hpp +++ b/lib/gras_impl/block_data.hpp @@ -18,7 +18,6 @@ namespace gras { -typedef boost::shared_ptr<FunctionRegistry> FunctionRegistrySptr; typedef boost::shared_ptr<PropertyRegistry> PropertyRegistrySptr; struct PropertyRegistryPair { @@ -83,7 +82,6 @@ struct BlockData //property stuff std::map<std::string, PropertyRegistryPair> property_registry; - std::map<std::string, FunctionRegistrySptr> function_registry; BlockStats stats; }; |