From 927235d8713e26c344d0bfd0dae74922bb390309 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Markus=20Gro=C3=9F?= <markusgross@me.com>
Date: Fri, 29 Jun 2012 07:42:16 +0200
Subject: [PATCH 1/5] Add templated constructor to Boxed_Number to allow
 creating from primitive number types.

---
 include/chaiscript/dispatchkit/boxed_number.hpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/include/chaiscript/dispatchkit/boxed_number.hpp b/include/chaiscript/dispatchkit/boxed_number.hpp
index 89775d3..1fe4e95 100644
--- a/include/chaiscript/dispatchkit/boxed_number.hpp
+++ b/include/chaiscript/dispatchkit/boxed_number.hpp
@@ -313,6 +313,11 @@ namespace chaiscript
         validate_boxed_number(v);
       }
 
+      template<typename T> explicit Boxed_Number(T t)
+        : bv(Boxed_Value(t))
+      {
+        validate_boxed_number(bv);
+      }
 
       bool operator==(const Boxed_Number &t_rhs) const
       {

From dfcc415c317519452545c436c6c6a70dba58a1bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Markus=20Gro=C3=9F?= <markusgross@me.com>
Date: Fri, 29 Jun 2012 08:00:00 +0200
Subject: [PATCH 2/5] Add getAs<T> function to Boxed_Number to enable casting
 to a target type.

---
 .../chaiscript/dispatchkit/boxed_number.hpp   | 48 ++++++++++++++++++-
 1 file changed, 47 insertions(+), 1 deletion(-)

diff --git a/include/chaiscript/dispatchkit/boxed_number.hpp b/include/chaiscript/dispatchkit/boxed_number.hpp
index 1fe4e95..ccb93d1 100644
--- a/include/chaiscript/dispatchkit/boxed_number.hpp
+++ b/include/chaiscript/dispatchkit/boxed_number.hpp
@@ -298,7 +298,12 @@ namespace chaiscript
             throw boost::bad_any_cast();
           }
         }
-      
+
+        template<typename Target, typename Source>
+          Target getAsAux()
+        {
+          return static_cast<Target>(*static_cast<const Source *>(bv.get_const_ptr()));
+        }
 
       
     public:
@@ -319,6 +324,47 @@ namespace chaiscript
         validate_boxed_number(bv);
       }
 
+      template<typename Target> Target getAs()
+      {
+        const Type_Info &inp_ = bv.get_type_info();
+
+        if (inp_ == typeid(int)) {
+          return getAsAux<Target, int>();
+        } else if (inp_ == typeid(double)) {
+          return getAsAux<Target, double>();
+        } else if (inp_ == typeid(float)) {
+          return getAsAux<Target, float>();
+        } else if (inp_ == typeid(long double)) {
+          return getAsAux<Target, long double>();
+        } else if (inp_ == typeid(char)) {
+          return getAsAux<Target, char>();
+        } else if (inp_ == typeid(unsigned int)) {
+          return getAsAux<Target, unsigned int>();
+        } else if (inp_ == typeid(long)) {
+          return getAsAux<Target, long>();
+        } else if (inp_ == typeid(unsigned long)) {
+          return getAsAux<Target, unsigned long>();
+        } else if (inp_ == typeid(boost::int8_t)) {
+          return getAsAux<Target, boost::int8_t>();
+        } else if (inp_ == typeid(boost::int16_t)) {
+          return getAsAux<Target, boost::int16_t>();
+        } else if (inp_ == typeid(boost::int32_t)) {
+          return getAsAux<Target, boost::int32_t>();
+        } else if (inp_ == typeid(boost::int64_t)) {
+          return getAsAux<Target, boost::int64_t>();
+        } else if (inp_ == typeid(boost::uint8_t)) {
+          return getAsAux<Target, boost::uint8_t>();
+        } else if (inp_ == typeid(boost::uint16_t)) {
+          return getAsAux<Target, boost::uint16_t>();
+        } else if (inp_ == typeid(boost::uint32_t)) {
+          return getAsAux<Target, boost::uint32_t>();
+        } else if (inp_ == typeid(boost::uint64_t)) {
+          return getAsAux<Target, boost::uint64_t>();
+        } else {
+          throw boost::bad_any_cast();
+        }
+      }
+
       bool operator==(const Boxed_Number &t_rhs) const
       {
         return boxed_cast<bool>(oper(Operators::equals, this->bv, t_rhs.bv));

From f8feaf6ea867aec5c3118bd504ef043f0a47c248 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Markus=20Gro=C3=9F?= <markusgross@me.com>
Date: Fri, 29 Jun 2012 16:48:53 +0200
Subject: [PATCH 3/5] Add toString function to Boxed_Number.

For uint8_t, int8_t and char the value is first
converted to an appropriate int type.
This way the value is converted to a number
rather than a character.
---
 .../chaiscript/dispatchkit/boxed_number.hpp   | 49 +++++++++++++++++++
 1 file changed, 49 insertions(+)

diff --git a/include/chaiscript/dispatchkit/boxed_number.hpp b/include/chaiscript/dispatchkit/boxed_number.hpp
index ccb93d1..4a2f94e 100644
--- a/include/chaiscript/dispatchkit/boxed_number.hpp
+++ b/include/chaiscript/dispatchkit/boxed_number.hpp
@@ -305,6 +305,14 @@ namespace chaiscript
           return static_cast<Target>(*static_cast<const Source *>(bv.get_const_ptr()));
         }
 
