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

Merge 7a407c4fe3 into 44e7e091b2

Browse source
This commit is contained in:
Andrey Pfau 2025-02-28 21:22:56 +00:00 • committed by GitHub
commit 1f8976026b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 29 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
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 ;; Try to withdraw from withdraw balance
if ((remaining > 0) & ctx_member_withdraw > 0) { if (((remaining > 0) & ctx_member_withdraw) > 0) {
int delta = min(ctx_member_withdraw, remaining); int delta = min(ctx_member_withdraw, remaining);
ctx_member_withdraw = ctx_member_withdraw - delta; ctx_member_withdraw = ctx_member_withdraw - delta;
ctx_balance_withdraw = ctx_balance_withdraw - delta; ctx_balance_withdraw = ctx_balance_withdraw - delta;

33
crypto/func/parse-func.cpp
View file

@ -793,11 +793,11 @@ Expr* parse_expr75(Lexer& lex, CodeBlob& code, bool nv) {
} }
} }
// parse E { (* | / | % | /% ) E } // parse E { ( * | / | % | /% ) E }
Expr* parse_expr30(Lexer& lex, CodeBlob& code, bool nv) { Expr* parse_expr30(Lexer& lex, CodeBlob& code, bool nv) {
Expr* res = parse_expr75(lex, code, nv); Expr* res = parse_expr75(lex, code, nv);
while (lex.tp() == '*' || lex.tp() == '/' || lex.tp() == '%' || lex.tp() == _DivMod || lex.tp() == _DivC || while (lex.tp() == '*' || lex.tp() == '/' || lex.tp() == '%' || lex.tp() == _DivMod || lex.tp() == _DivC ||
lex.tp() == _DivR || lex.tp() == _ModC || lex.tp() == _ModR || lex.tp() == '&') { lex.tp() == _DivR || lex.tp() == _ModC || lex.tp() == _ModR) {
res->chk_rvalue(lex.cur()); res->chk_rvalue(lex.cur());
int t = lex.tp(); int t = lex.tp();
sym_idx_t name = symbols.lookup_add(std::string{"_"} + lex.cur().str + "_"); sym_idx_t name = symbols.lookup_add(std::string{"_"} + lex.cur().str + "_");
@ -815,7 +815,7 @@ Expr* parse_expr30(Lexer& lex, CodeBlob& code, bool nv) {
return res; return res;
} }
// parse [-] E { (+ | - | `|` | ^) E } // parse [-] E { ( + | - ) E }
Expr* parse_expr20(Lexer& lex, CodeBlob& code, bool nv) { Expr* parse_expr20(Lexer& lex, CodeBlob& code, bool nv) {
Expr* res; Expr* res;
int t = lex.tp(); int t = lex.tp();
@ -834,7 +834,7 @@ Expr* parse_expr20(Lexer& lex, CodeBlob& code, bool nv) {
} else { } else {
res = parse_expr30(lex, code, nv); res = parse_expr30(lex, code, nv);
} }
while (lex.tp() == '-' || lex.tp() == '+' || lex.tp() == '|' || lex.tp() == '^') { while (lex.tp() == '-' || lex.tp() == '+') {
res->chk_rvalue(lex.cur()); res->chk_rvalue(lex.cur());
t = lex.tp(); t = lex.tp();
sym_idx_t name = symbols.lookup_add(std::string{"_"} + lex.cur().str + "_"); sym_idx_t name = symbols.lookup_add(std::string{"_"} + lex.cur().str + "_");
@ -852,7 +852,7 @@ Expr* parse_expr20(Lexer& lex, CodeBlob& code, bool nv) {
return res; return res;
} }
// parse E { ( << | >> | >>~ | >>^ ) E } // parse E { ( << | >> | ~>> | ^>> ) E }
Expr* parse_expr17(Lexer& lex, CodeBlob& code, bool nv) { Expr* parse_expr17(Lexer& lex, CodeBlob& code, bool nv) {
Expr* res = parse_expr20(lex, code, nv); Expr* res = parse_expr20(lex, code, nv);
while (lex.tp() == _Lshift || lex.tp() == _Rshift || lex.tp() == _RshiftC || lex.tp() == _RshiftR) { while (lex.tp() == _Lshift || lex.tp() == _Rshift || lex.tp() == _RshiftC || lex.tp() == _RshiftR) {
@ -895,9 +895,30 @@ Expr* parse_expr15(Lexer& lex, CodeBlob& code, bool nv) {
return res; return res;
} }
// parse E { ( '|' | & | ^ ) E }
Expr* parse_expr14(Lexer& lex, CodeBlob& code, const bool nv) {
Expr* res = parse_expr15(lex, code, nv);
while (lex.tp() == '|' || lex.tp() == '&' || lex.tp() == '^') {
res->chk_rvalue(lex.cur());
int t = lex.tp();
const sym_idx_t name = symbols.lookup_add(std::string{"_"} + lex.cur().str + "_");
check_global_func(lex.cur(), name);
const SrcLocation loc{lex.cur().loc};
lex.next();
auto x = parse_expr15(lex, code, false);
x->chk_rvalue(lex.cur());
res = new Expr{Expr::_Apply, name, {res, x}};
res->here = loc;
res->set_val(t);
res->flags = Expr::_IsRvalue;
res->deduce_type(lex.cur());
}
return res;
}
// parse E [ ? E : E ] // parse E [ ? E : E ]
Expr* parse_expr13(Lexer& lex, CodeBlob& code, bool nv) { Expr* parse_expr13(Lexer& lex, CodeBlob& code, bool nv) {
Expr* res = parse_expr15(lex, code, nv); Expr* res = parse_expr14(lex, code, nv);
if (lex.tp() == '?') { if (lex.tp() == '?') {
res->chk_rvalue(lex.cur()); res->chk_rvalue(lex.cur());
SrcLocation loc{lex.cur().loc}; SrcLocation loc{lex.cur().loc};