Changeset 443 for todo/trunk/util/XML.cc

Timestamp:

06/28/07 07:07:14 (2 years ago)

Author:

athomas

Message:

Dev Todo:

• A few bugfixes.
  
• Added XML declaration parsing/saving. This is a stop-gap at best, but will
  hopefully be useful to some.
  
• Removed reliance on builtin regex library. Hopefully the completely broken
  version of glibc that instigated the inclusion of it is now out of
  circulation.
  
• Fixed a whole bunch of compiler warnings on more recent GCC versions.
  

Files:

• todo/trunk/util/XML.cc (modified) (2 diffs)

todo/trunk/util/XML.cc

@@ -37 +37 @@
-        Lexer::iterator i = xmlScan.begin(str);
-
+                if (i.type() == XmlDecl) {
+                        ++i;
+                }
-                parseElement(i);
-        } catch (Lexer::exception &e) {
@@ -46 +49 @@
-        // Only initialise scanners once
-        if (!initialised) {
+                // <?xml version="1.0" encoding="UTF-8" standalone="no"?>
+                xmlScan.addPattern(XmlDecl, "<\\?xml.*?>[[:space:]]*");
-                xmlScan.addPattern(XmlCommentBegin, "<!--");
-                xmlScan.addPattern(XmlBegin, "<[a-zA-Z0-9_-]+"