From 1c334064e853b34328c31d9f0d7e5a33b572dc5a Mon Sep 17 00:00:00 2001
From: Jason Turner <lefticus@gmail.com>
Date: Sun, 7 Jun 2009 00:57:29 +0000
Subject: [PATCH] operator= support in bootstrap code

---
 boxedcpp/bootstrap.hpp     | 17 +++++++++++++++++
 boxedcpp/bootstrap_stl.hpp |  4 +---
 wesley/main.cpp            |  2 ++
 3 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/boxedcpp/bootstrap.hpp b/boxedcpp/bootstrap.hpp
index 00357e2..a691361 100644
--- a/boxedcpp/bootstrap.hpp
+++ b/boxedcpp/bootstrap.hpp
@@ -41,6 +41,12 @@ bool bool_or(P1 p1, P2 p2)
   return p1 || p2;
 }
 
+template<typename P1, typename P2>
+P1 &assign(P1 &p1, const P2 &p2)
+{
+  return (p1 = p2);
+}
+
 template<typename P1, typename P2>
 bool equals(P1 p1, P2 p2)
 {
@@ -138,6 +144,12 @@ void add_oper_not_equals(BoxedCPP_System &s)
   register_function(s, &not_equals<const T&, const T&>, "!=");
 }
 
+template<typename T>
+void add_oper_assign(BoxedCPP_System &s)
+{
+  register_function(s, &assign<T,T>, "=");
+}
+
 template<typename T>
 void add_oper_less_than(BoxedCPP_System &s)
 {
@@ -220,6 +232,11 @@ void bootstrap(BoxedCPP_System &s)
   add_opers_comparison<char>(s);
   add_opers_comparison<std::string>(s);
 
+  add_oper_assign<int>(s);
+  add_oper_assign<double>(s);
+  add_oper_assign<char>(s);
+  add_oper_assign<std::string>(s);
+
   add_opers_comparison_overload<int, double>(s);
   add_opers_comparison_overload<double, int>(s);
 
diff --git a/boxedcpp/bootstrap_stl.hpp b/boxedcpp/bootstrap_stl.hpp
index aab67df..30cb143 100644
--- a/boxedcpp/bootstrap_stl.hpp
+++ b/boxedcpp/bootstrap_stl.hpp
@@ -24,10 +24,8 @@ void bootstrap_random_access_container(BoxedCPP_System &system, const std::strin
 template<typename Assignable>
 void bootstrap_assignable(BoxedCPP_System &system, const std::string &type)
 {
-  /*
   system.register_function(
-      boost::function<Assignable &(Assignable*, Assignable&)>(&Assignable::operator=), "=");
-      */
+      boost::function<Assignable &(Assignable*, const Assignable&)>(&Assignable::operator=), "=");
 }
 
 template<typename ContainerType>
diff --git a/wesley/main.cpp b/wesley/main.cpp
index d39c17d..7ac21da 100644
--- a/wesley/main.cpp
+++ b/wesley/main.cpp
@@ -441,6 +441,8 @@ BoxedCPP_System build_eval_system() {
     register_function(ss, &print<size_t>, "print");
     register_function(ss, &concat_string, "concat_string");
     register_function(ss, &print<int>, "print");
+    
+    ss.register_function(boost::function<void ()>(boost::bind(&dump_system, boost::ref(ss))), "dump_system");
 
     ss.register_function(boost::shared_ptr<Proxy_Function>(
           new Dynamic_Proxy_Function(boost::bind(&add_two, boost::ref(ss), _1), 2)), "add_two");