+        template<typename Source>
+          std::string toStringAux(const Boxed_Value &v)
+        {
+          std::ostringstream oss;
+          oss << *static_cast<const Source *>(v.get_const_ptr());
+          return oss.str();
+        }
+
       
     public:
       Boxed_Number()
@@ -365,6 +373,47 @@ namespace chaiscript
         }
       }
 
+      std::string toString()
+      {
+        const Type_Info &inp_ = bv.get_type_info();
+
+        if (inp_ == typeid(int)) {
+          return toStringAux<int>(bv);
+        } else if (inp_ == typeid(double)) {
+          return toStringAux<double>(bv);
+        } else if (inp_ == typeid(float)) {
+          return toStringAux<float>(bv);
+        } else if (inp_ == typeid(long double)) {
+          return toStringAux<long double>(bv);
+        } else if (inp_ == typeid(char)) {
+          return toStringAux<int>(Boxed_Value(getAsAux<int, char>()));
+        } else if (inp_ == typeid(unsigned int)) {
+          return toStringAux<unsigned int>(bv);
+        } else if (inp_ == typeid(long)) {
+          return toStringAux<long>(bv);
+        } else if (inp_ == typeid(unsigned long)) {
+          return toStringAux<unsigned long>(bv);
+        } else if (inp_ == typeid(boost::int8_t)) {
+          return toStringAux<int>(Boxed_Value(getAsAux<int, boost::int8_t>()));
+        } else if (inp_ == typeid(boost::int16_t)) {
+          return toStringAux<boost::int16_t>(bv);
+        } else if (inp_ == typeid(boost::int32_t)) {
+          return toStringAux<boost::int32_t>(bv);
+        } else if (inp_ == typeid(boost::int64_t)) {
+          return toStringAux<boost::int64_t>(bv);
+        } else if (inp_ == typeid(boost::uint8_t)) {
+          return toStringAux<unsigned int>(Boxed_Value(getAsAux<unsigned int, boost::uint8_t>()));
+        } else if (inp_ == typeid(boost::uint16_t)) {
+          return toStringAux<boost::uint16_t>(bv);
+        } else if (inp_ == typeid(boost::uint32_t)) {
+          return toStringAux<boost::uint32_t>(bv);
+        } else if (inp_ == typeid(boost::uint64_t)) {
+          return toStringAux<boost::uint64_t>(bv);
+        } else {
+          throw boost::bad_any_cast();
+        }
+      }
+
       bool operator==(const Boxed_Number &t_rhs) const
       {
         return boxed_cast<bool>(oper(Operators::equals, this->bv, t_rhs.bv));

From 935276fccd591d5c984da98c71939dadbd87677a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Markus=20Gro=C3=9F?= <markusgross@me.com>
Date: Tue, 3 Jul 2012 18:42:04 +0200
Subject: [PATCH 4/5] Adapt getAs function to proper naming scheme.

---
 .../chaiscript/dispatchkit/boxed_number.hpp   | 36 +++++++++----------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/include/chaiscript/dispatchkit/boxed_number.hpp b/include/chaiscript/dispatchkit/boxed_number.hpp
index 4a2f94e..6ad614f 100644
--- a/include/chaiscript/dispatchkit/boxed_number.hpp
+++ b/include/chaiscript/dispatchkit/boxed_number.hpp
@@ -300,7 +300,7 @@ namespace chaiscript
         }
 
         template<typename Target, typename Source>
-          Target getAsAux()
+          Target get_as_aux()
         {
           return static_cast<Target>(*static_cast<const Source *>(bv.get_const_ptr()));
         }
@@ -332,42 +332,42 @@ namespace chaiscript
         validate_boxed_number(bv);
       }
 
-      template<typename Target> Target getAs()
+      template<typename Target> Target get_as()
       {
         const Type_Info &inp_ = bv.get_type_info();
 
         if (inp_ == typeid(int)) {
-          return getAsAux<Target, int>();
+          return get_as_aux<Target, int>();
         } else if (inp_ == typeid(double)) {
-          return getAsAux<Target, double>();
+          return get_as_aux<Target, double>();
         } else if (inp_ == typeid(float)) {
-          return getAsAux<Target, float>();
+          return get_as_aux<Target, float>();
         } else if (inp_ == typeid(long double)) {
-          return getAsAux<Target, long double>();
+          return get_as_aux<Target, long double>();
         } else if (inp_ == typeid(char)) {
-          return getAsAux<Target, char>();
+          return get_as_aux<Target, char>();
         } else if (inp_ == typeid(unsigned int)) {
-          return getAsAux<Target, unsigned int>();
+          return get_as_aux<Target, unsigned int>();
         } else if (inp_ == typeid(long)) {
-          return getAsAux<Target, long>();
+          return get_as_aux<Target, long>();
         } else if (inp_ == typeid(unsigned long)) {
-          return getAsAux<Target, unsigned long>();
+          return get_as_aux<Target, unsigned long>();
         } else if (inp_ == typeid(boost::int8_t)) {
-          return getAsAux<Target, boost::int8_t>();
+          return get_as_aux<Target, boost::int8_t>();
         } else if (inp_ == typeid(boost::int16_t)) {
-          return getAsAux<Target, boost::int16_t>();
+          return get_as_aux<Target, boost::int16_t>();
         } else if (inp_ == typeid(boost::int32_t)) {
-          return getAsAux<Target, boost::int32_t>();
+          return get_as_aux<Target, boost::int32_t>();
         } else if (inp_ == typeid(boost::int64_t)) {
-          return getAsAux<Target, boost::int64_t>();
+          return get_as_aux<Target, boost::int64_t>();
         } else if (inp_ == typeid(boost::uint8_t)) {
-          return getAsAux<Target, boost::uint8_t>();
+          return get_as_aux<Target, boost::uint8_t>();
         } else if (inp_ == typeid(boost::uint16_t)) {
-          return getAsAux<Target, boost::uint16_t>();
+          return get_as_aux<Target, boost::uint16_t>();
         } else if (inp_ == typeid(boost::uint32_t)) {
-          return getAsAux<Target, boost::uint32_t>();
+          return get_as_aux<Target, boost::uint32_t>();
         } else if (inp_ == typeid(boost::uint64_t)) {
-          return getAsAux<Target, boost::uint64_t>();
+          return get_as_aux<Target, boost::uint64_t>();
         } else {
           throw boost::bad_any_cast();
         }

From 08d9d9e28e0e1b10c08af34cc72f315dccd35f9b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Markus=20Gro=C3=9F?= <markusgross@me.com>
Date: Tue, 3 Jul 2012 18:42:27 +0200
Subject: [PATCH 5/5] Adapt toString to proper naming scheme.

---
 .../chaiscript/dispatchkit/boxed_number.hpp   | 36 +++++++++----------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/include/chaiscript/dispatchkit/boxed_number.hpp b/include/chaiscript/dispatchkit/boxed_number.hpp
index 6ad614f..69b4601 100644
--- a/include/chaiscript/dispatchkit/boxed_number.hpp
+++ b/include/chaiscript/dispatchkit/boxed_number.hpp
@@ -306,7 +306,7 @@ namespace chaiscript
         }
 
         template<typename Source>
