Skip to content
Permalink
Browse files

fix #6640

  • Loading branch information
jef-n committed Apr 7, 2013
1 parent 22cb38b commit eeebf5bd17b4cd8a10707dda6b32966659ca28d0
Showing with 12 additions and 1 deletion.
  1. +12 −1 src/core/qgsexpressionlexer.ll
@@ -155,7 +155,18 @@ string "'"{str_char}*"'"
"," { return COMMA; }
{num_float} { exp_lval.numberFloat = cLocale.toDouble( QString::fromAscii(yytext) ); return NUMBER_FLOAT; }
{num_int} { exp_lval.numberInt = cLocale.toInt( QString::fromAscii(yytext), 0, 10); return NUMBER_INT; }
{num_int} {
bool ok;
exp_lval.numberInt = cLocale.toInt( QString::fromAscii(yytext), &ok, 10 );
if( ok )
return NUMBER_INT;
exp_lval.numberFloat = cLocale.toDouble( QString::fromAscii(yytext), &ok );
if( ok )
return NUMBER_FLOAT;
return Unknown_CHARACTER;
}
{string} { TEXT_FILTER(stripText); return STRING; }

0 comments on commit eeebf5b

Please sign in to comment.
You can’t perform that action at this time.