expression: more comments and test to avoid differences between operators declaration and text values

3nids · 3nids · commit ea33122a5435 · 2014-12-12T15:28:57.000+01:00
diff --git a/src/core/qgsexpression.cpp b/src/core/qgsexpression.cpp
@@ -212,6 +212,7 @@ inline bool isNull( const QVariant& v ) { return v.isNull(); }
 
 const char* QgsExpression::BinaryOperatorText[] =
 {
+  // this must correspond (number and order of element) to the declaration of the enum BinaryOperator
   "OR", "AND",
   "=", "<>", "<=", ">=", "<", ">", "~", "LIKE", "NOT LIKE", "ILIKE", "NOT ILIKE", "IS", "IS NOT",
   "+", "-", "*", "/", "//", "%", "^",
@@ -220,6 +221,7 @@ const char* QgsExpression::BinaryOperatorText[] =
 
 const char* QgsExpression::UnaryOperatorText[] =
 {
+  // this must correspond (number and order of element) to the declaration of the enum UnaryOperator
   "NOT", "-"
 };
 
diff --git a/src/core/qgsexpression.h b/src/core/qgsexpression.h
@@ -210,11 +210,20 @@ class CORE_EXPORT QgsExpression
     */
     static double evaluateToDouble( const QString& text, const double fallbackValue );
 
+    /**
+     * @brief list of unary operators
+     * @note if any change is made here, the definition of QgsExpression::UnaryOperatorText[] must be adapted.
+     */
     enum UnaryOperator
     {
       uoNot,
       uoMinus,
     };
+
+    /**
+     * @brief list of binary operators
+     * @note if any change is made here, the definition of QgsExpression::BinaryOperatorText[] must be adapted.
+     */
     enum BinaryOperator
     {
       // logical
diff --git a/tests/src/core/testqgsexpression.cpp b/tests/src/core/testqgsexpression.cpp
@@ -468,6 +468,9 @@ class TestQgsExpression: public QObject
 
     void eval_precedence()
     {
+      QCOMPARE(QgsExpression::BinaryOperatorText[QgsExpression::boDiv],"/");
+      QCOMPARE(QgsExpression::BinaryOperatorText[QgsExpression::boConcat],"||");
+
       QgsExpression e0( "1+2*3" );
       QCOMPARE( e0.evaluate().toInt(), 7 );
 

Original file line number	Diff line number	Diff line change
`@@ -212,6 +212,7 @@ inline bool isNull( const QVariant& v ) { return v.isNull(); }`
`212`	`212`
`213`	`213`	`const char* QgsExpression::BinaryOperatorText[] =`
`214`	`214`	`{`
	`215`	`+ // this must correspond (number and order of element) to the declaration of the enum BinaryOperator`
`215`	`216`	`"OR", "AND",`
`216`	`217`	`"=", "<>", "<=", ">=", "<", ">", "~", "LIKE", "NOT LIKE", "ILIKE", "NOT ILIKE", "IS", "IS NOT",`
`217`	`218`	`"+", "-", "*", "/", "//", "%", "^",`
`@@ -220,6 +221,7 @@ const char* QgsExpression::BinaryOperatorText[] =`
`220`	`221`
`221`	`222`	`const char* QgsExpression::UnaryOperatorText[] =`
`222`	`223`	`{`
	`224`	`+ // this must correspond (number and order of element) to the declaration of the enum UnaryOperator`
`223`	`225`	`"NOT", "-"`
`224`	`226`	`};`
`225`	`227`
Original file line number	Diff line number	Diff line change
`@@ -468,6 +468,9 @@ class TestQgsExpression: public QObject`
`468`	`468`
`469`	`469`	`void eval_precedence()`
`470`	`470`	`{`
	`471`	`+ QCOMPARE(QgsExpression::BinaryOperatorText[QgsExpression::boDiv],"/");`
	`472`	`+ QCOMPARE(QgsExpression::BinaryOperatorText[QgsExpression::boConcat],"\|\|");`
	`473`	`+`
`471`	`474`	`QgsExpression e0( "1+2*3" );`
`472`	`475`	`QCOMPARE( e0.evaluate().toInt(), 7 );`
`473`	`476`