From: Gunnar Beutner <gunnar@beutner.name>
Date: Wed, 14 Jan 2015 06:36:59 +0000 (+0100)
Subject: Implement the call() method for functions
X-Git-Tag: v2.3.0~385
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d0abc11c08df9e2fdbe46913dd4ebb8ec471811a;p=icinga2

Implement the call() method for functions

refs #8169
---

diff --git a/lib/base/CMakeLists.txt b/lib/base/CMakeLists.txt
index 0828d93fa..263124a5e 100644
--- a/lib/base/CMakeLists.txt
+++ b/lib/base/CMakeLists.txt
@@ -27,7 +27,7 @@ set(base_SOURCES
   convert.cpp debuginfo.cpp dictionary.cpp dictionary-script.cpp dynamicobject.cpp dynamicobject.thpp dynamictype.cpp
   exception.cpp fifo.cpp filelogger.cpp filelogger.thpp initialize.cpp json.cpp logger.cpp logger.thpp
   netstring.cpp networkstream.cpp number.cpp number-script.cpp object.cpp object-script.cpp primitivetype.cpp process.cpp
-  ringbuffer.cpp scriptframe.cpp scriptfunction.cpp scriptfunctionwrapper.cpp scriptglobal.cpp
+  ringbuffer.cpp scriptframe.cpp scriptfunction.cpp scriptfunction-script.cpp scriptfunctionwrapper.cpp scriptglobal.cpp
   scriptutils.cpp serializer.cpp socket.cpp stacktrace.cpp
   statsfunction.cpp stdiostream.cpp stream.cpp streamlogger.cpp streamlogger.thpp string.cpp string-script.cpp
   sysloglogger.cpp sysloglogger.thpp tcpsocket.cpp thinmutex.cpp threadpool.cpp timer.cpp
diff --git a/lib/base/scriptfunction-script.cpp b/lib/base/scriptfunction-script.cpp
new file mode 100644
index 000000000..b6a1eaff4
--- /dev/null
+++ b/lib/base/scriptfunction-script.cpp
@@ -0,0 +1,51 @@
+/******************************************************************************
+ * Icinga 2                                                                   *
+ * Copyright (C) 2012-2014 Icinga Development Team (http://www.icinga.org)    *
+ *                                                                            *
+ * This program is free software; you can redistribute it and/or              *
+ * modify it under the terms of the GNU General Public License                *
+ * as published by the Free Software Foundation; either version 2             *
+ * of the License, or (at your option) any later version.                     *
+ *                                                                            *
+ * This program is distributed in the hope that it will be useful,            *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the              *
+ * GNU General Public License for more details.                               *
+ *                                                                            *
+ * You should have received a copy of the GNU General Public License          *
+ * along with this program; if not, write to the Free Software Foundation     *
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
+ ******************************************************************************/
+
+#include "base/scriptfunction.hpp"
+#include "base/scriptfunctionwrapper.hpp"
+#include "base/scriptframe.hpp"
+#include "base/exception.hpp"
+
+using namespace icinga;
+
+static Value ScriptFunctionCall(const std::vector<Value>& args)
+{
+	if (args.size() < 1)
+		BOOST_THROW_EXCEPTION(ScriptError("Too few arguments for call()"));
+
+	ScriptFrame *vframe = ScriptFrame::GetCurrentFrame();
+	ScriptFunction::Ptr self = static_cast<ScriptFunction::Ptr>(vframe->Self);
+
+	ScriptFrame uframe(args[0]);
+	std::vector<Value> uargs(args.begin() + 1, args.end());
+	return self->Invoke(uargs);
+}
+
+Object::Ptr ScriptFunction::GetPrototype(void)
+{
+	static Dictionary::Ptr prototype;
+
+	if (!prototype) {
+		prototype = new Dictionary();
+		prototype->Set("call", new ScriptFunction(WrapScriptFunction(ScriptFunctionCall)));
+	}
+
+	return prototype;
+}
+
diff --git a/lib/base/scriptfunction.cpp b/lib/base/scriptfunction.cpp
index 7ccfa59eb..5b9c6dc03 100644
--- a/lib/base/scriptfunction.cpp
+++ b/lib/base/scriptfunction.cpp
@@ -23,18 +23,7 @@
 
 using namespace icinga;
 
-static Object::Ptr GetScriptFunctionPrototype(void)
-{
-	static Dictionary::Ptr prototype;
-
-	if (!prototype) {
-		prototype = new Dictionary();
-	}
-
-	return prototype;
-}
-
-REGISTER_PRIMITIVE_TYPE(ScriptFunction, GetScriptFunctionPrototype());
+REGISTER_PRIMITIVE_TYPE(ScriptFunction, ScriptFunction::GetPrototype());
 
 ScriptFunction::ScriptFunction(const Callback& function)
 	: m_Callback(function)
diff --git a/lib/base/scriptfunction.hpp b/lib/base/scriptfunction.hpp
index 6bdcee145..a43846220 100644
--- a/lib/base/scriptfunction.hpp
+++ b/lib/base/scriptfunction.hpp
@@ -46,6 +46,8 @@ public:
 
 	Value Invoke(const std::vector<Value>& arguments);
 
+	static Object::Ptr GetPrototype(void);
+
 private:
 	Callback m_Callback;
 };