[QGIS Commit] r15203 - trunk/qgis/src/core

[svn_qgis at osgeo.org]

Author: wonder
Date: 2011-02-18 11:23:27 -0800 (Fri, 18 Feb 2011)
New Revision: 15203

Modified:
   trunk/qgis/src/core/qgssearchstringparser.yy
Log:
"in"/"not in" is a predicate (#3503)


Modified: trunk/qgis/src/core/qgssearchstringparser.yy
===================================================================
--- trunk/qgis/src/core/qgssearchstringparser.yy	2011-02-18 18:58:55 UTC (rev 15202)
+++ trunk/qgis/src/core/qgssearchstringparser.yy	2011-02-18 19:23:27 UTC (rev 15203)
@@ -127,6 +127,8 @@
     // more predicates to come
 predicate:
     comp_predicate 
+    | scalar_exp IN '(' scalar_exp_list ')' { $$ = new QgsSearchTreeNode(QgsSearchTreeNode::opIN, $1, $4); joinTmpNodes($$,$1,$4); }
+    | scalar_exp NOT IN '(' scalar_exp_list ')' { $$ = new QgsSearchTreeNode(QgsSearchTreeNode::opNOTIN, $1, $5); joinTmpNodes($$,$1,$5); }
     ;
 
 comp_predicate:
@@ -176,8 +178,6 @@
     | STRING                      { $$ = new QgsSearchTreeNode(QString::fromUtf8(yytext), 0); addToTmpNodes($$); }
     | NULLVALUE                   { $$ = new QgsSearchTreeNode(QString::null, 0); addToTmpNodes($$); }
     | COLUMN_REF                  { $$ = new QgsSearchTreeNode(QString::fromUtf8(yytext), 1); addToTmpNodes($$); }
-    | scalar_exp IN '(' scalar_exp_list ')' { $$ = new QgsSearchTreeNode(QgsSearchTreeNode::opIN, $1, $4); joinTmpNodes($$,$1,$4); }
-    | scalar_exp NOT IN '(' scalar_exp_list ')' { $$ = new QgsSearchTreeNode(QgsSearchTreeNode::opNOTIN, $1, $5); joinTmpNodes($$,$1,$5); }
 ;
 
 %%