diff --git a/Application/Application.rc b/Application/Application.rc index 0131a5c5..306e0f1d 100644 --- a/Application/Application.rc +++ b/Application/Application.rc @@ -28,8 +28,8 @@ LANGUAGE LANG_FINNISH, SUBLANG_DEFAULT // VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,3,0,454 - PRODUCTVERSION 1,3,0,454 + FILEVERSION 1,3,0,455 + PRODUCTVERSION 1,3,0,455 FILEFLAGSMASK 0x17L #ifdef _DEBUG FILEFLAGS 0x1L @@ -45,12 +45,12 @@ BEGIN BLOCK "040b04b0" BEGIN VALUE "FileDescription", "Rainmeter - A Customizable Resource Meter" - VALUE "FileVersion", "1, 3, 0, 454" + VALUE "FileVersion", "1, 3, 0, 455" VALUE "InternalName", "Rainmeter" VALUE "LegalCopyright", "Copyright (C) 2010 - Rainy" VALUE "OriginalFilename", "Rainmeter.exe" VALUE "ProductName", "Rainmeter" - VALUE "ProductVersion", "1, 3, 0, 454" + VALUE "ProductVersion", "1, 3, 0, 455" END END BLOCK "VarFileInfo" diff --git a/Library/ccalc-0.5.1/lexer.c b/Library/ccalc-0.5.1/lexer.c index 5836ea33..535664ce 100644 --- a/Library/ccalc-0.5.1/lexer.c +++ b/Library/ccalc-0.5.1/lexer.c @@ -137,8 +137,14 @@ next_token: intreaded = 1; } // Readind oct number - if ( ch == '0' && nch >= '0' && nch <= '9' ) { - lexer->IntValue = strtol( lexer->SS, &NewSS, 8 ); + if ( ch == '0' && nch == 'o') { // original version: if ( ch == '0' && nch >= '0' && nch <='9') + lexer->IntValue = strtol( lexer->SS+2, &NewSS, 8 ); + intreaded = 1; + } + + // Readind bin number + if ( ch == '0' && nch == 'b') { // original version: if ( ch == '0' && nch >= '0' && nch <='9') + lexer->IntValue = strtol( lexer->SS+2, &NewSS, 2 ); intreaded = 1; } diff --git a/revision-number.h b/revision-number.h index c462a5a6..89584d59 100644 --- a/revision-number.h +++ b/revision-number.h @@ -1,2 +1,2 @@ #pragma once -const int revision_number = 454; \ No newline at end of file +const int revision_number = 455; \ No newline at end of file