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

[svn_qgis at osgeo.org]

Author: jef
Date: 2010-08-27 20:01:13 +0000 (Fri, 27 Aug 2010)
New Revision: 14158

Modified:
   trunk/qgis/src/core/qgssearchstringparser.yy
Log:
fix bison warnings

Modified: trunk/qgis/src/core/qgssearchstringparser.yy
===================================================================
--- trunk/qgis/src/core/qgssearchstringparser.yy	2010-08-27 18:43:02 UTC (rev 14157)
+++ trunk/qgis/src/core/qgssearchstringparser.yy	2010-08-27 20:01:13 UTC (rev 14158)
@@ -98,8 +98,8 @@
 %left NOT
 
 %left COMPARISON
-
 %left CONCAT
+%left IN
 
 %left '+' '-'
 %left '*' '/'
@@ -133,8 +133,8 @@
     ;
 
 scalar_exp_list:
-    | scalar_exp_list ',' scalar_exp { $$ = $1; $1->append($3); joinTmpNodes($1,$1,$3); }
-    | scalar_exp                     { $$ = new QgsSearchTreeNode( QgsSearchTreeNode::tNodeList ); $$->append($1); joinTmpNodes($$,$$,$1); }
+      scalar_exp_list ',' scalar_exp { $$ = $1; $1->append($3); joinTmpNodes($1,$1,$3); }
+    | scalar_exp                     { $$ = new QgsSearchTreeNode( QgsSearchTreeNode::tNodeList ); $$->append($1); joinTmpNodes($$,$1,0); }
     ;
 
 scalar_exp: