chibicitiberiu/rainmeter-studio
1
0
Fork 0
mirror of https://github.com/chibicitiberiu/rainmeter-studio.git synced 2024-02-24 04:33:31 +00:00
Code Issues Releases Wiki Activity

Calc: Fixed handling of negative numbers without brackets

Browse Source 
"5+-1" is now valid and equal to "5+(-1)".
This commit is contained in:
Birunthan Mohanathas 2012-12-22 11:45:15 +02:00
parent 4e16218dec
commit 0b84213eb6
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Library/MathParser.cpp
View File

@ -67,6 +67,7 @@ enum CharType
CH_DIGIT = 0x02, CH_DIGIT = 0x02,
CH_SEPARAT = 0x04, CH_SEPARAT = 0x04,
CH_SYMBOL = 0x08, CH_SYMBOL = 0x08,
CH_MINUS = 0x10,
CH_FINAL = 0x7F CH_FINAL = 0x7F
}; };
@ -599,6 +600,12 @@ MathTokenType GetNextToken(Lexer& lexer)
lexer.charType = GetCharType(*++lexer.string); lexer.charType = GetCharType(*++lexer.string);
} }
if (lexer.charType == CH_MINUS)
{
// If the - sign follows a symbol, it is treated as a (negative) number.
lexer.charType = (lexer.prevToken == TOK_SYMBOL) ? CH_DIGIT : CH_SYMBOL;
}
switch (lexer.charType) switch (lexer.charType)
{ {
case CH_FINAL: case CH_FINAL:
@ -705,8 +712,10 @@ CharType GetCharType(WCHAR ch)
case L'_': case L'_':
return CH_LETTER; return CH_LETTER;
case L'+':
case L'-': case L'-':
return CH_MINUS;
case L'+':
case L'/': case L'/':
case L'*': case L'*':
case L'~': case L'~':