From 033c41ed57348abb3a418166b1fb39bfad3312de Mon Sep 17 00:00:00 2001 From: Mike Buland Date: Fri, 11 May 2007 07:51:40 +0000 Subject: 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. --- src/xmlwriter.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'src/xmlwriter.h') diff --git a/src/xmlwriter.h b/src/xmlwriter.h index c48e810..7e3c876 100644 --- a/src/xmlwriter.h +++ b/src/xmlwriter.h @@ -31,7 +31,7 @@ public: * this to a tab or some spaces it will never effect the content of your * file. */ - XmlWriter( const char *sIndent=NULL, XmlNode *pRoot=NULL ); + XmlWriter( const Bu::FString &sIndent="", XmlNode *pRoot=NULL ); /** * Destroy the writer. @@ -49,16 +49,16 @@ public: void write(); private: - std::string sIndent; /**< The indent string */ + Bu::FString sIndent; /**< The indent string */ - std::string escape( std::string sIn ); + Bu::FString escape( const Bu::FString &sIn ); /** * Write the file. *@param pNode The root node *@param sIndent The indent text. */ - void write( XmlNode *pNode, const char *sIndent=NULL ); + void write( XmlNode *pNode, const Bu::FString &sIndent ); /** * Write a node in the file, including children. @@ -66,7 +66,7 @@ private: *@param nIndent The indent level (the number of times to include sIndent) *@param sIndent The indent text. */ - void writeNode( XmlNode *pNode, int nIndent, const char *sIndent ); + void writeNode( XmlNode *pNode, int nIndent, const Bu::FString &sIndent ); /** * Write the properties of a node. @@ -74,14 +74,14 @@ private: *@param nIndent The indent level of the containing node *@param sIndent The indent text. */ - void writeNodeProps( XmlNode *pNode, int nIndent, const char *sIndent ); + void writeNodeProps( XmlNode *pNode, int nIndent, const Bu::FString &sIndent ); /** * Called to write the actual indent. *@param nIndent The indent level. *@param sIndent The indent text. */ - void writeIndent( int nIndent, const char *sIndent ); + void writeIndent( int nIndent, const Bu::FString &sIndent ); /** * This is the function that must be overridden in order to use this class. @@ -90,7 +90,7 @@ private: * will break the XML formatting. *@param sString The string data to write to the output. */ - virtual void writeString( const char *sString ) = 0; + virtual void writeString( const Bu::FString &sString ) = 0; }; #endif -- cgit v1.2.3