Entities now work in the xml processor the way they should, you can define your

own, use the 5 builtin ones (gt, lt, apos, quot, amp), and even create your own.
The parser now skips any text definition at the top, which is fine for most xml
that you get these days.  I think if we ever make the break to full compliance
we'll need to make a new parser from scratch.

1 files changed, 23 insertions, 1 deletions

diff --git a/src/xmlreader.h b/src/xmlreader.h
index 4117dfd..a9881cb 100644
--- a/src/xmlreader.h
+++ b/src/xmlreader.h
@@ -4,6 +4,8 @@
 #include <stdio.h>
 #include "xmldocument.h"
 #include "flexbuf.h"
+#include "hashtable.h"
+#include "staticstring.h"
 
 /**
  * Takes care of reading in xml formatted data from a file.  This could/should
@@ -90,7 +92,25 @@ private:
          */
         bool name();
 
-        char getEscape();
+        /**
+         * Automoton function: textDecl.  Processes the xml text decleration, if
+         * there is one.
+         */
+        void textDecl();
+
+        /**
+         * Automoton function: entity.  Processes an entity from the header.
+         */
+        void entity();
+
+        /**
+         * Adds an entity to the list, if it doesn't already exist.
+         *@param name The name of the entity
+         *@param value The value of the entity
+         */
+        void addEntity( const char *name, const char *value );
+
+        StaticString *getEscape();
 
         /**
          * Automoton function: paramlist.  Processes a list of node params.
@@ -114,6 +134,8 @@ private:
         FlexBuf fbParamName;    /**< buffer for the current param's name. */
         FlexBuf fbParamValue;   /**< buffer for the current param's value. */
         bool bStrip;    /**< Are we stripping whitespace? */
+
+        HashTable htEntity;             /**< Entity type definitions. */
 };
 
 #endif