mirror of
https://github.com/ton-blockchain/ton
synced 2025-03-09 15:40:10 +00:00
[Tolk] Completely rework stdlib: multiple files and renaming
- split stdlib.tolk into multiple files (tolk-stdlib/ folder) (the "core" common.tolk is auto-imported, the rest are needed to be explicitly imported like "@stdlib/tvm-dicts.tolk") - all functions were renamed to long and clear names - new naming is camelCase
This commit is contained in:
tolk-vm
parent
e2edadba92
commit
12ff28ac94
48 changed files with 2966 additions and 2458 deletions
|
|
@ -1,32 +1,32 @@
|
|||
fun store_u32(b: builder, value: int): builder {
|
||||
return b.store_uint(value, 32);
|
||||
return b.storeUint(value, 32);
|
||||
}
|
||||
fun ~store_u32(b: builder, value: int): (builder, ()) {
|
||||
return ~store_uint(b, value, 32);
|
||||
return ~storeUint(b, value, 32);
|
||||
}
|
||||
|
||||
fun load_u32(cs: slice): (slice, int) {
|
||||
return cs.load_uint(32);
|
||||
return cs.loadUint(32);
|
||||
}
|
||||
|
||||
fun my_load_int(s: slice, len: int): (slice, int)
|
||||
fun my_loadInt(s: slice, len: int): (slice, int)
|
||||
asm(s len -> 1 0) "LDIX"; // top is "value slice"
|
||||
fun my_store_int(b: builder, x: int, len: int): builder
|
||||
fun my_storeInt(b: builder, x: int, len: int): builder
|
||||
asm(x b len) "STIX";
|
||||
fun ~my_store_int(b: builder, x: int, len: int): (builder, ())
|
||||
fun ~my_storeInt(b: builder, x: int, len: int): (builder, ())
|
||||
asm(x b len) "STIX";
|
||||
|
||||
@method_id(101)
|
||||
fun test1(): [int,int,int,int,int] {
|
||||
var b: builder = begin_cell().store_uint(1, 32);
|
||||
b = b.store_uint(2, 32);
|
||||
b~store_uint(3, 32);
|
||||
var b: builder = beginCell().storeUint(1, 32);
|
||||
b = b.storeUint(2, 32);
|
||||
b~storeUint(3, 32);
|
||||
b = b.store_u32(4);
|
||||
b~store_u32(5);
|
||||
|
||||
var cs: slice = b.end_cell().begin_parse();
|
||||
var (cs redef, one: int) = cs.load_uint(32);
|
||||
var (two: int, three: int) = (cs~load_uint(32), cs~load_u32());
|
||||
var cs: slice = b.endCell().beginParse();
|
||||
var (cs redef, one: int) = cs.loadUint(32);
|
||||
var (two: int, three: int) = (cs~loadUint(32), cs~load_u32());
|
||||
var (cs redef, four: int) = cs.load_u32();
|
||||
var five: int = cs~load_u32();
|
||||
|
||||
|
|
@ -35,82 +35,82 @@ fun test1(): [int,int,int,int,int] {
|
|||
|
||||
@method_id(102)
|
||||
fun test2(): [int,int,int] {
|
||||
var b: builder = begin_cell().my_store_int(1, 32);
|
||||
b = b.my_store_int(2, 32);
|
||||
b~my_store_int(3, 32);
|
||||
var b: builder = beginCell().my_storeInt(1, 32);
|
||||
b = b.my_storeInt(2, 32);
|
||||
b~my_storeInt(3, 32);
|
||||
|
||||
var cs: slice = b.end_cell().begin_parse();
|
||||
var (cs redef, one: int) = cs.my_load_int(32);
|
||||
var (two: int, three: int) = (cs~my_load_int(32), cs~my_load_int(32));
|
||||
var cs: slice = b.endCell().beginParse();
|
||||
var (cs redef, one: int) = cs.my_loadInt(32);
|
||||
var (two: int, three: int) = (cs~my_loadInt(32), cs~my_loadInt(32));
|
||||
|
||||
return [one,two,three];
|
||||
}
|
||||
|
||||
@method_id(103)
|
||||
fun test3(ret: int): int {
|
||||
var (_, same: int) = begin_cell().store_uint(ret,32).end_cell().begin_parse().load_uint(32);
|
||||
var (_, same: int) = beginCell().storeUint(ret,32).endCell().beginParse().loadUint(32);
|
||||
return same;
|
||||
}
|
||||
|
||||
@method_id(104)
|
||||
fun test4(): [int,int] {
|
||||
var b: builder = my_store_int(begin_cell(), 1, 32);
|
||||
b = store_int(store_int(b, 2, 32), 3, 32);
|
||||
var b: builder = my_storeInt(beginCell(), 1, 32);
|
||||
b = storeInt(storeInt(b, 2, 32), 3, 32);
|
||||
|
||||
var cs: slice = b.end_cell().begin_parse();
|
||||
var cs32: slice = cs.first_bits(32); // todo s.first_bits()~load_uint() doesn't work, 'lvalue expected'
|
||||
var (one, _, three) = (cs32~load_int(32), cs~skip_bits(64), cs~load_u32());
|
||||
var cs: slice = b.endCell().beginParse();
|
||||
var cs32: slice = cs.getFirstBits(32); // todo s.first_bits()~loadUint() doesn't work, 'lvalue expected'
|
||||
var (one, _, three) = (cs32~loadInt(32), cs~skipBits(64), cs~load_u32());
|
||||
|
||||
return [one,three];
|
||||
}
|
||||
|
||||
@method_id(105)
|
||||
fun test5(): [int,int] {
|
||||
var cref: cell = end_cell(store_u32(begin_cell(), 105));
|
||||
var c: cell = begin_cell().store_ref(cref).store_ref(cref).store_u32(1).end_cell();
|
||||
var cref: cell = endCell(store_u32(beginCell(), 105));
|
||||
var c: cell = beginCell().storeRef(cref).storeRef(cref).store_u32(1).endCell();
|
||||
|
||||
var cs: slice = begin_parse(c);
|
||||
// todo I want cs~load_ref().begin_parse()~load_u32(), but 'lvalue expected'
|
||||
var ref1 = cs~load_ref().begin_parse();
|
||||
var ref2 = cs~load_ref().begin_parse();
|
||||
var sto5x2: int = ref1~load_u32() + ref2~load_uint(32);
|
||||
var cs: slice = beginParse(c);
|
||||
// todo I want cs~loadRef().beginParse()~load_u32(), but 'lvalue expected'
|
||||
var ref1 = cs~loadRef().beginParse();
|
||||
var ref2 = cs~loadRef().beginParse();
|
||||
var sto5x2: int = ref1~load_u32() + ref2~loadUint(32);
|
||||
return [sto5x2, cs~load_u32()];
|
||||
}
|
||||
|
||||
|
||||
fun ~sumNumbersInSlice(s: slice): (slice, int) {
|
||||
var result = 0;
|
||||
while (!slice_data_empty?(s)) {
|
||||
result += s~load_uint(32);
|
||||
while (!s.isEndOfSliceBits()) {
|
||||
result += s~loadUint(32);
|
||||
}
|
||||
return (s, result);
|
||||
}
|
||||
|
||||
@method_id(106)
|
||||
fun test6() {
|
||||
var ref = begin_cell().store_int(100, 32).end_cell();
|
||||
var s: slice = begin_cell().store_int(1, 32).store_int(2, 32).store_ref(ref).end_cell().begin_parse();
|
||||
var result = (slice_bits(s), s~sumNumbersInSlice(), slice_bits(s), slice_empty?(s), slice_data_empty?(s), slice_refs_empty?(s));
|
||||
var ref2: cell = s~load_ref();
|
||||
var s2: slice = ref2.begin_parse();
|
||||
s.end_parse();
|
||||
return (result, s2~load_int(32), s2.slice_empty?());
|
||||
var ref = beginCell().storeInt(100, 32).endCell();
|
||||
var s: slice = beginCell().storeInt(1, 32).storeInt(2, 32).storeRef(ref).endCell().beginParse();
|
||||
var result = (getRemainingBitsCount(s), s~sumNumbersInSlice(), getRemainingBitsCount(s), isEndOfSlice(s), isEndOfSliceBits(s), isEndOfSliceRefs(s));
|
||||
var ref2: cell = s~loadRef();
|
||||
var s2: slice = ref2.beginParse();
|
||||
s.assertEndOfSlice();
|
||||
return (result, s2~loadInt(32), s2.isEndOfSlice());
|
||||
}
|
||||
|
||||
@method_id(107)
|
||||
fun test7() {
|
||||
var s: slice = begin_cell().store_int(1, 32).store_int(2, 32).store_int(3, 32).store_int(4, 32).store_int(5, 32).store_int(6, 32).store_int(7, 32).end_cell().begin_parse();
|
||||
var size1 = slice_bits(s);
|
||||
s~skip_bits(32);
|
||||
var s1: slice = s.first_bits(64);
|
||||
var n1 = s1~load_int(32);
|
||||
var size2 = slice_bits(s);
|
||||
s~load_int(32);
|
||||
var size3 = slice_bits(s);
|
||||
s~skip_last_bits(32);
|
||||
var size4 = slice_bits(s);
|
||||
var n2 = s~load_int(32);
|
||||
var size5 = slice_bits(s);
|
||||
var s: slice = beginCell().storeInt(1, 32).storeInt(2, 32).storeInt(3, 32).storeInt(4, 32).storeInt(5, 32).storeInt(6, 32).storeInt(7, 32).endCell().beginParse();
|
||||
var size1 = getRemainingBitsCount(s);
|
||||
s~skipBits(32);
|
||||
var s1: slice = s.getFirstBits(64);
|
||||
var n1 = s1~loadInt(32);
|
||||
var size2 = getRemainingBitsCount(s);
|
||||
s~loadInt(32);
|
||||
var size3 = getRemainingBitsCount(s);
|
||||
s~removeLastBits(32);
|
||||
var size4 = getRemainingBitsCount(s);
|
||||
var n2 = s~loadInt(32);
|
||||
var size5 = getRemainingBitsCount(s);
|
||||
return (n1, n2, size1, size2, size3, size4, size5);
|
||||
}
|
||||
|
||||
|
|
@ -118,13 +118,13 @@ fun test7() {
|
|||
fun test108() {
|
||||
var (result1, result2) = (0, 0);
|
||||
try {
|
||||
begin_cell().store_ref(begin_cell().end_cell()).end_cell().begin_parse().end_parse();
|
||||
beginCell().storeRef(beginCell().endCell()).endCell().beginParse().assertEndOfSlice();
|
||||
result1 = 100;
|
||||
} catch (code) {
|
||||
result1 = code;
|
||||
}
|
||||
try {
|
||||
begin_cell().end_cell().begin_parse().end_parse();
|
||||
beginCell().endCell().beginParse().assertEndOfSlice();
|
||||
result2 = 100;
|
||||
} catch (code) {
|
||||
result2 = code;
|
||||
|
|
@ -134,18 +134,48 @@ fun test108() {
|
|||
|
||||
@method_id(109)
|
||||
fun test109() {
|
||||
var ref2 = begin_cell().store_int(1, 32).end_cell();
|
||||
var ref1 = begin_cell().store_int(1, 32).store_ref(ref2).end_cell();
|
||||
var c = begin_cell().store_int(444, 32).store_ref(ref1).store_ref(ref1).store_ref(ref1).store_ref(ref2).store_int(4, 32).end_cell();
|
||||
var (n_cells1, n_bits1, n_refs1) = c.compute_data_size(10);
|
||||
var s = c.begin_parse();
|
||||
s~load_ref();
|
||||
s~load_ref();
|
||||
var n = s~load_int(32);
|
||||
var (n_cells2, n_bits2, n_refs2) = s.slice_compute_data_size(10);
|
||||
var ref2 = beginCell().storeInt(1, 32).endCell();
|
||||
var ref1 = beginCell().storeInt(1, 32).storeRef(ref2).endCell();
|
||||
var c = beginCell().storeInt(444, 32).storeRef(ref1).storeRef(ref1).storeRef(ref1).storeRef(ref2).storeInt(4, 32).endCell();
|
||||
var (n_cells1, n_bits1, n_refs1) = c.calculateCellSizeStrict(10);
|
||||
var s = c.beginParse();
|
||||
s~loadRef();
|
||||
s~loadRef();
|
||||
var n = s~loadInt(32);
|
||||
var (n_cells2, n_bits2, n_refs2) = s.calculateSliceSizeStrict(10);
|
||||
return ([n_cells1, n_bits1, n_refs1], [n_cells2, n_bits2, n_refs2], n);
|
||||
}
|
||||
|
||||
@method_id(110)
|
||||
fun test110(x: int) {
|
||||
var s = beginCell().storeBool(x < 0).storeBool(0).storeBool(x).endCell().beginParse();
|
||||
return (s~loadBool(), s~loadBool(), s~loadBool());
|
||||
}
|
||||
|
||||
@method_id(111)
|
||||
fun test111() {
|
||||
var s = beginCell().storeMessageOp(123).storeMessageQueryId(456)
|
||||
.storeAddressNone().storeAddressNone()
|
||||
.storeUint(0, 32)
|
||||
.storeUint(123, 32).storeUint(456, 64).storeUint(789, 64)
|
||||
.endCell().beginParse();
|
||||
var op1 = s~loadUint(32);
|
||||
var q1 = s~loadUint(64);
|
||||
if (s.addressIsNone()) {
|
||||
s~skipBits(2);
|
||||
}
|
||||
if (s~loadBool() == 0) {
|
||||
assert(s~loadBool() == 0) throw 444;
|
||||
s~skipBits(32);
|
||||
}
|
||||
var op2 = s~loadMessageOp();
|
||||
var q2 = s~loadMessageQueryId();
|
||||
s~skipBits(64);
|
||||
s.assertEndOfSlice();
|
||||
assert(isMessageBounced(0x001)) throw 444;
|
||||
return (op1, q1, op2, q2);
|
||||
}
|
||||
|
||||
fun main(): int {
|
||||
return 0;
|
||||
}
|
||||
|
|
@ -160,4 +190,7 @@ fun main(): int {
|
|||
@testcase | 107 | | 2 3 224 192 160 128 96
|
||||
@testcase | 108 | | 9 100
|
||||
@testcase | 109 | | [ 3 128 5 ] [ 2 96 3 ] 444
|
||||
@testcase | 110 | -1 | -1 0 -1
|
||||
@testcase | 110 | 0 | 0 0 0
|
||||
@testcase | 111 | | 123 456 123 456
|
||||
*/
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue