Variables upconvert on add now.

It's not perfect, but it's decent for now, and early testing.

2 files changed, 20 insertions, 2 deletions

diff --git a/src/variable.cpp b/src/variable.cpp
index a3fb4a2..965e1af 100644
--- a/src/variable.cpp
+++ b/src/variable.cpp
@@ -453,6 +453,16 @@ Variable Variable::operator+( const Variable &rhs ) const
 {
         if( eType != rhs.eType )
         {
+                Type eNew = bestType( eType, rhs.eType );
+
+                if( eType != eNew )
+                {
+                        return to( eNew ) + rhs;
+                }
+                else
+                {
+                        return *this + rhs.to( eNew );
+                }
                 throw VariableException("Adding between dissimilar types is not yet supported.");
         }
         else
@@ -868,6 +878,13 @@ void Variable::deinitType()
         iValue = 0;
 }
 
+Variable::Type Variable::bestType( Variable::Type t1, Variable::Type t2 ) const
+{
+        Type tBest = Bu::max( t1, t2 );
+
+        return tBest;
+}
+
 template<> uint32_t Bu::__calcHashCode<Variable>( const Variable &k )
 {
         switch( k.getType() )
diff --git a/src/variable.h b/src/variable.h
index 8741b28..2eedcbb 100644
--- a/src/variable.h
+++ b/src/variable.h
@@ -28,12 +28,12 @@ public:
                 tBool,
                 tInt,
                 tFloat,
-                tString,
                 tSituation,
                 tVariable,
                 tVarPtr,
                 tList,
-                tDictionary
+                tDictionary,
+                tString,
         };
 
 public:
@@ -90,6 +90,7 @@ public:
 private:
         void initType();
         void deinitType();
+        Type bestType( Type t1, Type t2 ) const;
 
 private:
         Type eType;