From 41d0dde52ec5ed4071ef31aaf24b458edc98077b Mon Sep 17 00:00:00 2001
From: Gunnar Beutner <gunnar@beutner.name>
Date: Wed, 2 Apr 2014 09:04:49 +0200
Subject: [PATCH] Allow functions to return values.

Fixes #5922
---
 lib/config/aexpression.cpp  | 3 ++-
 lib/config/config_parser.yy | 6 +++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/lib/config/aexpression.cpp b/lib/config/aexpression.cpp
index 7f1f51b19..cbecdb4c0 100644
--- a/lib/config/aexpression.cpp
+++ b/lib/config/aexpression.cpp
@@ -475,7 +475,8 @@ Value AExpression::FunctionWrapper(const std::vector<Value>& arguments, const Ar
 	for (int i = 0; i < std::min(arguments.size(), funcargs->GetLength()); i++)
 		locals->Set(funcargs->Get(i), arguments[i]);
 
-	return expr->Evaluate(locals);
+	expr->Evaluate(locals);
+	return locals->Get("__result");
 }
 
 Value AExpression::OpFunction(const AExpression* expr, const Dictionary::Ptr& locals)
diff --git a/lib/config/config_parser.yy b/lib/config/config_parser.yy
index 4a56e2005..7e3f520b6 100644
--- a/lib/config/config_parser.yy
+++ b/lib/config/config_parser.yy
@@ -781,8 +781,12 @@ rterm: T_STRING
 
 		arr->Add(Empty);
 
-		arr->Add(*$4);
+		Array::Ptr arrex = make_shared<Array>();
+		arrex->Add(make_shared<AExpression>(&AExpression::OpSet, make_shared<AExpression>(&AExpression::OpLiteral, "__result", @4), *$4, @4));
 		delete $4;
+		AExpression::Ptr aexpr = make_shared<AExpression>(&AExpression::OpDict, arrex, true, @4);
+
+		arr->Add(aexpr);
 
 		$$ = new Value(make_shared<AExpression>(&AExpression::OpFunction, arr, Array::Ptr($2), DebugInfoRange(@1, @4)));
 	}
-- 
2.40.0