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.

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

Fix skipBits return type #388

Merged
merged 3 commits into from
Jun 8, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

### Fixed

- Return type of `skipBits` now matches FunC and does not lead to compilation errors: PR [#388](https://github.com/tact-lang/tact/pull/388)

## [1.3.1] - 2024-06-08

### Added
Expand Down
22 changes: 11 additions & 11 deletions src/imports/stdlib.ts
Original file line number Diff line number Diff line change
Expand Up @@ -141,17 +141,17 @@ files['std/cells.tact'] =
'bGY6IFNsaWNlLCBsOiBJbnQpOiBJbnQ7CgpAbmFtZShwcmVsb2FkX3VpbnQpCmV4dGVuZHMgbmF0aXZlIHByZWxvYWRVaW50KHNlbGY6IFNsaWNlLCBsOiBJbnQpOiBJ' +
'bnQ7CgpAbmFtZShsb2FkX2NvaW5zKQpleHRlbmRzIG11dGF0ZXMgbmF0aXZlIGxvYWRDb2lucyhzZWxmOiBTbGljZSk6IEludDsKCkBuYW1lKF9fdGFjdF9sb2FkX2Fk' +
'ZHJlc3MpCmV4dGVuZHMgbXV0YXRlcyBuYXRpdmUgbG9hZEFkZHJlc3Moc2VsZjogU2xpY2UpOiBBZGRyZXNzOwoKQG5hbWUoc2tpcF9iaXRzKQpleHRlbmRzIG11dGF0' +
'ZXMgbmF0aXZlIHNraXBCaXRzKHNlbGY6IFNsaWNlLCBsOiBJbnQpOiBTbGljZTsKCkBuYW1lKGVuZF9wYXJzZSkKZXh0ZW5kcyBuYXRpdmUgZW5kUGFyc2Uoc2VsZjog' +
'U2xpY2UpOwoKLy8KLy8gU2xpY2Ugc2l6ZQovLwoKQG5hbWUoc2xpY2VfcmVmcykKZXh0ZW5kcyBuYXRpdmUgcmVmcyhzZWxmOiBTbGljZSk6IEludDsKCkBuYW1lKHNs' +
'aWNlX2JpdHMpCmV4dGVuZHMgbmF0aXZlIGJpdHMoc2VsZjogU2xpY2UpOiBJbnQ7CgpAbmFtZShzbGljZV9lbXB0eT8pCmV4dGVuZHMgbmF0aXZlIGVtcHR5KHNlbGY6' +
'IFNsaWNlKTogQm9vbDsKCkBuYW1lKHNsaWNlX2RhdGFfZW1wdHk/KQpleHRlbmRzIG5hdGl2ZSBkYXRhRW1wdHkoc2VsZjogU2xpY2UpOiBCb29sOwoKQG5hbWUoc2xp' +
'Y2VfcmVmc19lbXB0eT8pCmV4dGVuZHMgbmF0aXZlIHJlZnNFbXB0eShzZWxmOiBTbGljZSk6IEJvb2w7CgovLwovLyBDb252ZXJzaW9ucwovLwoKaW5saW5lIGV4dGVu' +
'ZHMgZnVuIGFzU2xpY2Uoc2VsZjogQnVpbGRlcik6IFNsaWNlIHsKICAgIHJldHVybiBzZWxmLmVuZENlbGwoKS5iZWdpblBhcnNlKCk7Cn0KCmlubGluZSBleHRlbmRz' +
'IGZ1biBhc1NsaWNlKHNlbGY6IENlbGwpOiBTbGljZSB7CiAgICByZXR1cm4gc2VsZi5iZWdpblBhcnNlKCk7Cn0KCmlubGluZSBleHRlbmRzIGZ1biBhc0NlbGwoc2Vs' +
'ZjogU2xpY2UpOiBDZWxsIHsKICAgIHJldHVybiBiZWdpbkNlbGwoKQogICAgICAgIC5zdG9yZVNsaWNlKHNlbGYpCiAgICAgICAgLmVuZENlbGwoKTsKfQoKaW5saW5l' +
'IGV4dGVuZHMgZnVuIGFzQ2VsbChzZWxmOiBCdWlsZGVyKTogQ2VsbCB7CiAgICByZXR1cm4gc2VsZi5lbmRDZWxsKCk7Cn0KCmlubGluZSBmdW4gZW1wdHlDZWxsKCk6' +
'IENlbGwgewogICAgcmV0dXJuIGJlZ2luQ2VsbCgpLmVuZENlbGwoKTsKfQoKaW5saW5lIGZ1biBlbXB0eVNsaWNlKCk6IFNsaWNlIHsKICAgIHJldHVybiBlbXB0eUNl' +
'bGwoKS5hc1NsaWNlKCk7Cn0=';
'ZXMgbmF0aXZlIHNraXBCaXRzKHNlbGY6IFNsaWNlLCBsOiBJbnQpOwoKQG5hbWUoZW5kX3BhcnNlKQpleHRlbmRzIG5hdGl2ZSBlbmRQYXJzZShzZWxmOiBTbGljZSk7' +
'CgovLwovLyBTbGljZSBzaXplCi8vCgpAbmFtZShzbGljZV9yZWZzKQpleHRlbmRzIG5hdGl2ZSByZWZzKHNlbGY6IFNsaWNlKTogSW50OwoKQG5hbWUoc2xpY2VfYml0' +
'cykKZXh0ZW5kcyBuYXRpdmUgYml0cyhzZWxmOiBTbGljZSk6IEludDsKCkBuYW1lKHNsaWNlX2VtcHR5PykKZXh0ZW5kcyBuYXRpdmUgZW1wdHkoc2VsZjogU2xpY2Up' +
'OiBCb29sOwoKQG5hbWUoc2xpY2VfZGF0YV9lbXB0eT8pCmV4dGVuZHMgbmF0aXZlIGRhdGFFbXB0eShzZWxmOiBTbGljZSk6IEJvb2w7CgpAbmFtZShzbGljZV9yZWZz' +
'X2VtcHR5PykKZXh0ZW5kcyBuYXRpdmUgcmVmc0VtcHR5KHNlbGY6IFNsaWNlKTogQm9vbDsKCi8vCi8vIENvbnZlcnNpb25zCi8vCgppbmxpbmUgZXh0ZW5kcyBmdW4g' +
'YXNTbGljZShzZWxmOiBCdWlsZGVyKTogU2xpY2UgewogICAgcmV0dXJuIHNlbGYuZW5kQ2VsbCgpLmJlZ2luUGFyc2UoKTsKfQoKaW5saW5lIGV4dGVuZHMgZnVuIGFz' +
'U2xpY2Uoc2VsZjogQ2VsbCk6IFNsaWNlIHsKICAgIHJldHVybiBzZWxmLmJlZ2luUGFyc2UoKTsKfQoKaW5saW5lIGV4dGVuZHMgZnVuIGFzQ2VsbChzZWxmOiBTbGlj' +
'ZSk6IENlbGwgewogICAgcmV0dXJuIGJlZ2luQ2VsbCgpCiAgICAgICAgLnN0b3JlU2xpY2Uoc2VsZikKICAgICAgICAuZW5kQ2VsbCgpOwp9CgppbmxpbmUgZXh0ZW5k' +
'cyBmdW4gYXNDZWxsKHNlbGY6IEJ1aWxkZXIpOiBDZWxsIHsKICAgIHJldHVybiBzZWxmLmVuZENlbGwoKTsKfQoKaW5saW5lIGZ1biBlbXB0eUNlbGwoKTogQ2VsbCB7' +
'CiAgICByZXR1cm4gYmVnaW5DZWxsKCkuZW5kQ2VsbCgpOwp9CgppbmxpbmUgZnVuIGVtcHR5U2xpY2UoKTogU2xpY2UgewogICAgcmV0dXJuIGVtcHR5Q2VsbCgpLmFz' +
'U2xpY2UoKTsKfQ==';
files['std/config.tact'] =
'QG5hbWUoY29uZmlnX3BhcmFtKQpuYXRpdmUgZ2V0Q29uZmlnUGFyYW0oaWQ6IEludCk6IENlbGw/Ow==';
files['std/context.tact'] =
Expand Down
32 changes: 32 additions & 0 deletions src/test/compilation-fail/bugs.spec.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
import { __DANGER_resetNodeId } from "../../grammar/ast";
import { run } from "../../node";
import { consoleLogger } from "../../logger";

describe("fail-bugs", () => {
beforeAll(() => {
jest.spyOn(consoleLogger, "error").mockImplementation(() => {});
});

beforeEach(() => {
__DANGER_resetNodeId();
});

afterAll(() => {
(consoleLogger.error as jest.Mock).mockRestore();
});

afterEach(() => {
(consoleLogger.error as jest.Mock).mockClear();
});

it("should not compile issue 349", async () => {
const result = await run({
configPath: __dirname + "/tact.config.json",
projectNames: ["issue349"],
});
expect(result).toBe(false);
expect((consoleLogger.error as jest.Mock).mock.lastCall[0]).toContain(
'Type mismatch: "<void>" is not assignable to "Slice"',
);
});
});
8 changes: 8 additions & 0 deletions src/test/compilation-fail/contracts/issue349.tact
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
contract MyContract {
receive() {
let s: Slice = beginCell().storeUint(123, 64).endCell().asSlice();
let r: Int = s.loadUint(1);
s.skipBits(1);
let x: Slice = s.skipBits(1);
}
}
5 changes: 5 additions & 0 deletions src/test/compilation-fail/tact.config.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,11 @@
"name": "const-eval",
"path": "./contracts/const-eval.tact",
"output": "./contracts/output"
},
{
"name": "issue349",
"path": "./contracts/issue349.tact",
"output": "./contracts/output"
}
]
}
2 changes: 1 addition & 1 deletion stdlib/std/cells.tact
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ extends mutates native loadCoins(self: Slice): Int;
extends mutates native loadAddress(self: Slice): Address;

@name(skip_bits)
extends mutates native skipBits(self: Slice, l: Int): Slice;
extends mutates native skipBits(self: Slice, l: Int);

@name(end_parse)
extends native endParse(self: Slice);
Expand Down
Loading