Functions can be called now, at least manually.

A little more work needs to be done before they're being called from
code correctly.

1 files changed, 42 insertions, 0 deletions

diff --git a/src/variable.cpp b/src/variable.cpp
index adf1511..b7899f1 100644
--- a/src/variable.cpp
+++ b/src/variable.cpp
@@ -62,6 +62,33 @@ Variable Variable::newSituationName( const Bu::String &s )
         return v;
 }
 
+Variable Variable::newVariableName( const Bu::String &s )
+{
+        Variable v( tVariable );
+        (*v.sValue) = s;
+        return v;
+}
+
+bool Variable::getBool() const
+{
+        return bValue;
+}
+
+int64_t Variable::getInt() const
+{
+        return iValue;
+}
+
+double Variable::getFloat() const
+{
+        return fValue;
+}
+
+Bu::String Variable::getString() const
+{
+        return *sValue;
+}
+
 Variable Variable::to( Type e ) const
 {
         if( e == eType )
@@ -195,6 +222,7 @@ Variable &Variable::operator=( const Variable &rhs )
 
                 case tString:
                 case tSituation:
+                case tVariable:
                         (*sValue) = *rhs.sValue;
                         break;
 
@@ -261,6 +289,10 @@ Variable &Variable::operator+=( const Variable &rhs )
                 case tSituation:
                         throw VariableException("You cannot add situations.");
                         break;
+                
+                case tVariable:
+                        throw VariableException("You cannot add variable names.");
+                        break;
         }
 
         return *this;
@@ -310,6 +342,9 @@ Variable Variable::operator+( const Variable &rhs ) const
                         
                         case tSituation:
                                 throw VariableException("You cannot add situations.");
+                        
+                        case tVariable:
+                                throw VariableException("You cannot add variables.");
                 }
         }
 }
@@ -341,6 +376,7 @@ bool Variable::operator==( const Variable &rhs ) const
 
                 case tString:
                 case tSituation:
+                case tVariable:
                         return (*sValue) == (*rhs.sValue);
 
                 case tList:
@@ -369,6 +405,7 @@ void Variable::initType()
         {
                 case tString:
                 case tSituation:
+                case tVariable:
                         sValue = new Bu::String();
                         break;
 
@@ -388,6 +425,7 @@ void Variable::deinitType()
         {
                 case tString:
                 case tSituation:
+                case tVariable:
                         delete sValue;
                         break;
 
@@ -418,6 +456,7 @@ template<> uint32_t Bu::__calcHashCode<Variable>( const Variable &k )
 
                 case Variable::tString:
                 case Variable::tSituation:
+                case Variable::tVariable:
                         return Bu::__calcHashCode( *k.sValue );
 
                 case Variable::tList:
@@ -453,6 +492,9 @@ Bu::Formatter &operator<<( Bu::Formatter &f, const Variable &v )
 
                 case Variable::tSituation:
                         return f << "<<" << *v.sValue << ">>";
+                
+                case Variable::tVariable:
+                        return f << "(varref:\"" << *v.sValue << "\")";
 
                 case Variable::tList:
                         return f << *v.lValue;