cppbind.Ghost: clean up a bit

[simgear.git] / simgear / xml / easyxml.cxx

diff --git a/simgear/xml/easyxml.cxx b/simgear/xml/easyxml.cxx
index c2fc12137c3f13fe8ae67dd9e7998aebd5b07c39..2a6953593df74132e08ec779a71511ad5618afd2 100644 (file)
--- a/simgear/xml/easyxml.cxx
+++ b/simgear/xml/easyxml.cxx
@@ -17,14 +17,15 @@
 #ifdef SYSTEM_EXPAT
 #  include <expat.h>
 #else
-#  include "xmlparse.h"     
+#  include "sg_expat.h"     
 #endif
      
 #include <fstream>
 #include <iostream>
 
 using std::ifstream;
-
+using std::istream;
+using std::string;
 
 \f
 ////////////////////////////////////////////////////////////////////////
@@ -136,7 +137,16 @@ XMLAttributesDefault::setValue (const char * name, const char * value)
 }
 
 
-\f
+//%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+void XMLVisitor::savePosition(void)
+{
+  if (parser) {
+    column = XML_GetCurrentColumnNumber(parser);
+    line = XML_GetCurrentLineNumber(parser);
+  }
+}
+
 ////////////////////////////////////////////////////////////////////////
 // Attribute list wrapper for Expat.
 ////////////////////////////////////////////////////////////////////////
@@ -178,18 +188,21 @@ ExpatAtts::getValue (const char * name) const
 static void
 start_element (void * userData, const char * name, const char ** atts)
 {
+  VISITOR.savePosition();
   VISITOR.startElement(name, ExpatAtts(atts));
 }
 
 static void
 end_element (void * userData, const char * name)
 {
+  VISITOR.savePosition();
   VISITOR.endElement(name);
 }
 
 static void
 character_data (void * userData, const char * s, int len)
 {
+  VISITOR.savePosition();
   VISITOR.data(s, len);
 }
 
@@ -198,6 +211,7 @@ processing_instruction (void * userData,
                        const char * target,
                        const char * data)
 {
+  VISITOR.savePosition();
   VISITOR.pi(target, data);
 }
 
@@ -218,6 +232,8 @@ readXML (istream &input, XMLVisitor &visitor, const string &path)
   XML_SetCharacterDataHandler(parser, character_data);
   XML_SetProcessingInstructionHandler(parser, processing_instruction);
 
+  visitor.setParser(parser);
+  visitor.setPath(path);
   visitor.startXML();
 
   char buf[16384];
@@ -230,6 +246,7 @@ readXML (istream &input, XMLVisitor &visitor, const string &path)
                                        XML_GetCurrentLineNumber(parser),
                                        XML_GetCurrentColumnNumber(parser)),
                            "SimGear XML Parser");
+      visitor.setParser(0);
       XML_ParserFree(parser);
       throw ex;
     }
@@ -241,6 +258,7 @@ readXML (istream &input, XMLVisitor &visitor, const string &path)
                                        XML_GetCurrentLineNumber(parser),
                                        XML_GetCurrentColumnNumber(parser)),
                            "SimGear XML Parser");
+      visitor.setParser(0);
       XML_ParserFree(parser);
       throw ex;
     }
@@ -254,10 +272,12 @@ readXML (istream &input, XMLVisitor &visitor, const string &path)
                                      XML_GetCurrentLineNumber(parser),
                                      XML_GetCurrentColumnNumber(parser)),
                          "SimGear XML Parser");
+    visitor.setParser(0);
     XML_ParserFree(parser);
     throw ex;
   }
 
+  visitor.setParser(0);
   XML_ParserFree(parser);
   visitor.endXML();
 }