kindred/create
1
1
Fork 0
Code Issues 53 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

Spreadsheet: Fixed parser so it accepts integer numbers written as e.g 1e3.

Browse Source
This commit is contained in:
Eivind Kvedalen
2016-03-04 22:12:20 +01:00
committed by wmayer
parent b606ed8ce4
commit e270dee8cc
2 changed files with 4340 additions and 4330 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/Mod/Spreadsheet/App/ExpressionParser.l
View File

@@ -241,6 +241,7 @@ EXPO [eE][-+]?[0-9]+
{DIGIT}*"."{DIGIT}+{EXPO}? yylval.fvalue = num_change(yytext,'.',','); return yylval.fvalue == 1 ? ONE : NUM;
{DIGIT}*","{DIGIT}+{EXPO}? yylval.fvalue = num_change(yytext,',','.'); return yylval.fvalue == 1 ? ONE : NUM;
{DIGIT}+{EXPO} yylval.fvalue = num_change(yytext,',','.'); return yylval.fvalue == 1 ? ONE : NUM;
{DIGIT}+ yylval.ivalue = strtoll( yytext, NULL, 0 ); if (yylval.ivalue == 1) { yylval.fvalue = 1; return ONE; } else return INTEGER;
"pi" yylval.constant.fvalue = M_PI; yylval.constant.name = "pi"; return CONSTANT; // constant pi

8669
src/Mod/Spreadsheet/App/lex.ExpressionParser.c
View File

File diff suppressed because it is too large Load Diff