mirror of
https://github.com/qgis/QGIS.git
synced 2025-02-25 00:58:06 -05:00
Additional fix for #249 - searching attributes with non-ascii characters.
git-svn-id: http://svn.osgeo.org/qgis/trunk@5763 c8812cc2-4d05-0410-92ff-de0c093fc19c
This commit is contained in:
parent
7cff7dac9e
commit
29fe2fc6f0
@ -20,6 +20,9 @@
|
||||
%option noyywrap
|
||||
%option case-insensitive
|
||||
|
||||
// ensure that lexer will be 8-bit (and not just 7-bit)
|
||||
%option 8bit
|
||||
|
||||
%{
|
||||
|
||||
#include <stdlib.h> // atof()
|
||||
|
@ -119,8 +119,8 @@ scalar_exp:
|
||||
| '+' scalar_exp %prec UMINUS { $$ = $2; }
|
||||
| '-' scalar_exp %prec UMINUS { $$ = $2; if ($$->type() == QgsSearchTreeNode::tNumber) $$->setNumber(- $$->number()); }
|
||||
| NUMBER { $$ = new QgsSearchTreeNode($1); addToTmpNodes($$); }
|
||||
| STRING { $$ = new QgsSearchTreeNode(yytext, 0); addToTmpNodes($$); }
|
||||
| COLUMN_REF { $$ = new QgsSearchTreeNode(yytext, 1); addToTmpNodes($$); }
|
||||
| STRING { $$ = new QgsSearchTreeNode(QString::fromUtf8(yytext), 0); addToTmpNodes($$); }
|
||||
| COLUMN_REF { $$ = new QgsSearchTreeNode(QString::fromUtf8(yytext), 1); addToTmpNodes($$); }
|
||||
;
|
||||
|
||||
%%
|
||||
|
Loading…
x
Reference in New Issue
Block a user