From 0ff107a8180622ea3db70b7c08b15f5c26f4ec95 Mon Sep 17 00:00:00 2001
From: Jason Turner <lefticus@gmail.com>
Date: Thu, 6 Aug 2009 01:35:12 +0000
Subject: [PATCH] Rename types_match to call_match in Proxy_Function to more
 closely match the semantics of the call

---
 include/chaiscript/dispatchkit/bootstrap.hpp    |  2 +-
 include/chaiscript/dispatchkit/dispatchkit.hpp  |  4 ++--
 .../chaiscript/dispatchkit/proxy_functions.hpp  | 17 ++++++++---------
 3 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/include/chaiscript/dispatchkit/bootstrap.hpp b/include/chaiscript/dispatchkit/bootstrap.hpp
index bcf59b8..7c64668 100644
--- a/include/chaiscript/dispatchkit/bootstrap.hpp
+++ b/include/chaiscript/dispatchkit/bootstrap.hpp
@@ -635,7 +635,7 @@ namespace chaiscript
 
         Proxy_Function f = boxed_cast<Proxy_Function >(params[0]);
 
-        return Boxed_Value(f->types_match(std::vector<Boxed_Value>(params.begin() + 1, params.end())));
+        return Boxed_Value(f->call_match(std::vector<Boxed_Value>(params.begin() + 1, params.end())));
       }
 
       static boost::shared_ptr<Dispatch_Engine> bootstrap2(boost::shared_ptr<Dispatch_Engine> e = boost::shared_ptr<Dispatch_Engine> (new Dispatch_Engine()))
diff --git a/include/chaiscript/dispatchkit/dispatchkit.hpp b/include/chaiscript/dispatchkit/dispatchkit.hpp
index 3b21b9b..efd4b6e 100644
--- a/include/chaiscript/dispatchkit/dispatchkit.hpp
+++ b/include/chaiscript/dispatchkit/dispatchkit.hpp
@@ -94,7 +94,7 @@ namespace chaiscript
         return std::vector<Type_Info>();
       }
 
-      virtual bool types_match(const std::vector<Boxed_Value> &types) const
+      virtual bool call_match(const std::vector<Boxed_Value> &vals) const
       {
         typedef std::vector<std::pair<std::string, Proxy_Function > > function_vec;
 
@@ -103,7 +103,7 @@ namespace chaiscript
 
         while (begin != end)
         {
-          if (begin->second->types_match(types))
+          if (begin->second->call_match(vals))
           {
             return true;
           } else {
diff --git a/include/chaiscript/dispatchkit/proxy_functions.hpp b/include/chaiscript/dispatchkit/proxy_functions.hpp
index 06ef239..6a98997 100644
--- a/include/chaiscript/dispatchkit/proxy_functions.hpp
+++ b/include/chaiscript/dispatchkit/proxy_functions.hpp
@@ -177,7 +177,7 @@ namespace chaiscript
       virtual Boxed_Value operator()(const std::vector<Boxed_Value> &params) = 0;
       virtual std::vector<Type_Info> get_param_types() const = 0;
       virtual bool operator==(const Proxy_Function_Base &) const = 0;
-      virtual bool types_match(const std::vector<Boxed_Value> &types) const = 0;
+      virtual bool call_match(const std::vector<Boxed_Value> &vals) const = 0;
       virtual std::string annotation() const = 0;
   };
 
@@ -218,10 +218,10 @@ namespace chaiscript
         return false;
       }
 
-      virtual bool types_match(const std::vector<Boxed_Value> &types) const
+      virtual bool call_match(const std::vector<Boxed_Value> &vals) const
       {
-          return (m_arity < 0 || types.size() == size_t(m_arity))
-            && test_guard(types);
+          return (m_arity < 0 || vals.size() == size_t(m_arity))
+            && test_guard(vals);
       }    
 
       virtual ~Dynamic_Proxy_Function() {}
@@ -320,10 +320,9 @@ namespace chaiscript
 
       virtual ~Bound_Function() {}
 
-      virtual bool types_match(const std::vector<Boxed_Value> &types) const
+      virtual bool call_match(const std::vector<Boxed_Value> &vals) const
       {
-        std::vector<Boxed_Value> params = build_param_list(types);
-        return m_f->types_match(params);
+        return m_f->call_match(build_param_list(vals));
       }
 
       virtual Boxed_Value operator()(const std::vector<Boxed_Value> &params)
@@ -421,10 +420,10 @@ namespace chaiscript
         return build_param_type_list(f);
       }
 
-      virtual bool types_match(const std::vector<Boxed_Value> &types) const
+      virtual bool call_match(const std::vector<Boxed_Value> &vals) const
       {
         Func *f = 0;
-        return compare_types(f, types);
+        return compare_types(f, vals);
       }
 
       virtual std::string annotation() const