Fix leak in interpolate(). Also give property nodes a name so they

[flightgear.git] / src / Scripting / NasalSys.hxx

diff --git a/src/Scripting/NasalSys.hxx b/src/Scripting/NasalSys.hxx
index a772ebcd27d166685834bb0d372894d94455cd19..04313ea1661cbbd5bd7bd94bd89e3c49679e951b 100644 (file)
--- a/src/Scripting/NasalSys.hxx
+++ b/src/Scripting/NasalSys.hxx
@@ -58,7 +58,7 @@ public:
 
     void deleteModule(const char* moduleName);
 
-    naRef call(naRef code, naRef locals);
+    naRef call(naRef code, int argc, naRef* args, naRef locals);
 
 private:
     friend class FGNasalScript;
@@ -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,21 +131,31 @@ private:
 
 class FGNasalListener : public SGPropertyChangeListener {
 public:
-    FGNasalListener(SGPropertyNode_ptr node, naRef handler,
-                    FGNasalSys* nasal, int key, int id);
+    FGNasalListener(SGPropertyNode* node, naRef code, FGNasalSys* nasal,
+                    int key, int id, int type);
 
-    ~FGNasalListener();
-    void valueChanged(SGPropertyNode* node);
+    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);
+    void call(SGPropertyNode* which, naRef mode);
+
     friend class FGNasalSys;
     SGPropertyNode_ptr _node;
-    naRef _handler;
+    naRef _code;
     int _gcKey;
     int _id;
     FGNasalSys* _nas;
+    int _type;
     unsigned int _active;
     bool _dead;
+    bool _first_call;
+    long _last_int;
+    double _last_float;
+    string _last_string;
 };
 
 
@@ -173,11 +183,10 @@ public:
     virtual void pi(const char* target, const char* data);
 
 private:
-    void call(naRef func, int num = 0, naRef a = naNil(), naRef b = naNil());
+    void call(naRef func, int num, 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;
 };