renamed parameter names of array_slice, ran prepare-commit.sh

qgis · Aug 6, 2017 · 42d7e0b · 42d7e0b
1 parent 8978469
commit 42d7e0b
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 18 deletions.
diff --git a/resources/function_help/json/array_slice b/resources/function_help/json/array_slice
@@ -1,18 +1,18 @@
 {
         "name": "array_get",
         "type": "function",
-        "description": "Returns a portion of the array. The slice is defined by the startPos and endPos arguments. A slice that ",
+        "description": "Returns a portion of the array. The slice is defined by the start_pos and end_pos arguments.",
         "arguments": [{
                         "arg": "array",
                         "description": "an array"
                 },
                 {
-                        "arg": "startPos",
-                        "description": "the index of the start position of the slice (0 based). The startPos index is included in the slice. If you use a negative startPos, the index is counted from the end of the list (-1 based)."
+                        "arg": "start_pos",
+                        "description": "the index of the start position of the slice (0 based). The start_pos index is included in the slice. If you use a negative start_pos, the index is counted from the end of the list (-1 based)."
                 },
                 {
-                        "arg": "endPos",
-                        "description": "the index of the start position of the slice (0 based). The endPos index is included in the slice. If you use a negative endPos, the index is counted from the end of the list (-1 based)."
+                        "arg": "end_pos",
+                        "description": "the index of the end position of the slice (0 based). The end_pos index is included in the slice. If you use a negative end_pos, the index is counted from the end of the list (-1 based)."
                 }
         ],
         "examples": [{

diff --git a/src/core/expression/qgsexpressionfunction.cpp b/src/core/expression/qgsexpressionfunction.cpp
@@ -3605,24 +3605,28 @@ static QVariant fcnArrayCat( const QVariantList &values, const QgsExpressionCont
 static QVariant fcnArraySlice( const QVariantList &values, const QgsExpressionContext *, QgsExpression *parent )
 {
   QVariantList list = QgsExpressionUtils::getListValue( values.at( 0 ), parent );
-  qlonglong startPos = QgsExpressionUtils::getIntValue( values.at( 1 ), parent );
-  const qlonglong endPos = QgsExpressionUtils::getIntValue( values.at( 2 ), parent );
-  qlonglong sliceLength = 0;
+  qlonglong start_pos = QgsExpressionUtils::getIntValue( values.at( 1 ), parent );
+  const qlonglong end_pos = QgsExpressionUtils::getIntValue( values.at( 2 ), parent );
+  qlonglong slice_length = 0;
   // negative positions means positions taken relative to the end of the array
-  if( startPos < 0 ) {
-      startPos = list.length() + startPos;
+  if ( start_pos < 0 )
+  {
+    start_pos = list.length() + start_pos;
   }
-  if( endPos >= 0 ) {
-      sliceLength = endPos - startPos + 1;
+  if ( end_pos >= 0 )
+  {
+    slice_length = end_pos - start_pos + 1;
   }
-  else {
-      sliceLength = list.length() + endPos - startPos + 1;
+  else
+  {
+    slice_length = list.length() + end_pos - start_pos + 1;
   }
   //avoid negative lengths in QList.mid function
-  if (sliceLength < 0) {
-      sliceLength = 0;
+  if ( slice_length < 0 )
+  {
+    slice_length = 0;
   }
-  list = list.mid(startPos,sliceLength);
+  list = list.mid( start_pos, slice_length );
   return list;
 }
 
@@ -4287,7 +4291,7 @@ const QList<QgsExpressionFunction *> &QgsExpression::Functions()
         << new QgsStaticExpressionFunction( QStringLiteral( "array_remove_at" ), QgsExpressionFunction::ParameterList() << QgsExpressionFunction::Parameter( QStringLiteral( "array" ) ) << QgsExpressionFunction::Parameter( QStringLiteral( "pos" ) ), fcnArrayRemoveAt, QStringLiteral( "Arrays" ) )
         << new QgsStaticExpressionFunction( QStringLiteral( "array_remove_all" ), QgsExpressionFunction::ParameterList() << QgsExpressionFunction::Parameter( QStringLiteral( "array" ) ) << QgsExpressionFunction::Parameter( QStringLiteral( "value" ) ), fcnArrayRemoveAll, QStringLiteral( "Arrays" ) )
         << new QgsStaticExpressionFunction( QStringLiteral( "array_cat" ), -1, fcnArrayCat, QStringLiteral( "Arrays" ) )
-        << new QgsStaticExpressionFunction( QStringLiteral( "array_slice" ), QgsExpressionFunction::ParameterList() << QgsExpressionFunction::Parameter( QStringLiteral( "array" ) ) << QgsExpressionFunction::Parameter( QStringLiteral( "startPos" ) ) << QgsExpressionFunction::Parameter( QStringLiteral( "endPos" ) ), fcnArraySlice, QStringLiteral( "Arrays" ) )
+        << new QgsStaticExpressionFunction( QStringLiteral( "array_slice" ), QgsExpressionFunction::ParameterList() << QgsExpressionFunction::Parameter( QStringLiteral( "array" ) ) << QgsExpressionFunction::Parameter( QStringLiteral( "start_pos" ) ) << QgsExpressionFunction::Parameter( QStringLiteral( "end_pos" ) ), fcnArraySlice, QStringLiteral( "Arrays" ) )
         << new QgsStaticExpressionFunction( QStringLiteral( "array_reverse" ), QgsExpressionFunction::ParameterList() << QgsExpressionFunction::Parameter( QStringLiteral( "array" ) ), fcnArrayReverse, QStringLiteral( "Arrays" ) )
         << new QgsStaticExpressionFunction( QStringLiteral( "array_intersect" ), QgsExpressionFunction::ParameterList() << QgsExpressionFunction::Parameter( QStringLiteral( "array1" ) ) << QgsExpressionFunction::Parameter( QStringLiteral( "array2" ) ), fcnArrayIntersect, QStringLiteral( "Arrays" ) )
         << new QgsStaticExpressionFunction( QStringLiteral( "array_distinct" ), 1, fcnArrayDistinct, QStringLiteral( "Arrays" ) )

diff --git a/tests/src/core/testqgsexpression.cpp b/tests/src/core/testqgsexpression.cpp
@@ -2425,6 +2425,7 @@ class TestQgsExpression: public QObject
 
       QCOMPARE( QgsExpression( "array_slice(array('Dufour','Valmiera','Chugiak','Brighton'),1,2) = array('Valmiera','Chugiak')" ).evaluate( &context ), QVariant( true ) );
       QCOMPARE( QgsExpression( "array_slice(array('Dufour','Valmiera','Chugiak','Brighton'),-2,-1) = array('Chugiak','Brighton')" ).evaluate( &context ), QVariant( true ) );
+      QCOMPARE( QgsExpression( "array_slice( array(), 0, 3) = array()" ).evaluate( &context ), QVariant( true ) );
     }
 
     void eval_int_array()