add parsexml() function, which is a wrapper around the built-in easyxml

parser. Advantages over xml.nas:             (reviewed and OK'ed by Andy)

- faster (33% ... only. I had hoped for more.)
- more standards compliant
- should support UTF
- I don't have to support it.  ;-)

Usage: parsexml(<path> [, <start-tag> [, <end-tag> [, <data> [, <pi>]]]]);

<path> is an absolute file path, the rest are optional callback functions.

Example:
    parsexml("/tmp/foo.xml", nil, nil, func(d) { print("DATA FOUND: ", d) });

diff --git a/src/Scripting/NasalSys.cxx b/src/Scripting/NasalSys.cxx
index bb3ab5590701b40f0afa2fed47882d3fae70e3bc..ebe6dd654e9a1f2764927d9fdd9e05ba5670b53a 100644 (file)
--- a/src/Scripting/NasalSys.cxx
+++ b/src/Scripting/NasalSys.cxx
@@ -11,6 +11,7 @@
 #include <stdio.h>
 #include <sys/types.h>
 #include <sys/stat.h>
+#include <fstream>
 
 #include <plib/ul.h>
 
@@ -358,6 +359,36 @@ static naRef f_directory(naContext c, naRef me, int argc, naRef* args)
     return result;
 }
 
+// Parse XML file.
+//     parsexml(<path> [, <start-tag> [, <end-tag> [, <data> [, <pi>]]]]);
+//
+// <path>      ... absolute path of an XML file
+// <start-tag> ... callback function with two args: tag name, attribute hash
+// <end-tag>   ... callback function with one arg:  tag name
+// <data>      ... callback function with one arg:  data string
+// <pi>        ... callback function with two args: target string, data string
+//                 (pi = "processing instruction")
+// All four callback functions are optional and default to nil.
+// The function returns nil on error, and the file name otherwise.
+static naRef f_parsexml(naContext c, naRef me, int argc, naRef* args)
+{
+    if(argc < 1 || !naIsString(args[0]))
+        naRuntimeError(c, "bad/missing argument to parsexml()");
+
+    const char* file = naStr_data(args[0]);
+    std::ifstream input(file);
+    NasalXMLVisitor visitor(c, argc, args);
+    try {
+        readXML(input, visitor);
+    } catch (const sg_exception& e) {
+        string msg = string("parsexml(): file '") + file + "' "
+                     + e.getFormattedMessage();
+        naRuntimeError(c, msg.c_str());
+        return naNil();
+    }
+    return args[0];
+}
+
 // Return UNIX epoch time in seconds.
 static naRef f_systime(naContext c, naRef me, int argc, naRef* args)
 {
@@ -462,6 +493,7 @@ static struct { char* name; naCFunction func; } funcs[] = {
     { "rand",  f_rand },
     { "srand",  f_srand },
     { "directory", f_directory },
+    { "parsexml", f_parsexml },
     { "systime", f_systime },
     { "carttogeod", f_carttogeod },
     { "geodtocart", f_geodtocart },
@@ -586,7 +618,7 @@ void FGNasalSys::loadPropertyScripts()
             loadModule(p, module);
         }
         */
-        
+
         const char* src = n->getStringValue("script");
         if(!n->hasChild("script")) src = 0; // Hrm...
         if(src)
@@ -914,3 +946,58 @@ FGNasalModelData::~FGNasalModelData()
 }
 
 
+
+// NasalXMLVisitor class: handles EasyXML visitor callback for parsexml()
+//
+NasalXMLVisitor::NasalXMLVisitor(naContext c, int argc, naRef* args) :
+    _c(naSubContext(c)),
+    _start_element(argc > 1 && naIsFunc(args[1]) ? args[1] : naNil()),
+    _end_element(argc > 2 && naIsFunc(args[2]) ? args[2] : naNil()),
+    _data(argc > 3 && naIsFunc(args[3]) ? args[3] : naNil()),
+    _pi(argc > 4 && naIsFunc(args[4]) ? args[4] : naNil())
+{
+}
+
+void NasalXMLVisitor::startElement(const char* tag, const XMLAttributes& a)
+{
+    if(naIsNil(_start_element)) return;
+    naRef attr = naNewHash(_c);
+    for(int i=0; i<a.size(); i++) {
+        naRef name = make_string(a.getName(i));
+        naRef value = make_string(a.getValue(i));
+        naHash_set(attr, name, value);
+    }
+    call(_start_element, 2, make_string(tag), attr);
+}
+
+void NasalXMLVisitor::endElement(const char* tag)
+{
+    if(!naIsNil(_end_element)) call(_end_element, 1, make_string(tag));
+}
+
+void NasalXMLVisitor::data(const char* str, int len)
+{
+    if(!naIsNil(_data)) call(_data, 1, make_string(str, len));
+}
+
+void NasalXMLVisitor::pi(const char* target, const char* data)
+{
+    if (!naIsNil(_pi)) call(_pi, 2, make_string(target), make_string(data));
+}
+
+void NasalXMLVisitor::call(naRef func, int num, naRef a, naRef b)
+{
+    _arg[0] = a;
+    _arg[1] = b;
+    naCall(_c, func, num, _arg, naNil(), naNil());
+    if(naGetError(_c))
+        naRethrowError(_c);
+}
+
+naRef NasalXMLVisitor::make_string(const char* s, int n)
+{
+    return naStr_fromdata(naNewString(_c), const_cast<char *>(s),
+                          n < 0 ? strlen(s) : n);
+}
+
+

diff --git a/src/Scripting/NasalSys.hxx b/src/Scripting/NasalSys.hxx
index 1a02caaf4fa2756ac5ed497f4d501d5fe29d2570..a772ebcd27d166685834bb0d372894d94455cd19 100644 (file)
--- a/src/Scripting/NasalSys.hxx
+++ b/src/Scripting/NasalSys.hxx
@@ -5,6 +5,7 @@
 #include <simgear/structure/subsystem_mgr.hxx>
 #include <simgear/nasal/nasal.h>
 #include <simgear/scene/model/model.hxx>
+#include <simgear/xml/easyxml.hxx>
 
 #include <map>
 SG_USING_STD(map);
@@ -160,4 +161,24 @@ private:
     SGConstPropertyNode_ptr _unload;
 };
 
+
+class NasalXMLVisitor : public XMLVisitor {
+public:
+    NasalXMLVisitor(naContext c, int argc, naRef* args);
+    virtual ~NasalXMLVisitor() { naFreeContext(_c); }
+
+    virtual void startElement(const char* tag, const XMLAttributes& a);
+    virtual void endElement(const char* tag);
+    virtual void data(const char* str, int len);
+    virtual void pi(const char* target, const char* data);
+
+private:
+    void call(naRef func, int num = 0, naRef a = naNil(), naRef b = naNil());
+    naRef make_string(const char* s, int n = -1);
+
+    naContext _c;
+    naRef _arg[2];
+    naRef _start_element, _end_element, _data, _pi;
+};
+
 #endif // __NASALSYS_HXX