diff --git a/elenasrc3/elc/cliconst.h b/elenasrc3/elc/cliconst.h index f555f10d9..d7657f67d 100644 --- a/elenasrc3/elc/cliconst.h +++ b/elenasrc3/elc/cliconst.h @@ -13,7 +13,7 @@ namespace elena_lang { - #define ELC_REVISION_NUMBER 0x020A + #define ELC_REVISION_NUMBER 0x020B #if defined _M_IX86 || _M_X64 diff --git a/elenasrc3/elc/compiler.cpp b/elenasrc3/elc/compiler.cpp index c803f1993..4a21a91e0 100644 --- a/elenasrc3/elc/compiler.cpp +++ b/elenasrc3/elc/compiler.cpp @@ -6882,8 +6882,9 @@ ref_t Compiler :: mapExtension(BuildTreeWriter& writer, Scope& scope, mssg_t& me } if (resolvedMessage) { - if (counter > 1 && implicitSignatureRef == 0) { + if (counter > 1 && (implicitSignatureRef == 0 && getArgCount(message) > 1)) { // HOTFIX : does not resolve an ambigous extension for a weak message + // excluding messages without arguments } else { // if we are lucky - use the resolved one diff --git a/tests60/sandbox/sandbox.l b/tests60/sandbox/sandbox.l index 6975c1d09..c11252a56 100644 --- a/tests60/sandbox/sandbox.l +++ b/tests60/sandbox/sandbox.l @@ -1,15 +1,22 @@ -import system'calendar; -import extensions; - -const int MAX = 50000000; +//import system'calendar; +//import extensions; +// +//const int MAX = 50000000; +// +//public program() +//{ +// real pi := 0.0; +// for(int i := 0, i < MAX, i += 1) +// { +// pi += -1.0.power(i) / (i*2+1) * 4 +// }; +// +// console.printLine(pi); +//} public program() { - real pi := 0.0; - for(int i := 0, i < MAX, i += 1) - { - pi += -1.0.power(i) / (i*2+1) * 4 - }; + int n := 3; - console.printLine(pi); -} + bool b := n.isOdd(); +} \ No newline at end of file