Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add .del function to maps #95

Merged
merged 6 commits into from
Apr 25, 2024
Merged

add .del function to maps #95

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
def7575
feat: add .del function to maps
Gusarich Nov 28, 2023
e995413
fix
Gusarich Apr 25, 2024
49579df
update changelog
Gusarich Apr 25, 2024
691f105
update snapshot
Gusarich Apr 25, 2024
89120b3
fix eslint
Gusarich Apr 25, 2024
9e2054c
make `.del` return success boolean flag and add more tests
Gusarich Apr 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- The `isEmpty` extension function for the `Map` type: PR [#266](https://github.com/tact-lang/tact/pull/266)
- The `pow2` power function with base 2: PR [#267](https://github.com/tact-lang/tact/pull/267)
- The `try` and `try-catch` statements: PR [#212](https://github.com/tact-lang/tact/pull/212)
- The `del` method for the `Map` type: PR [#95](https://github.com/tact-lang/tact/pull/95)

### Changed

Expand Down
67 changes: 67 additions & 0 deletions src/abi/map.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -325,6 +325,73 @@ export const MapFunctions: Map<string, AbiFunction> = new Map([
},
},
],
[
"del",
{
name: "del",
resolve(ctx, args, ref) {
// Check arguments
if (args.length !== 2) {
throwError("del expects one argument", ref); // Ignore self argument
}
const self = args[0];
if (!self || self.kind !== "map") {
throwError("del expects a map as self argument", ref); // Should not happen
}

// Check key type
if (args[1].kind !== "ref" || args[1].optional) {
throwError(
"del expects a direct type as first argument",
ref,
);
}
if (args[1].name !== self.key) {
throwError(
`del expects a ${self.key} as first argument`,
ref,
);
}

// Returns boolean
return { kind: "ref", name: "Bool", optional: false };
},
generate: (ctx, args, exprs, ref) => {
if (args.length !== 2) {
throwError("del expects one argument", ref); // Ignore self argument
}
const self = args[0];
if (!self || self.kind !== "map") {
throwError("del expects a map as self argument", ref); // Should not happen
}

// Render expressions
const resolved = exprs.map((v) => writeExpression(v, ctx));

// Handle Int key
if (self.key === "Int") {
let bits = 257;
let kind = "int";
if (self.keyAs && self.keyAs.startsWith("int")) {
bits = parseInt(self.keyAs.slice(3), 10);
} else if (self.keyAs && self.keyAs.startsWith("uint")) {
bits = parseInt(self.keyAs.slice(4), 10);
kind = "uint";
}
ctx.used(`__tact_dict_delete_${kind}`);
return `${resolved[0]}~__tact_dict_delete_${kind}(${bits}, ${resolved[1]})`;
}

// Handle Address key
if (self.key === "Address") {
ctx.used(`__tact_dict_delete`);
return `${resolved[0]}~__tact_dict_delete(267, ${resolved[1]})`;
}

throwError(`del expects a map with Int keys`, ref);
},
},
],
[
"asCell",
{
Expand Down
72 changes: 72 additions & 0 deletions src/generator/writers/__snapshots__/writeSerialization.spec.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,6 +235,30 @@ return __tact_create_address(chain, hash);",
"name": "__tact_dict_delete",
"signature": "(cell, int) __tact_dict_delete(cell dict, int key_len, slice index)",
},
{
"code": {
"code": "asm(index dict key_len) "DICTIDEL"",
"kind": "asm",
},
"comment": null,
"context": "stdlib",
"depends": Set {},
"flags": Set {},
"name": "__tact_dict_delete_int",
"signature": "(cell, int) __tact_dict_delete_int(cell dict, int key_len, int index)",
},
{
"code": {
"code": "asm(index dict key_len) "DICTUDEL"",
"kind": "asm",
},
"comment": null,
"context": "stdlib",
"depends": Set {},
"flags": Set {},
"name": "__tact_dict_delete_uint",
"signature": "(cell, int) __tact_dict_delete_uint(cell dict, int key_len, int index)",
},
{
"code": {
"code": "asm(value index dict key_len) "DICTSETREF"",
Expand Down Expand Up @@ -4275,6 +4299,30 @@ return __tact_create_address(chain, hash);",
"name": "__tact_dict_delete",
"signature": "(cell, int) __tact_dict_delete(cell dict, int key_len, slice index)",
},
{
"code": {
"code": "asm(index dict key_len) "DICTIDEL"",
"kind": "asm",
},
"comment": null,
"context": "stdlib",
"depends": Set {},
"flags": Set {},
"name": "__tact_dict_delete_int",
"signature": "(cell, int) __tact_dict_delete_int(cell dict, int key_len, int index)",
},
{
"code": {
"code": "asm(index dict key_len) "DICTUDEL"",
"kind": "asm",
},
"comment": null,
"context": "stdlib",
"depends": Set {},
"flags": Set {},
"name": "__tact_dict_delete_uint",
"signature": "(cell, int) __tact_dict_delete_uint(cell dict, int key_len, int index)",
},
{
"code": {
"code": "asm(value index dict key_len) "DICTSETREF"",
Expand Down Expand Up @@ -8315,6 +8363,30 @@ return __tact_create_address(chain, hash);",
"name": "__tact_dict_delete",
"signature": "(cell, int) __tact_dict_delete(cell dict, int key_len, slice index)",
},
{
"code": {
"code": "asm(index dict key_len) "DICTIDEL"",
"kind": "asm",
},
"comment": null,
"context": "stdlib",
"depends": Set {},
"flags": Set {},
"name": "__tact_dict_delete_int",
"signature": "(cell, int) __tact_dict_delete_int(cell dict, int key_len, int index)",
},
{
"code": {
"code": "asm(index dict key_len) "DICTUDEL"",
"kind": "asm",
},
"comment": null,
"context": "stdlib",
"depends": Set {},
"flags": Set {},
"name": "__tact_dict_delete_uint",
"signature": "(cell, int) __tact_dict_delete_uint(cell dict, int key_len, int index)",
},
{
"code": {
"code": "asm(value index dict key_len) "DICTSETREF"",
Expand Down
16 changes: 16 additions & 0 deletions src/generator/writers/writeStdlib.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,6 +167,22 @@ export function writeStdlib(ctx: WriterContext) {
ctx.asm(`asm(index dict key_len) "DICTDEL"`);
});

ctx.fun("__tact_dict_delete_int", () => {
ctx.signature(
`(cell, int) __tact_dict_delete_int(cell dict, int key_len, int index)`,
);
ctx.context("stdlib");
ctx.asm(`asm(index dict key_len) "DICTIDEL"`);
});

ctx.fun("__tact_dict_delete_uint", () => {
ctx.signature(
`(cell, int) __tact_dict_delete_uint(cell dict, int key_len, int index)`,
);
ctx.context("stdlib");
ctx.asm(`asm(index dict key_len) "DICTUDEL"`);
});

ctx.fun("__tact_dict_set_ref", () => {
ctx.signature(
`((cell), ()) __tact_dict_set_ref(cell dict, int key_len, slice index, cell value)`,
Expand Down
Loading
Loading