From 3bfb3d33196a24f812af53484ce54a450a0e5cf5 Mon Sep 17 00:00:00 2001
From: Jason Volk <jason@zemos.net>
Date: Thu, 27 Oct 2016 22:58:39 -0700
Subject: [PATCH] ircd::js: Argument forwarding for function call operator.

---
 include/ircd/js/function.h | 24 +++++++++++++-----------
 include/ircd/js/js.h       |  2 +-
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/include/ircd/js/function.h b/include/ircd/js/function.h
index e4b39238a..11fa494c0 100644
--- a/include/ircd/js/function.h
+++ b/include/ircd/js/function.h
@@ -41,8 +41,8 @@ struct function
 	explicit operator string<L>() const;
 
 	// js::value/js::object == lifetime::stack
-	js::value operator()(const js::object &, const JS::HandleValueArray &args) const;
-	js::value operator()(const js::object &) const;
+	js::value operator()(const js::object &, const vector<js::value>::handle &args = {}) const;
+	template<class... args> js::value operator()(const js::object &, args&&...) const;
 
 	// new function
 	function(JS::AutoObjectVector &stack,
@@ -122,27 +122,29 @@ function<L>::function(JS::AutoObjectVector &stack,
 }
 
 template<lifetime L>
+template<class... args>
 js::value
-function<L>::operator()(const js::object &that)
+function<L>::operator()(const js::object &that,
+                        args&&... a)
 const
 {
-	return this->operator()(that, JS::HandleValueArray::empty());
+	vector<basic::value<lifetime::stack>> v
+	{{
+		std::forward<args>(a)...
+	}};
+
+	return call(that, *this, decltype(v)::handle(v));
 }
 
 template<lifetime L>
 js::value
 function<L>::operator()(const js::object &that,
-                        const JS::HandleValueArray &args)
+                        const vector<js::value>::handle &args)
 const
 {
-	js::value ret;
-	if(!JS_CallFunction(*cx, that, *this, args, &ret))
-		throw jserror(jserror::pending);
-
-	return ret;
+	return call(that, *this, args);
 }
 
-
 template<lifetime L>
 function<L>::operator string<L>()
 const
diff --git a/include/ircd/js/js.h b/include/ircd/js/js.h
index 7371f912f..4f37ad318 100644
--- a/include/ircd/js/js.h
+++ b/include/ircd/js/js.h
@@ -72,10 +72,10 @@ inline JSVersion version(const char *const &v)   { return JS_StringToVersion(v);
 #include "string.h"
 #include "id.h"
 #include "object.h"
+#include "vector.h"
 #include "script.h"
 #include "function.h"
 #include "function_literal.h"
-#include "vector.h"
 #include "priv.h"
 #include "has.h"
 #include "get.h"