1 files changed, 32 insertions, 16 deletions

diff --git a/src/variable.h b/src/variable.h
index c9665f5..0236951 100644
--- a/src/variable.h
+++ b/src/variable.h
@@ -8,20 +8,22 @@
 
 class Variable
 {
+friend uint32_t Bu::__calcHashCode<Variable>( const Variable &k );
 public:
         enum Type
         {
-                Null,
-                Int,
-                Float,
-                Bool,
-                String,
-                List,
-                Dictionary
+                tNull,
+                tBool,
+                tInt,
+                tFloat,
+                tString,
+                tList,
+                tDictionary
         };
 
 public:
         Variable();
+        Variable( const Variable &src );
         Variable( Type eType );
         Variable( int64_t iValue );
         Variable( double fValue );
@@ -29,20 +31,27 @@ public:
         Variable( const Bu::String &sValue );
         virtual ~Variable();
 
+        Type getType() const { return eType; }
+
         Variable &operator=( const Variable &rhs );
         Variable &operator+=( const Variable &rhs );
         Variable &operator-=( const Variable &rhs );
         Variable &operator*=( const Variable &rhs );
         Variable &operator/=( const Variable &rhs );
-        Variable &operator+( const Variable &rhs );
-        Variable &operator-( const Variable &rhs );
-        Variable &operator*( const Variable &rhs );
-        Variable &operator/( const Variable &rhs );
-        Variable &operator!=( const Variable &rhs );
-        Variable &operator>( const Variable &rhs );
-        Variable &operator<( const Variable &rhs );
-        Variable &operator>=( const Variable &rhs );
-        Variable &operator<=( const Variable &rhs );
+        Variable &operator+( const Variable &rhs ) const;
+        Variable &operator-( const Variable &rhs ) const;
+        Variable &operator*( const Variable &rhs ) const;
+        Variable &operator/( const Variable &rhs ) const;
+        bool operator==( const Variable &rhs ) const;
+        bool operator!=( const Variable &rhs ) const;
+        bool operator>( const Variable &rhs ) const;
+        bool operator<( const Variable &rhs ) const;
+        bool operator>=( const Variable &rhs ) const;
+        bool operator<=( const Variable &rhs ) const;
+
+private:
+        void initType();
+        void deinitType();
 
 private:
         Type eType;
@@ -61,4 +70,11 @@ private:
         };
 };
 
+namespace Bu
+{
+        template<> uint32_t __calcHashCode<Variable>( const Variable &k );
+        template<> bool __cmpHashKeys<Variable>( const Variable &a, const Variable &b );
+}
+
+
 #endif