Added a list template class, seems to work pretty well for now, I may have

forgotten proper cleanup in the deconstructor, but besides that you can do
almost everything you need.  I'll make a slist/stack next, probably with the
same basic code, just a different structure (not doubley-linked).

The xml system from old-libbu++ is almost completely converted, I was going to
re-write it, but this seemed easier at first, it may not have been, we'll see.
It almost parses everything again, and almost outputs again, and it does use
streams now.

The FString is partway to doing minimum chunk allocations, so that adding
single-characters will be really fast up to the minimum chunk size.  I also
figured out how to add this optimization without any extra variables taking
up space, and it's optional in the template, which is cool.  You can specify
the size of the blocks (default 256 bytes), if it's 0 then they'll be like the
old FString, 1 chunk per operation.

The next FString update should be allowing efficient removal from the begining
of the string by faking it, and simply moving a secondary base pointer ahead,
and then optimizing appends after that fact to simply move the existing data
around if you shouldn't have to re-allocate (alla FlexBuf).  The final fun
addition that I'm planning is a simple switch in the template (boolean) that
will switch an FString into a thread-safe mode without changing the interface
or anything that you can do with them at all.  It may increasing memory usage,
but they should still be better than std::strings, and totally thread-safe.

The best part of that is that if it's done with a boolean template parameter and
if statements that only test that parameter controlling flow, the code that you
don't want (threadsafe/non-threadsafe) won't be included at all
post-optimization.

1 files changed, 17 insertions, 14 deletions

diff --git a/src/xmlreader.h b/src/xmlreader.h
index c8f7202..7c85ddb 100644
--- a/src/xmlreader.h
+++ b/src/xmlreader.h
@@ -2,10 +2,10 @@
 #define XMLREADER
 
 #include <stdio.h>
-#include "xmldocument.h"
-#include "flexbuf.h"
-#include "hashtable.h"
-#include "staticstring.h"
+#include "bu/xmldocument.h"
+#include "bu/hash.h"
+#include "bu/fstring.h"
+#include "bu/stream.h"
 
 /**
  * Takes care of reading in xml formatted data from a file.  This could/should
@@ -32,7 +32,7 @@ public:
          * in content, a-la html.
          *@param bStrip Strip out leading and trailing whitespace?
          */
-        XmlReader( bool bStrip=false );
+        XmlReader( Bu::Stream &sIn, bool bStrip=false );
 
         /**
          * Destroy this XmlReader.
@@ -54,12 +54,12 @@ private:
          *@returns A single character at the requested position, or 0 for end of
          * stream.
          */
-        virtual char getChar( int nIndex = 0 ) = 0;
+        virtual char getChar( int nIndex = 0 );
 
         /**
          * Called to increment the current stream position by a single character.
          */
-        virtual void usedChar( int nAmnt = 1) = 0;
+        virtual void usedChar( int nAmnt = 1 );
 
         /**
          * Automoton function: is whitespace.
@@ -108,9 +108,9 @@ private:
          *@param name The name of the entity
          *@param value The value of the entity
          */
-        void addEntity( const char *name, const char *value );
+        void addEntity( const Bu::FString &name, const Bu::FString &value );
 
-        StaticString *getEscape();
+        Bu::FString getEscape();
 
         /**
          * Automoton function: paramlist.  Processes a list of node params.
@@ -130,12 +130,15 @@ private:
          */
         bool content();
         
-        FlexBuf fbContent;              /**< buffer for the current node's content. */
-        FlexBuf fbParamName;    /**< buffer for the current param's name. */
-        FlexBuf fbParamValue;   /**< buffer for the current param's value. */
-        bool bStrip;    /**< Are we stripping whitespace? */
+        Bu::FString sContent;           /**< buffer for the current node's content. */
+        Bu::FString sParamName;         /**< buffer for the current param's name. */
+        Bu::FString sParamValue;        /**< buffer for the current param's value. */
+        Bu::Stream &sIn;
+        bool bStrip;                    /**< Are we stripping whitespace? */
 
-        HashTable htEntity;             /**< Entity type definitions. */
+        Bu::Hash<Bu::FString,Bu::FString> htEntity;             /**< Entity type definitions. */
+
+        Bu::FString sBuf;
 };
 
 #endif