ACTIONSCRIPT: Add classes for native and dummy functions

xoreos · Aug 19, 2018 · 40c5379 · 40c5379
1 parent fb940a1
commit 40c5379
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 1 deletion.
diff --git a/src/aurora/actionscript/function.cpp b/src/aurora/actionscript/function.cpp
@@ -51,7 +51,19 @@ ScriptedFunction::~ScriptedFunction() {
 
 Variable ScriptedFunction::operator()(AVM &avm) {
 	_buffer.run(avm);
-	return Variable();
+	return avm.getReturnValue();
+}
+
+NativeFunction::NativeFunction(boost::function<Variable(AVM &)> function, bool preloadThisFlag, bool preloadSuperFlag)
+	: Function(preloadThisFlag, preloadSuperFlag), _function(function) {
+}
+
+Variable NativeFunction::operator()(AVM &avm) {
+	return _function(avm);
+}
+
+DummyFunction::DummyFunction() : Function(false, false) {
+
 }
 
 } // End of namespace ActionScript

diff --git a/src/aurora/actionscript/function.h b/src/aurora/actionscript/function.h
@@ -27,6 +27,8 @@
 
 #include <vector>
 
+#include <boost/function.hpp>
+
 #include "src/aurora/actionscript/variable.h"
 #include "src/aurora/actionscript/asbuffer.h"
 
@@ -69,6 +71,23 @@ class ScriptedFunction : public Function {
 	ASBuffer _buffer;
 };
 
+class NativeFunction : public Function {
+public:
+	NativeFunction(boost::function<Variable(AVM &)> function, bool preloadThisFlag, bool preloadSuperFlag);
+
+	Variable operator()(AVM &avm);
+
+private:
+	boost::function<Variable(AVM &)> _function;
+};
+
+class DummyFunction : public Function {
+public:
+	DummyFunction();
+
+	Variable operator()(AVM &UNUSED(avm)){ return Variable(); };
+};
+
 } // End of namespace ActionScript
 
 } // End of namespace Aurora