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

[Tolk] Get rid of ~tilda with mutate and self methods

Browse source 
This is a very big change.
If FunC has `.methods()` and `~methods()`, Tolk has only dot,
one and only way to call a `.method()`.
A method may mutate an object, or may not.
It's a behavioral and semantic difference from FunC.

- `cs.loadInt(32)` modifies a slice and returns an integer
- `b.storeInt(x, 32)` modifies a builder
- `b = b.storeInt()` also works, since it not only modifies, but returns
- chained methods also work, they return `self`
- everything works exactly as expected, similar to JS
- no runtime overhead, exactly same Fift instructions
- custom methods are created with ease
- tilda `~` does not exist in Tolk at all
This commit is contained in:
tolk-vm 2024-10-31 11:18:54 +04:00
parent 12ff28ac94
commit d9dba320cc
No known key found for this signature in database
GPG key ID: 7905DD7FE0324B12
85 changed files with 2710 additions and 1965 deletions
Download patch file Download diff file Expand all files Collapse all files

75
tolk-tester/tests/dicts-demo.tolk
View file

@ -1,8 +1,7 @@
import "@stdlib/tvm-dicts"
fun ~addIntToIDict(iDict: cell, key: int, number: int): (cell, ()) {
iDict~iDictSetBuilder(32, key, beginCell().storeInt(number, 32));
return (iDict, ());
fun addIntToIDict(mutate self: cell, key: int, number: int): void {
return self.iDictSetBuilder(32, key, beginCell().storeInt(number, 32));
}
fun calculateDictLen(d: cell) {
@ -15,40 +14,40 @@ fun calculateDictLen(d: cell) {
return len;
}
fun ~loadTwoDigitNumberFromSlice(s: slice): (slice, int) {
var n1 = s~loadInt(8);
var n2 = s~loadInt(8);
return (s, (n1 - 48) * 10 + (n2 - 48));
fun loadTwoDigitNumberFromSlice(mutate self: slice): int {
var n1 = self.loadInt(8);
var n2 = self.loadInt(8);
return (n1 - 48) * 10 + (n2 - 48);
}
@method_id(101)
fun test101(getK1: int, getK2: int, getK3: int) {
var dict = createEmptyDict();
dict~uDictSetBuilder(32, 1, beginCell().storeUint(1, 32));
var (old1: slice, found1) = dict~uDictSetAndGet(32, getK1, beginCell().storeUint(2, 32).endCell().beginParse());
var (old2: slice, found2) = dict~uDictSetAndGet(32, getK2, beginCell().storeUint(3, 32).endCell().beginParse());
dict.uDictSetBuilder(32, 1, beginCell().storeUint(1, 32));
var (old1: slice, found1) = dict.uDictSetAndGet(32, getK1, beginCell().storeUint(2, 32).endCell().beginParse());
var (old2: slice, found2) = dict.uDictSetAndGet(32, getK2, beginCell().storeUint(3, 32).endCell().beginParse());
var (cur3: slice, found3) = dict.uDictGet(32, getK3);
return (
found1 ? old1~loadUint(32) : -1,
found2 ? old2~loadUint(32) : -1,
found3 ? cur3~loadUint(32) : -1
found1 ? old1.loadUint(32) : -1,
found2 ? old2.loadUint(32) : -1,
found3 ? cur3.loadUint(32) : -1
);
}
@method_id(102)
fun test102() {
var dict = createEmptyDict();
dict~addIntToIDict(2, 102);
dict~addIntToIDict(1, 101);
dict~addIntToIDict(4, 104);
dict~addIntToIDict(3, 103);
dict.addIntToIDict(2, 102);
dict.addIntToIDict(1, 101);
dict.addIntToIDict(4, 104);
dict.addIntToIDict(3, 103);
var deleted = createEmptyTuple();
var shouldBreak = false;
while (!shouldBreak) {
var (kDel, kVal, wasDel) = dict~iDictDeleteLastAndGet(32);
var (kDel, kVal, wasDel) = dict.iDictDeleteLastAndGet(32);
if (wasDel) {
deleted~tuplePush([kDel, kVal~loadInt(32)]);
deleted.tuplePush([kDel, kVal.loadInt(32)]);
} else {
shouldBreak = true;
}
@ -59,38 +58,38 @@ fun test102() {
@method_id(103)
fun test103() {
var dict = createEmptyDict();
dict~uDictSetBuilderIfNotExists(32, 1,beginCell().storeInt(1, 32));
dict~uDictSetBuilderIfNotExists(32, 1,beginCell().storeInt(1, 32));
dict.uDictSetBuilderIfNotExists(32, 1,beginCell().storeInt(1, 32));
dict.uDictSetBuilderIfNotExists(32, 1,beginCell().storeInt(1, 32));
var len1 = calculateDictLen(dict);
dict~uDictSetBuilderIfExists(32, 2,beginCell().storeInt(1, 32));
dict~uDictSetBuilderIfExists(32, 2,beginCell().storeInt(1, 32));
dict.uDictSetBuilderIfExists(32, 2,beginCell().storeInt(1, 32));
dict.uDictSetBuilderIfExists(32, 2,beginCell().storeInt(1, 32));
var len2 = calculateDictLen(dict);
dict~uDictSetBuilder(32, 3,beginCell().storeInt(1, 32));
dict~uDictSetBuilderIfExists(32, 3,beginCell().storeInt(1, 32));
dict.uDictSetBuilder(32, 3,beginCell().storeInt(1, 32));
dict.uDictSetBuilderIfExists(32, 3,beginCell().storeInt(1, 32));
var len3 = calculateDictLen(dict);
var (delK1, _, _) = dict~uDictDeleteFirstAndGet(32);
var (delK2, _, _) = dict~uDictDeleteFirstAndGet(32);
var (delK3, _, _) = dict~uDictDeleteFirstAndGet(32);
var (delK1, _, _) = dict.uDictDeleteFirstAndGet(32);
var (delK2, _, _) = dict.uDictDeleteFirstAndGet(32);
var (delK3, _, _) = dict.uDictDeleteFirstAndGet(32);
return (len1, len2, len3, delK1, delK2, delK3);
}
@method_id(104)
fun test104() {
var dict = createEmptyDict();
dict~sDictSetBuilder(32, "7800", beginCell().storeUint(5 + 48, 8).storeUint(6 + 48, 8));
dict~sDictSet(32, "key1", "12");
var (old1, _) = dict~sDictSetAndGet(32, "key1", "34");
var (old2, _) = dict~sDictDeleteAndGet(32, "key1");
dict.sDictSetBuilder(32, "7800", beginCell().storeUint(5 + 48, 8).storeUint(6 + 48, 8));
dict.sDictSet(32, "key1", "12");
var (old1, _) = dict.sDictSetAndGet(32, "key1", "34");
var (old2, _) = dict.sDictDeleteAndGet(32, "key1");
var (restK, restV, _) = dict.sDictGetFirst(32);
var (restK1, restV1, _) = dict~sDictDeleteLastAndGet(32);
var (restK1, restV1, _) = dict.sDictDeleteLastAndGet(32);
assert (restK.isSliceBitsEqual(restK1)) throw 123;
assert (restV.isSliceBitsEqual(restV1)) throw 123;
return (
old1~loadTwoDigitNumberFromSlice(),
old2~loadTwoDigitNumberFromSlice(),
restV~loadTwoDigitNumberFromSlice(),
restK~loadTwoDigitNumberFromSlice(),
restK~loadTwoDigitNumberFromSlice()
old1.loadTwoDigitNumberFromSlice(),
old2.loadTwoDigitNumberFromSlice(),
restV.loadTwoDigitNumberFromSlice(),
restK.loadTwoDigitNumberFromSlice(),
restK.loadTwoDigitNumberFromSlice()
);
}