* Fix expression parser: make it recursive and allow expressions inside function's arguments

* Rewrite functions interface and implement arguments parsing

1 files changed, 10 insertions, 1 deletions

diff --git a/src/expressions.h b/src/expressions.h
index 501974112..5debe87b2 100644
--- a/src/expressions.h
+++ b/src/expressions.h
@@ -24,7 +24,7 @@ struct expression_function {
 struct expression_argument {
 	enum {
 		EXPRESSION_ARGUMENT_NORMAL,
-		EXPRESSION_ARGUMENT_FUNCTION
+		EXPRESSION_ARGUMENT_BOOL,
 	} type;														/**< type of argument (text or other function)		*/
 	void *data;													/**< pointer to its data							*/
 };
@@ -104,4 +104,13 @@ void task_cache_add (struct worker_task *task, void *pointer, int32_t result);
  */
 int32_t task_cache_check (struct worker_task *task, void *pointer);
 
+/**
+ * Parse and return a single function argument for a function (may recurse)
+ * @param expr expression structure that represents function's argument
+ * @param task task object
+ * @param want_string return NULL if argument is not a string
+ * @return expression argument structure or NULL if failed
+ */
+struct expression_argument *get_function_arg (struct expression *expr, struct worker_task *task, gboolean want_string);
+
 #endif