Merge branch 'master' into epec-kernel

1 files changed, 6 insertions, 6 deletions

diff --git a/src/function.h b/src/function.h
index 623ef7e..a1fde3c 100644
--- a/src/function.h
+++ b/src/function.h
@@ -2,6 +2,7 @@
 #define FUNCTION_H_
 
 #include "value.h"
+#include "typedefs.h"
 #include <string>
 #include <vector>
 
@@ -9,35 +10,34 @@ class AbstractFunction
 {
 public:
 	virtual ~AbstractFunction();
-	virtual Value evaluate(const class Context *ctx, const std::vector<std::string> &call_argnames, const std::vector<Value> &call_argvalues) const;
+	virtual Value evaluate(const class Context *ctx, const class EvalContext *evalctx) const;
 	virtual std::string dump(const std::string &indent, const std::string &name) const;
 };
 
 class BuiltinFunction : public AbstractFunction
 {
 public:
-	typedef Value (*eval_func_t)(const Context *ctx, const std::vector<std::string> &argnames, const std::vector<Value> &args);
+	typedef Value (*eval_func_t)(const Context *ctx, const EvalContext *evalctx);
 	eval_func_t eval_func;
 
 	BuiltinFunction(eval_func_t f) : eval_func(f) { }
 	virtual ~BuiltinFunction();
 
-	virtual Value evaluate(const Context *ctx, const std::vector<std::string> &call_argnames, const std::vector<Value> &call_argvalues) const;
+	virtual Value evaluate(const Context *ctx, const EvalContext *evalctx) const;
 	virtual std::string dump(const std::string &indent, const std::string &name) const;
 };
 
 class Function : public AbstractFunction
 {
 public:
-	std::vector<std::string> argnames;
-	std::vector<class Expression*> argexpr;
+	AssignmentList definition_arguments;
 
 	Expression *expr;
 
 	Function() { }
 	virtual ~Function();
 
-	virtual Value evaluate(const Context *ctx, const std::vector<std::string> &call_argnames, const std::vector<Value> &call_argvalues) const;
+	virtual Value evaluate(const Context *ctx, const EvalContext *evalctx) const;
 	virtual std::string dump(const std::string &indent, const std::string &name) const;
 };