// easyxml.cxx - implementation of EasyXML interfaces.
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
-
#include <simgear/compiler.h>
#include <string.h> // strcmp()
#include "easyxml.hxx"
#include "xmlparse.h"
+#include STL_FSTREAM
+
+#if !defined(SG_HAVE_NATIVE_SGI_COMPILERS)
+SG_USING_STD(ifstream);
+#endif
+
+
\f
////////////////////////////////////////////////////////////////////////
// Implementation of XMLAttributes.
// Static callback functions for Expat.
////////////////////////////////////////////////////////////////////////
-#define VISITOR (*((XMLVisitor*)userData))
+#define VISITOR (*((XMLVisitor *)userData))
static void
start_element (void * userData, const char * name, const char ** atts)
// Implementation of XMLReader.
////////////////////////////////////////////////////////////////////////
-bool
-readXML (istream &input, XMLVisitor &visitor)
+void
+readXML (istream &input, XMLVisitor &visitor, const string &path)
{
- bool retval = true;
-
XML_Parser parser = XML_ParserCreate(0);
XML_SetUserData(parser, &visitor);
XML_SetElementHandler(parser, start_element, end_element);
char buf[16384];
while (!input.eof()) {
+ // FIXME: get proper error string from system
+ if (!input.good()) {
+ XML_ParserFree(parser);
+ throw sg_io_exception("Problem reading file",
+ sg_location(path,
+ XML_GetCurrentLineNumber(parser),
+ XML_GetCurrentColumnNumber(parser)),
+ "SimGear XML Parser");
+ }
+
input.read(buf,16384);
- // TODO: deal with bad stream.
if (!XML_Parse(parser, buf, input.gcount(), false)) {
- visitor.error(XML_ErrorString(XML_GetErrorCode(parser)),
- XML_GetCurrentColumnNumber(parser),
- XML_GetCurrentLineNumber(parser));
- retval = false;
+ XML_ParserFree(parser);
+ throw sg_io_exception(XML_ErrorString(XML_GetErrorCode(parser)),
+ sg_location(path,
+ XML_GetCurrentLineNumber(parser),
+ XML_GetCurrentColumnNumber(parser)),
+ "SimGear XML Parser");
}
+
}
// Verify end of document.
- if (!XML_Parse(parser, buf, 0, true))
- retval = false;
-
- if (retval)
- visitor.endXML();
+ if (!XML_Parse(parser, buf, 0, true)) {
+ XML_ParserFree(parser);
+ throw sg_io_exception(XML_ErrorString(XML_GetErrorCode(parser)),
+ sg_location(path,
+ XML_GetCurrentLineNumber(parser),
+ XML_GetCurrentColumnNumber(parser)),
+ "SimGear XML Parser");
+ }
XML_ParserFree(parser);
+}
- return retval;
+void
+readXML (const string &path, XMLVisitor &visitor)
+{
+ ifstream input(path.c_str());
+ if (input.good()) {
+ try {
+ readXML(input, visitor, path);
+ } catch (sg_io_exception &e) {
+ input.close();
+ throw e;
+ } catch (sg_throwable &t) {
+ input.close();
+ throw t;
+ }
+ } else {
+ throw sg_io_exception("Failed to open file", sg_location(path),
+ "SimGear XML Parser");
+ }
+ input.close();
}
// end of easyxml.cxx