fix interpretation of numeric constants in scientic notation (fixes #…

…10939)
qgis · Oct 22, 2014 · d833c22 · d833c22
1 parent 99c5c10
commit d833c22
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/src/core/qgsexpressionlexer.ll b/src/core/qgsexpressionlexer.ll
@@ -110,7 +110,7 @@ column_ref_quoted  "\""{col_str_char}*"\""
 
 dig         [0-9]
 num_int     {dig}+
-num_float   {dig}*\.{dig}+([eE][-+]?{dig}+)?
+num_float   {dig}*(\.{dig}+([eE][-+]?{dig}+)?|[eE][-+]?{dig}+)
 
 str_char    ('')|(\\.)|[^'\\]
 string      "'"{str_char}*"'"
@@ -159,14 +159,14 @@ string      "'"{str_char}*"'"
 
 ","   { return COMMA; }
 
-{num_float}  { yylval->numberFloat  = cLocale.toDouble( QString::fromAscii(yytext) ); return NUMBER_FLOAT; }
+{num_float}  { yylval->numberFloat = cLocale.toDouble( QString::fromAscii(yytext) ); return NUMBER_FLOAT; }
 {num_int}  {
 	bool ok;
-  yylval->numberInt = cLocale.toInt( QString::fromAscii(yytext), &ok, 10 );
+	yylval->numberInt = cLocale.toInt( QString::fromAscii(yytext), &ok, 10 );
 	if( ok )
 		return NUMBER_INT;
 
-  yylval->numberFloat  = cLocale.toDouble( QString::fromAscii(yytext), &ok );
+	yylval->numberFloat = cLocale.toDouble( QString::fromAscii(yytext), &ok );
 	if( ok )
 		return NUMBER_FLOAT;
 

diff --git a/tests/src/core/testqgsexpression.cpp b/tests/src/core/testqgsexpression.cpp
@@ -148,6 +148,9 @@ class TestQgsExpression: public QObject
       QTest::newRow( "literal int" ) << "123" << false << QVariant( 123 );
       QTest::newRow( "literal double" ) << "1.2" << false << QVariant( 1.2 );
       QTest::newRow( "literal text" ) << "'hello'" << false << QVariant( "hello" );
+      QTest::newRow( "literal double" ) << ".000001" << false << QVariant( 0.000001 );
+      QTest::newRow( "literal double" ) << "1.0e-6" << false << QVariant( 0.000001 );
+      QTest::newRow( "literal double" ) << "1e-6" << false << QVariant( 0.000001 );
 
       // unary minus
       QTest::newRow( "unary minus double" ) << "-1.3" << false << QVariant( -1.3 );