From dc11237af933b9dd75262bc25934008c4e5a95db Mon Sep 17 00:00:00 2001
From: Jason Turner <lefticus@gmail.com>
Date: Sun, 21 Jun 2009 18:09:00 +0000
Subject: [PATCH] Add build_functor algorithm for constructing a boost
 function_object from a script snippet

---
 chaiscript/callbacktest.cpp   |  8 +++++++-
 dispatchkit/boxed_value.hpp   |  1 +
 dispatchkit/dispatchkit.hpp   |  2 ++
 dispatchkit/function_call.hpp | 10 ++++++++++
 4 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/chaiscript/callbacktest.cpp b/chaiscript/callbacktest.cpp
index 707ea74d..01bb9f9a 100644
--- a/chaiscript/callbacktest.cpp
+++ b/chaiscript/callbacktest.cpp
@@ -1,7 +1,7 @@
 #include <iostream>
 
-#include "chaiscript.hpp"
 #include "function_call.hpp"
+#include "chaiscript.hpp"
 #include <boost/function.hpp>
 
 struct Callback_Handler
@@ -53,5 +53,11 @@ int main(int argc, char *argv[]) {
     }
 
     cb_handler.do_callbacks();
+
+    boost::function<std::string (const std::string&, const std::string &)> f = 
+      dispatchkit::build_functor<std::string (const std::string &, const std::string &)>
+        (chai, "function(x, y) { x + y }");
+
+    std::cout << "Functor call: " << f("Hello", " World") << std::endl;
 }
 
diff --git a/dispatchkit/boxed_value.hpp b/dispatchkit/boxed_value.hpp
index 2f559c2f..1f084037 100644
--- a/dispatchkit/boxed_value.hpp
+++ b/dispatchkit/boxed_value.hpp
@@ -2,6 +2,7 @@
 #define __boxed_value_hpp__
 
 #include "type_info.hpp"
+#include <map>
 #include <boost/shared_ptr.hpp>
 #include <boost/any.hpp>
 #include <boost/function.hpp>
diff --git a/dispatchkit/dispatchkit.hpp b/dispatchkit/dispatchkit.hpp
index 2466f03b..435ae0b9 100644
--- a/dispatchkit/dispatchkit.hpp
+++ b/dispatchkit/dispatchkit.hpp
@@ -222,6 +222,8 @@ namespace dispatchkit
     }
     std::cout << std::endl;
   }
+
+
 }
 
 #endif
diff --git a/dispatchkit/function_call.hpp b/dispatchkit/function_call.hpp
index d969253e..bbc63dbd 100644
--- a/dispatchkit/function_call.hpp
+++ b/dispatchkit/function_call.hpp
@@ -11,6 +11,9 @@
 #include <boost/shared_ptr.hpp>
 #include <boost/bind.hpp>
 #include <boost/function.hpp>
+#include <string>
+#include <vector>
+#include "proxy_functions.hpp"
 
 namespace dispatchkit
 {
@@ -58,6 +61,13 @@ namespace dispatchkit
         FunctionType *p;
         return build_function_caller_helper(p, func);
       }
+
+
+  template<typename FunctionType, typename ScriptEngine>
+    boost::function<FunctionType> build_functor(ScriptEngine &e, const std::string &script)
+    {
+      return build_function_caller<FunctionType>(Cast_Helper<boost::shared_ptr<Proxy_Function> >()(e.evaluate_string(script)));
+    }
 }
 
 # endif