-          std::string toStringAux(const Boxed_Value &v)
+          std::string to_string_aux(const Boxed_Value &v)
         {
           std::ostringstream oss;
           oss << *static_cast<const Source *>(v.get_const_ptr());
@@ -373,42 +373,42 @@ namespace chaiscript
         }
       }
 
-      std::string toString()
+      std::string to_string()
       {
         const Type_Info &inp_ = bv.get_type_info();
 
         if (inp_ == typeid(int)) {
-          return toStringAux<int>(bv);
+          return to_string_aux<int>(bv);
         } else if (inp_ == typeid(double)) {
-          return toStringAux<double>(bv);
+          return to_string_aux<double>(bv);
         } else if (inp_ == typeid(float)) {
-          return toStringAux<float>(bv);
+          return to_string_aux<float>(bv);
         } else if (inp_ == typeid(long double)) {
-          return toStringAux<long double>(bv);
+          return to_string_aux<long double>(bv);
         } else if (inp_ == typeid(char)) {
-          return toStringAux<int>(Boxed_Value(getAsAux<int, char>()));
+          return to_string_aux<int>(Boxed_Value(get_as_aux<int, char>()));
         } else if (inp_ == typeid(unsigned int)) {
-          return toStringAux<unsigned int>(bv);
+          return to_string_aux<unsigned int>(bv);
         } else if (inp_ == typeid(long)) {
-          return toStringAux<long>(bv);
+          return to_string_aux<long>(bv);
         } else if (inp_ == typeid(unsigned long)) {
-          return toStringAux<unsigned long>(bv);
+          return to_string_aux<unsigned long>(bv);
         } else if (inp_ == typeid(boost::int8_t)) {
-          return toStringAux<int>(Boxed_Value(getAsAux<int, boost::int8_t>()));
+          return to_string_aux<int>(Boxed_Value(get_as_aux<int, boost::int8_t>()));
         } else if (inp_ == typeid(boost::int16_t)) {
-          return toStringAux<boost::int16_t>(bv);
+          return to_string_aux<boost::int16_t>(bv);
         } else if (inp_ == typeid(boost::int32_t)) {
-          return toStringAux<boost::int32_t>(bv);
+          return to_string_aux<boost::int32_t>(bv);
         } else if (inp_ == typeid(boost::int64_t)) {
-          return toStringAux<boost::int64_t>(bv);
+          return to_string_aux<boost::int64_t>(bv);
         } else if (inp_ == typeid(boost::uint8_t)) {
-          return toStringAux<unsigned int>(Boxed_Value(getAsAux<unsigned int, boost::uint8_t>()));
+          return to_string_aux<unsigned int>(Boxed_Value(get_as_aux<unsigned int, boost::uint8_t>()));
         } else if (inp_ == typeid(boost::uint16_t)) {
-          return toStringAux<boost::uint16_t>(bv);
+          return to_string_aux<boost::uint16_t>(bv);
         } else if (inp_ == typeid(boost::uint32_t)) {
-          return toStringAux<boost::uint32_t>(bv);
+          return to_string_aux<boost::uint32_t>(bv);
         } else if (inp_ == typeid(boost::uint64_t)) {
-          return toStringAux<boost::uint64_t>(bv);
+          return to_string_aux<boost::uint64_t>(bv);
         } else {
           throw boost::bad_any_cast();
         }