- fix two bugs

[flightgear.git] / src / Scripting / nasal-props.cxx

diff --git a/src/Scripting/nasal-props.cxx b/src/Scripting/nasal-props.cxx
index 2e530c9bda364e1bd2cee26bd1dbef0da4da65d1..aba10f6a598565480e6f043acde206163a61b85d 100644 (file)
--- a/src/Scripting/nasal-props.cxx
+++ b/src/Scripting/nasal-props.cxx
@@ -1,3 +1,8 @@
+
+#ifdef HAVE_CONFIG_H
+#  include "config.h"
+#endif
+
 #include <simgear/nasal/nasal.h>
 #include <simgear/props/props.hxx>
 
@@ -150,11 +155,17 @@ static naRef f_getChild(naContext c, naRef me, int argc, naRef* args)
     naRef child = naVec_get(argv, 0);
     if(!naIsString(child)) return naNil();
     naRef idx = naNumValue(naVec_get(argv, 1));
+    bool create = naTrue(naVec_get(argv, 2));
     SGPropertyNode* n;
-    if(naIsNil(idx) || !naIsNum(idx)) {
-        n = (*node)->getChild(naStr_data(child));
-    } else {
-        n = (*node)->getChild(naStr_data(child), (int)idx.num);
+    try {
+        if(naIsNil(idx) || !naIsNum(idx)) {
+            n = (*node)->getChild(naStr_data(child), create);
+        } else {
+            n = (*node)->getChild(naStr_data(child), (int)idx.num, create);
+        }
+    } catch (const string& err) {
+        naRuntimeError(c, (char *)err.c_str());
+        return naNil();
     }
     if(!n) return naNil();
     return propNodeGhostCreate(c, n);
@@ -172,10 +183,15 @@ static naRef f_getChildren(naContext c, naRef me, int argc, naRef* args)
         // Get all children of a specified name
         naRef name = naVec_get(argv, 0);
         if(!naIsString(name)) return naNil();
-        vector<SGPropertyNode_ptr> children
-            = (*node)->getChildren(naStr_data(name));
-        for(unsigned int i=0; i<children.size(); i++)
-            naVec_append(result, propNodeGhostCreate(c, children[i]));
+        try {
+            vector<SGPropertyNode_ptr> children
+                = (*node)->getChildren(naStr_data(name));
+            for(unsigned int i=0; i<children.size(); i++)
+                naVec_append(result, propNodeGhostCreate(c, children[i]));
+        } catch (const string& err) {
+            naRuntimeError(c, (char *)err.c_str());
+            return naNil();
+        }
     }
     return result;
 }
@@ -186,17 +202,52 @@ static naRef f_removeChild(naContext c, naRef me, int argc, naRef* args)
     naRef child = naVec_get(argv, 0);
     naRef index = naVec_get(argv, 1);
     if(!naIsString(child) || !naIsNum(index)) return naNil();
-    (*node)->removeChild(naStr_data(child), (int)index.num);
+    try {
+        (*node)->removeChild(naStr_data(child), (int)index.num, false);
+    } catch (const string& err) {
+        naRuntimeError(c, (char *)err.c_str());
+    }
     return naNil();
 }
 
+static naRef f_removeChildren(naContext c, naRef me, int argc, naRef* args)
+{
+    NODEARG();
+    naRef result = naNewVector(c);
+    if(naIsNil(argv) || naVec_size(argv) == 0) {
+        // Remove all children
+        for(int i = (*node)->nChildren() - 1; i >=0; i--)
+            naVec_append(result, propNodeGhostCreate(c, (*node)->removeChild(i)));
+    } else {
+        // Remove all children of a specified name
+        naRef name = naVec_get(argv, 0);
+        if(!naIsString(name)) return naNil();
+        try {
+            vector<SGPropertyNode_ptr> children
+                = (*node)->removeChildren(naStr_data(name), false);
+            for(unsigned int i=0; i<children.size(); i++)
+                naVec_append(result, propNodeGhostCreate(c, children[i]));
+        } catch (const string& err) {
+            naRuntimeError(c, (char *)err.c_str());
+            return naNil();
+        }
+    }
+    return result;
+}
+
 static naRef f_getNode(naContext c, naRef me, int argc, naRef* args)
 {
     NODEARG();
     naRef path = naVec_get(argv, 0);
     bool create = naTrue(naVec_get(argv, 1));
     if(!naIsString(path)) return naNil();
-    SGPropertyNode* n = (*node)->getNode(naStr_data(path), create);
+    SGPropertyNode* n;
+    try {
+        n = (*node)->getNode(naStr_data(path), create);
+    } catch (const string& err) {
+        naRuntimeError(c, (char *)err.c_str());
+        return naNil();
+    }
     return propNodeGhostCreate(c, n);
 }
 
@@ -226,6 +277,7 @@ static struct {
     { f_getChild, "_getChild" },
     { f_getChildren, "_getChildren" },
     { f_removeChild, "_removeChild" },
+    { f_removeChildren, "_removeChildren" },
     { f_getNode, "_getNode" },
     { f_new, "_new" },
     { f_globals, "_globals" },