external/ton
1
0
Fork 0
mirror of https://github.com/ton-blockchain/ton synced 2025-03-09 15:40:10 +00:00
Code Issues Releases Wiki Activity

[FunC] Change priority of & | ^ operators to a more intuitive one

Browse source 
Before, such code `if (slices_equal() & status == 1)` was parsed
as `if( (slices_equal()&status) == 1 )`.
Note, that this change leads to hash changes of some verified contracts,
but a new priority is more expected from the user experience.
This commit is contained in:
Aleksandr Kirsanov 2024-05-11 13:57:42 +03:00
parent aee51731ce
commit 7afa9292c3
No known key found for this signature in database
GPG key ID: B758BBAA01FFB3D3
3 changed files with 77 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
crypto/func/auto-tests/legacy_tests/whales-nominators/modules/model.fc
View file

@ -137,7 +137,7 @@ int apply_profit(int value, int value_profit, int profit) {
}
;; Try to withdraw from withdraw balance
if ((remaining > 0) & ctx_member_withdraw > 0) {
if (((remaining > 0) & ctx_member_withdraw) > 0) { ;; such strange brackets to remain hash stable after & priority fix
int delta = min(ctx_member_withdraw, remaining);
ctx_member_withdraw = ctx_member_withdraw - delta;
ctx_balance_withdraw = ctx_balance_withdraw - delta;
@ -294,4 +294,4 @@ int owned_balance() {
;; Reset sent amount
ctx_balance_sent = 0;
}
}

48
crypto/func/auto-tests/tests/op_priority.fc Normal file
View file

@ -0,0 +1,48 @@
int justTrue() { return true; }
int test1(int x, int y, int z) method_id(101) {
return x > 0 & y > 0 & z > 0;
}
int test2(int x, int y, int z) method_id(102) {
return x > (0 & y > 0 & z > 0);
}
int test3(int x, int y, int z) method_id(103) {
if (x < 0 | y < 0) {
return z < 0;
}
return x > 0 & y > 0;
}
int test4(int x, int y, int mode) method_id(104) {
if (mode == 1) {
return x == 10 | (y == 20);
} if (mode == 2) {
return x == 10 | y == 20;
} else {
return x == (10 | (y == 20));
}
}
int test5(int status) method_id(105) {
return justTrue() & status == 1 & (justTrue() & status) == 1;
}
() main() { }
{-
TESTCASE | 101 | 1 2 3 | -1
TESTCASE | 101 | 1 0 3 | 0
TESTCASE | 101 | 1 2 -1 | 0
TESTCASE | 102 | 1 0 0 | -1
TESTCASE | 103 | -1 -2 -3 | -1
TESTCASE | 103 | -1 -2 0 | 0
TESTCASE | 103 | 1 2 0 | -1
TESTCASE | 103 | 1 0 2 | 0
TESTCASE | 104 | 10 20 1 | -1
TESTCASE | 104 | 10 20 2 | -1
TESTCASE | 104 | 10 20 3 | 0
TESTCASE | 105 | 1 | -1
TESTCASE | 105 | 0 | 0
-}