- airportinfo(): don't bark when no airport was found (K. HOERCHER)

- simplify listener purging and fix removelistener() return value for
  one-shot listeners
- listener: inherit virtualness
- s/handler/code/ in listener code to be consistent with NasalSys::call

diff --git a/src/Scripting/NasalSys.cxx b/src/Scripting/NasalSys.cxx
index b545c33b24a798906fd888c10682b3c49d407646..c1e865f04fad536c7b302aa18bbd6d8ba007af57 100644 (file)
--- a/src/Scripting/NasalSys.cxx
+++ b/src/Scripting/NasalSys.cxx
@@ -71,7 +71,6 @@ FGNasalSys::FGNasalSys()
     _gcHash = naNil();
     _nextGCKey = 0; // Any value will do
     _callCount = 0;
-    _purgeListeners = false;
 }
 
 // Does a naCall() in a new context.  Wrapped here to make lock
@@ -531,10 +530,7 @@ static naRef f_airportinfo(naContext c, naRef me, int argc, naRef* args)
         naRuntimeError(c, "airportinfo() with invalid function arguments");
         return naNil();
     }
-    if(!apt) {
-        naRuntimeError(c, "airportinfo(): no airport found");
-        return naNil();
-    }
+    if(!apt) return naNil();
 
     string id = apt->getId();
     string name = apt->getName();
@@ -673,18 +669,10 @@ void FGNasalSys::init()
 
 void FGNasalSys::update(double)
 {
-    if(_purgeListeners) {
-        _purgeListeners = false;
-        map<int, FGNasalListener *>::iterator it;
-        for(it = _listener.begin(); it != _listener.end();) {
-            FGNasalListener *nl = it->second;
-            if(nl->_dead) {
-                _listener.erase(it++);
-                delete nl;
-            } else {
-                ++it;
-            }
-        }
+    if(!_dead_listener.empty()) {
+        vector<FGNasalListener *>::iterator it, end = _dead_listener.end();
+        for(it = _dead_listener.begin(); it != end; ++it) delete *it;
+        _dead_listener.clear();
     }
 }
 
@@ -938,15 +926,15 @@ naRef FGNasalSys::setListener(naContext c, int argc, naRef* args)
         SG_LOG(SG_NASAL, SG_DEBUG, "Attaching listener to tied property " <<
                 node->getPath());
 
-    naRef handler = argc > 1 ? args[1] : naNil();
-    if(!(naIsCode(handler) || naIsCCode(handler) || naIsFunc(handler))) {
+    naRef code = argc > 1 ? args[1] : naNil();
+    if(!(naIsCode(code) || naIsCCode(code) || naIsFunc(code))) {
         naRuntimeError(c, "setlistener() with invalid function argument");
         return naNil();
     }
 
     int type = argc > 3 && naIsNum(args[3]) ? args[3].num : 1;
-    FGNasalListener *nl = new FGNasalListener(node, handler, this,
-            gcSave(handler), _listenerId, type);
+    FGNasalListener *nl = new FGNasalListener(node, code, this,
+            gcSave(code), _listenerId, type);
 
     bool initial = argc > 2 && naTrue(args[2]);
     node->addChangeListener(nl, initial);
@@ -967,15 +955,9 @@ naRef FGNasalSys::removeListener(naContext c, int argc, naRef* args)
         return naNil();
     }
 
-    FGNasalListener *nl = it->second;
-    if(nl->_active) {
-        nl->_dead = true;
-        _purgeListeners = true;
-        return naNum(-1);
-    }
-
+    it->second->_dead = true;
+    _dead_listener.push_back(it->second);
     _listener.erase(it);
-    delete nl;
     return naNum(_listener.size());
 }
 
@@ -983,10 +965,10 @@ naRef FGNasalSys::removeListener(naContext c, int argc, naRef* args)
 
 // FGNasalListener class.
 
-FGNasalListener::FGNasalListener(SGPropertyNode_ptr node, naRef handler,
+FGNasalListener::FGNasalListener(SGPropertyNode *node, naRef code,
                                  FGNasalSys* nasal, int key, int id, int type) :
     _node(node),
-    _handler(handler),
+    _code(code),
     _gcKey(key),
     _id(id),
     _nas(nasal),
@@ -1016,13 +998,13 @@ void FGNasalListener::call(SGPropertyNode* which, naRef mode)
     arg[2] = mode;                  // value changed, child added/removed
     arg[3] = naNum(_node != which); // child event?
     _nas->_cmdArg = _node;
-    _nas->call(_handler, 4, arg, naNil());
+    _nas->call(_code, 4, arg, naNil());
     _active--;
 }
 
 void FGNasalListener::valueChanged(SGPropertyNode* node)
 {
-    if(_type < 2 && node != _node) return;
+    if(_type < 2 && node != _node) return;   // skip child events
     if(_type > 0 || changed(_node) || _first_call)
         call(node, naNum(0));
 

diff --git a/src/Scripting/NasalSys.hxx b/src/Scripting/NasalSys.hxx
index a7e98fd0a435c9397cc74daf5a25a2850f68f64d..04313ea1661cbbd5bd7bd94bd89e3c49679e951b 100644 (file)
--- a/src/Scripting/NasalSys.hxx
+++ b/src/Scripting/NasalSys.hxx
@@ -79,8 +79,8 @@ private:
 
     // Listener
     map<int, FGNasalListener *> _listener;
+    vector<FGNasalListener *> _dead_listener;
     static int _listenerId;
-    bool _purgeListeners;
 
     void loadPropertyScripts();
     void hashset(naRef hash, const char* key, naRef val);
@@ -131,13 +131,13 @@ private:
 
 class FGNasalListener : public SGPropertyChangeListener {
 public:
-    FGNasalListener(SGPropertyNode_ptr node, naRef handler,
-                    FGNasalSys* nasal, int key, int id, int type);
+    FGNasalListener(SGPropertyNode* node, naRef code, FGNasalSys* nasal,
+                    int key, int id, int type);
 
-    ~FGNasalListener();
-    void valueChanged(SGPropertyNode* node);
-    void childAdded(SGPropertyNode* parent, SGPropertyNode* child);
-    void childRemoved(SGPropertyNode* parent, SGPropertyNode* child);
+    virtual ~FGNasalListener();
+    virtual void valueChanged(SGPropertyNode* node);
+    virtual void childAdded(SGPropertyNode* parent, SGPropertyNode* child);
+    virtual void childRemoved(SGPropertyNode* parent, SGPropertyNode* child);
 
 private:
     bool changed(SGPropertyNode* node);
@@ -145,7 +145,7 @@ private:
 
     friend class FGNasalSys;
     SGPropertyNode_ptr _node;
-    naRef _handler;
+    naRef _code;
     int _gcKey;
     int _id;
     FGNasalSys* _nas;