Lists (arrays) are now properly inedxable.0.02

1 files changed, 13 insertions, 7 deletions

diff --git a/src/variable.cpp b/src/variable.cpp
index 68a1778..0c83133 100644
--- a/src/variable.cpp
+++ b/src/variable.cpp
@@ -113,7 +113,7 @@ Variable *Variable::getVariablePtr() const
         return pValue;
 }
 
-const Variable::VariableList &Variable::getList() const
+const Variable::VariableArray &Variable::getList() const
 {
         return *lValue;
 }
@@ -233,9 +233,12 @@ Variable Variable::to( Type e ) const
 
 void Variable::insert( const Variable &vKey, const Variable &vValue )
 {
-        if( eType != tDictionary )
-                throw Bu::ExceptionBase("Insert on non-dictionary.");
-        hValue->insert( vKey, vValue );
+        if( eType == tDictionary )
+                hValue->insert( vKey, vValue );
+        else if( eType == tList )
+                lValue->get( vKey.getInt() ) = vValue;
+        else
+                throw Bu::ExceptionBase("Insert on non-dictionary and non-list.");
 }
 
 bool Variable::has( const Variable &vKey )
@@ -244,7 +247,8 @@ bool Variable::has( const Variable &vKey )
                 return hValue->has( vKey );
         else if( eType == tList )
         {
-                for( VariableList::const_iterator i = lValue->begin(); i; i++ )
+                for( VariableArray::const_iterator i =
+                         const_cast<const VariableArray *>(lValue)->begin(); i; i++ )
                 {
                         if( (*i) == vKey )
                                 return true;
@@ -259,8 +263,10 @@ Variable &Variable::get( const Variable &vKey )
 {
         if( eType == tDictionary )
                 return hValue->get( vKey );
+        else if( eType == tList )
+                return lValue->get( vKey.getInt() );
         else
-                throw Bu::ExceptionBase("Insert on non-dictionary.");
+                throw Bu::ExceptionBase("Index on non-dictionary and non-list.");
 }
 
 Variable &Variable::operator=( const Variable &rhs )
@@ -1006,7 +1012,7 @@ void Variable::initType()
                         break;
 
                 case tList:
-                        lValue = new VariableList();
+                        lValue = new VariableArray();
                         break;
 
                 case tDictionary: