4 files changed, 77 insertions, 17 deletions

diff --git a/src/hash.h b/src/hash.h
index a81c355..f6c207f 100644
--- a/src/hash.h
+++ b/src/hash.h
@@ -358,6 +358,25 @@ namespace Bu
                                                 );
                         }
                 }
+                
+                virtual const value &get( key k ) const
+                {
+                        uint32_t hash = __calcHashCode( k );
+                        bool bFill;
+                        uint32_t nPos = probe( hash, k, bFill );
+
+                        if( bFill )
+                        {
+                                return aValues[nPos];
+                        }
+                        else
+                        {
+                                throw HashException(
+                                                excodeNotFilled,
+                                                "No data assosiated with that key."
+                                                );
+                        }
+                }
 
                 virtual bool has( key k )
                 {
@@ -599,6 +618,38 @@ namespace Bu
                         bFill = false;
                         return nCur;
                 }
+                
+                uint32_t probe( uint32_t hash, key k, bool &bFill, bool rehash=true ) const
+                {
+                        uint32_t nCur = hash%nCapacity;
+
+                        // First we scan to see if the key is already there, abort if we
+                        // run out of probing room, or we find a non-filled entry
+                        for( int8_t j = 0;
+                                isFilled( nCur ) && j < 32;
+                                nCur = (nCur + (1<<j))%nCapacity, j++
+                                )
+                        {
+                                // Is this the same hash code we were looking for?
+                                if( hash == aHashCodes[nCur] )
+                                {
+                                        // Skip over deleted entries.  Deleted entries are also filled,
+                                        // so we only have to do this check here.
+                                        if( isDeleted( nCur ) )
+                                                continue;
+
+                                        // Is it really the same key? (for safety)
+                                        if( __cmpHashKeys( aKeys[nCur], k ) == true )
+                                        {
+                                                bFill = true;
+                                                return nCur;
+                                        }
+                                }
+                        }
+
+                        bFill = false;
+                        return nCur;
+                }
 
                 void reHash( uint32_t nNewSize )
                 {
@@ -661,7 +712,7 @@ namespace Bu
                         return (bFilled[loc/32]&(1<<(loc%32)))!=0;
                 }
 
-                virtual bool isDeleted( uint32_t loc )
+                virtual bool isDeleted( uint32_t loc ) const
                 {
                         return (bDeleted[loc/32]&(1<<(loc%32)))!=0;
                 }
diff --git a/src/tafnode.cpp b/src/tafnode.cpp
index ed8adc0..3060606 100644
--- a/src/tafnode.cpp
+++ b/src/tafnode.cpp
@@ -6,13 +6,13 @@ Bu::TafNode::TafNode()
 
 Bu::TafNode::~TafNode()
 {
-        printf("Entering Bu::TafNode::~TafNode() \"%s\"\n", sName.getStr() );
+        //printf("Entering Bu::TafNode::~TafNode() \"%s\"\n", sName.getStr() );
         for( NodeHash::iterator i = hChildren.begin(); i != hChildren.end(); i++ )
         {
                 NodeList &l = i.getValue();
                 for( NodeList::iterator k = l.begin(); k != l.end(); k++ )
                 {
-                        printf("deleting:  [%08X] %s\n", *k, "" );//(*k)->getName().getStr() );
+                        //printf("deleting:  [%08X] %s\n", *k, "" );//(*k)->getName().getStr() );
                         delete (*k);
                 }
         }
@@ -35,27 +35,37 @@ void Bu::TafNode::addChild( TafNode *pNode )
                 hChildren.insert( pNode->getName(), NodeList() );
         }
 
-        printf("Appending \"%s\"\n", pNode->getName().getStr() );
+        //printf("Appending \"%s\"\n", pNode->getName().getStr() );
         hChildren.get( pNode->getName() ).append( pNode );
-        printf("[%08X]\n", hChildren.get( pNode->getName() ).last() );
+        //printf("[%08X]\n", hChildren.get( pNode->getName() ).last() );
 }
 
-const Bu::TafNode::PropList &Bu::TafNode::getProperty( const Bu::FString &sName )
+const Bu::TafNode::PropList &Bu::TafNode::getProperties( const Bu::FString &sName ) const
 {
         return hProp.get( sName );
 }
 
-const Bu::TafNode::NodeList &Bu::TafNode::getNode( const Bu::FString &sName )
+const Bu::TafNode::NodeList &Bu::TafNode::getNodes( const Bu::FString &sName ) const
 {
         return hChildren.get( sName );
 }
 
+const Bu::FString &Bu::TafNode::getProperty( const Bu::FString &sName ) const
+{
+        return getProperties( sName ).first();
+}
+
+const Bu::TafNode *Bu::TafNode::getNode( const Bu::FString &sName ) const
+{
+        return getNodes( sName ).first();
+}
+
 void Bu::TafNode::setName( const Bu::FString &sName )
 {
         this->sName = sName;
 }
 
-const Bu::FString &Bu::TafNode::getName()
+const Bu::FString &Bu::TafNode::getName() const
 {
         return sName;
 }
diff --git a/src/tafnode.h b/src/tafnode.h
index a570d2d..10232d2 100644
--- a/src/tafnode.h
+++ b/src/tafnode.h
@@ -24,11 +24,13 @@ namespace Bu
                 virtual ~TafNode();
 
                 void setName( const Bu::FString &sName );
-                const Bu::FString &getName();
+                const Bu::FString &getName() const;
 
                 void setProperty( Bu::FString sName, Bu::FString sValue );
-                const PropList &getProperty( const Bu::FString &sName );
-                const NodeList &getNode( const Bu::FString &sName );
+                const Bu::FString &getProperty( const Bu::FString &sName ) const;
+                const TafNode *getNode( const Bu::FString &sName ) const;
+                const PropList &getProperties( const Bu::FString &sName ) const;
+                const NodeList &getNodes( const Bu::FString &sName ) const;
                 void addChild( TafNode *pNode );
 
         private:
diff --git a/src/tests/taf.cpp b/src/tests/taf.cpp
index f7af2b2..e7bad52 100644
--- a/src/tests/taf.cpp
+++ b/src/tests/taf.cpp
@@ -8,12 +8,9 @@ int main()
 
         Bu::TafNode *pNode = tr.getNode();
 
-        const Bu::TafNode::NodeList &l = pNode->getNode("stats");
-        for( Bu::TafNode::NodeList::const_iterator i = l.begin();
-                 i != l.end(); i++ )
-        {
-                printf("%s\n", (*i)->getName().getStr() );
-        }
+        const Bu::TafNode *pStats = pNode->getNode("stats");
+        printf("%s\n", pStats->getName().getStr() );
+        printf("  str = %s\n", pStats->getProperty("str").getStr() );
 
         delete pNode;
 }