Changeset 5819 in orxonox.OLD for trunk/src/lib/tinyxml/tinyxmlparser.cc

Timestamp:

Nov 29, 2005, 11:07:43 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: merged branches world_entities to trunk again
merged with command
svn merge -r5795:HEAD branches/world_entities/ trunk/
no conflicts (what a wonder)

File:

• trunk/src/lib/tinyxml/tinyxmlparser.cc (modified) (17 diffs)

trunk/src/lib/tinyxml/tinyxmlparser.cc

@@ -718 +718 @@
                 {
                         encoding = TIXML_ENCODING_UTF8;
+                        useMicrosoftBOM = true;
                 }
         }
@@ -786 +787 @@
         if ( pError && data )
         {
-                //TiXmlParsingData data( pError, prevData );
                 data->Stamp( pError, encoding );
                 errorLocation = data->Cursor();
@@ -821 +821 @@
         const char* commentHeader = { "<!--" };
         const char* dtdHeader = { "<!" };
+        const char* cdataHeader = { "<![CDATA[" };
 
         if ( StringEqual( p, xmlHeader, true, encoding ) )
@@ -835 +836 @@
                 #endif
                 returnNode = new TiXmlComment();
+        }
+        else if ( StringEqual( p, cdataHeader, false, encoding ) )
+        {
+                #ifdef DEBUG_PARSER
+                        TIXML_LOG( "XML parsing CDATA\n" );
+                #endif
+                TiXmlText* text = new TiXmlText( "" );
+                text->SetCDATA( true );
+                returnNode = text;
         }
         else if ( StringEqual( p, dtdHeader, false, encoding ) )
@@ -931 +941 @@
                         if ( !in->good() ) return;
                         assert( in->peek() == '<' );
-                        int tagIndex = tag->length();
+                        int tagIndex = (int) tag->length();
 
                         bool closingTag = false;
@@ -1013 +1023 @@
         }
 
-//      TiXmlParsingData data( p, prevData );
         if ( data )
         {
@@ -1127 +1136 @@
         TiXmlDocument* document = GetDocument();
 
+        // Read in text and elements in any order.
         const char* pWithWhiteSpace = p;
-        // Read in text and elements in any order.
         p = SkipWhiteSpace( p, encoding );
+
         while ( p && *p )
         {
@@ -1162 +1172 @@
                 {
                         // We hit a '<'
-                        // Have we hit a new element or an end tag?
+                        // Have we hit a new element or an end tag? This could also be
+                        // a TiXmlText in the "CDATA" style.
                         if ( StringEqual( p, "</", false, encoding ) )
                         {
@@ -1181 +1192 @@
                         }
                 }
+                pWithWhiteSpace = p;
                 p = SkipWhiteSpace( p, encoding );
         }
@@ -1222 +1234 @@
         p = SkipWhiteSpace( p, encoding );
 
-//      TiXmlParsingData data( p, prevData );
         if ( data )
         {
@@ -1286 +1297 @@
         p = SkipWhiteSpace( p, encoding );
 
-//      TiXmlParsingData data( p, prevData );
         if ( data )
         {
@@ -1315 +1325 @@
                 tabsize = document->TabSize();
 
-//      TiXmlParsingData data( p, prevData );
         if ( data )
         {
@@ -1378 +1387 @@
 void TiXmlText::StreamIn( TIXML_ISTREAM * in, TIXML_STRING * tag )
 {
-        while ( in->good() )
-        {
-                int c = in->peek();     
-                if ( c == '<' )
-                        return;
+        if ( cdata )
+        {
+                int c = in->get();      
                 if ( c <= 0 )
                 {
@@ -1392 +1399 @@
 
                 (*tag) += (char) c;
-                in->get();
+
+                if ( c == '>' 
+                         && tag->at( tag->length() - 2 ) == ']'
+                         && tag->at( tag->length() - 3 ) == ']' )
+                {
+                        // All is well.
+                        return;         
+                }
+        }
+        else
+        {
+                while ( in->good() )
+                {
+                        int c = in->peek();     
+                        if ( c == '<' )
+                                return;
+                        if ( c <= 0 )
+                        {
+                                TiXmlDocument* document = GetDocument();
+                                if ( document )
+                                        document->SetError( TIXML_ERROR_EMBEDDED_NULL, 0, 0, TIXML_ENCODING_UNKNOWN );
+                                return;
+                        }
+
+                        (*tag) += (char) c;
+                        in->get();
+                }
         }
 }
@@ -1400 +1433 @@
 {
         value = "";
-//      TiXmlParsingData data( p, prevData );
+        TiXmlDocument* document = GetDocument();
+
         if ( data )
         {
@@ -1406 +1440 @@
                 location = data->Cursor();
         }
-        bool ignoreWhite = true;
-
-        const char* end = "<";
-        p = ReadText( p, &value, ignoreWhite, end, false, encoding );
-        if ( p )
-                return p-1;     // don't truncate the '<'
-        return 0;
+
+        const char* const startTag = "<![CDATA[";
+        const char* const endTag   = "]]>";
+
+        if ( cdata || StringEqual( p, startTag, false, encoding ) )
+        {
+                cdata = true;
+
+                if ( !StringEqual( p, startTag, false, encoding ) )
+                {
+                        document->SetError( TIXML_ERROR_PARSING_CDATA, p, data, encoding );
+                        return 0;
+                }
+                p += strlen( startTag );
+
+                // Keep all the white space, ignore the encoding, etc.
+                while (    p && *p
+                                && !StringEqual( p, endTag, false, encoding )
+                          )
+                {
+                        value += *p;
+                        ++p;
+                }
+
+                TIXML_STRING dummy; 
+                p = ReadText( p, &dummy, false, endTag, false, encoding );
+                return p;
+        }
+        else
+        {
+                bool ignoreWhite = true;
+
+                const char* end = "<";
+                p = ReadText( p, &value, ignoreWhite, end, false, encoding );
+                if ( p )
+                        return p-1;     // don't truncate the '<'
+                return 0;
+        }
 }
 
@@ -1450 +1515 @@
                 return 0;
         }
-//      TiXmlParsingData data( p, prevData );
         if ( data )
         {