Merge branch 'master' into 2011-09-09-CxScript

Conflicts:
	CMakeLists.txt
	include/chaiscript/dispatchkit/boxed_value.hpp
	include/chaiscript/language/chaiscript_eval.hpp

include/chaiscript/dispatchkit/boxed_value.hpp

@@ -64,7 +64,6 @@ namespace chaiscript
         void *m_data_ptr;
         const void *m_const_data_ptr;
         bool m_is_ref;
-        std::vector<std::shared_ptr<Data> > m_dependencies;
       };
 
       struct Object_Data
@@ -235,24 +234,6 @@ namespace chaiscript
         return !is_ref();
       }
 
-      void clear_dependencies()
-      {
-        m_data->m_dependencies.clear();
-      }
-
-      template<typename InItr>
-        void add_dependencies(InItr begin, const InItr &end)
-        {
-          while (begin != end)
-          {
-            if (begin->m_data != m_data)
-            {
-              m_data->m_dependencies.push_back(begin->m_data);
-            }
-            ++begin;
-          }
-        }
-
       void *get_ptr() const
       {
         return m_data->m_data_ptr;

include/chaiscript/dispatchkit/dispatchkit.hpp

@@ -15,6 +15,7 @@
 #include <vector>
 #include <iostream>
 #include <deque>
+#include <list>
 #include <algorithm>
 
 #include "boxed_value.hpp"
@@ -896,6 +897,29 @@ namespace chaiscript
           m_state = t_state;
         }
 
+        void save_function_params(const std::vector<Boxed_Value> &t_params)
+        {
+          m_stack_holder->call_params.insert(m_stack_holder->call_params.begin(), t_params.begin(), t_params.end());
+        }
+
+        void new_function_call()
+        {
+          ++m_stack_holder->call_depth;
+        }
+
+        void pop_function_call()
+        {
+          --m_stack_holder->call_depth;
+
+          assert(m_stack_holder->call_depth >= 0);
+
+          if (m_stack_holder->call_depth == 0)
+          {
+            /// \todo Critical: this needs to be smarter, memory can expand quickly
+            ///       in tight loops involving function calls
+            m_stack_holder->call_params.clear();
+          }
+        }
 
       private:
         /**
@@ -1082,6 +1106,7 @@ namespace chaiscript
         struct Stack_Holder
         {
           Stack_Holder()
+            : call_depth(0)
           {
             Stack s(new StackData());
             s->push_back(Scope());
@@ -1089,6 +1114,9 @@ namespace chaiscript
           }
 
           std::deque<Stack> stacks;
+
+          std::list<Boxed_Value> call_params;
+          int call_depth;
         };  
 
         std::vector<Dynamic_Cast_Conversion> m_conversions;

include/chaiscript/dispatchkit/proxy_functions.hpp

@@ -43,7 +43,6 @@ namespace chaiscript
         Boxed_Value operator()(const std::vector<Boxed_Value> &params) const
         {
           Boxed_Value bv = do_call(params);
-          bv.add_dependencies(params.begin(), params.end());
           return bv;
         }