Skip to content
Permalink
Browse files
"in"/"not in" is a predicate (#3503)
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@15203 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
wonder committed Feb 18, 2011
1 parent 5470fd9 commit 413331f921b9c5877b650bb0f1cc9991c66888a1
Showing with 2 additions and 2 deletions.
  1. +2 −2 src/core/qgssearchstringparser.yy
@@ -127,6 +127,8 @@ search_cond:
// 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 @@ scalar_exp:
| 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); }
;

%%

0 comments on commit 413331f

Please sign in to comment.