Named variables for array_foreach

nyalldawson · nyalldawson · commit de30dc981d1d · 2018-08-23T21:15:32.000+10:00
diff --git a/src/core/expression/qgsexpressionfunction.cpp b/src/core/expression/qgsexpressionfunction.cpp
@@ -4776,7 +4776,10 @@ const QList<QgsExpressionFunction *> &QgsExpression::Functions()
 }
 
 QgsArrayForeachExpressionFunction::QgsArrayForeachExpressionFunction()
-  : QgsExpressionFunction( QStringLiteral( "array_foreach" ), 2, QCoreApplication::tr( "Arrays" ) )
+  : QgsExpressionFunction( QStringLiteral( "array_foreach" ), QgsExpressionFunction::ParameterList()
+                           << QgsExpressionFunction::Parameter( QStringLiteral( "array" ) )
+                           << QgsExpressionFunction::Parameter( QStringLiteral( "expression" ) ),
+                           QCoreApplication::tr( "Arrays" ) )
 {
 
 }
diff --git a/tests/src/core/testqgsexpression.cpp b/tests/src/core/testqgsexpression.cpp
@@ -2689,7 +2689,7 @@ class TestQgsExpression: public QObject
 
       QVariantList foreachExpected;
       foreachExpected << QStringLiteral( "ABC" ) << QStringLiteral( "HELLO" );
-      QCOMPARE( QgsExpression( "array_foreach(array('abc', 'hello'), upper(@element))" ).evaluate( &context ), QVariant( foreachExpected ) );
+      QCOMPARE( QgsExpression( "array_foreach(array:=array('abc', 'hello'), expression:=upper(@element))" ).evaluate( &context ), QVariant( foreachExpected ) );
 
       QCOMPARE( QgsExpression( "array_intersect(array('1', '2', '3', '4'), array('4', '0', '2', '5'))" ).evaluate( &context ), QVariant( true ) );
       QCOMPARE( QgsExpression( "array_intersect(array('1', '2', '3', '4'), array('0', '5'))" ).evaluate( &context ), QVariant( false ) );

Original file line number	Diff line number	Diff line change
`@@ -4776,7 +4776,10 @@ const QList<QgsExpressionFunction *> &QgsExpression::Functions()`
`4776`	`4776`	`}`
`4777`	`4777`
`4778`	`4778`	`QgsArrayForeachExpressionFunction::QgsArrayForeachExpressionFunction()`
`4779`		`- : QgsExpressionFunction( QStringLiteral( "array_foreach" ), 2, QCoreApplication::tr( "Arrays" ) )`
	`4779`	`+ : QgsExpressionFunction( QStringLiteral( "array_foreach" ), QgsExpressionFunction::ParameterList()`
	`4780`	`+ << QgsExpressionFunction::Parameter( QStringLiteral( "array" ) )`
	`4781`	`+ << QgsExpressionFunction::Parameter( QStringLiteral( "expression" ) ),`
	`4782`	`+ QCoreApplication::tr( "Arrays" ) )`
`4780`	`4783`	`{`
`4781`	`4784`
`4782`	`4785`	`}`