Skip to content

Commit 7619840

Browse files
committed
Merge branch 'main' into jeshecdom/init-of-reach
2 parents 6b3951d + 80fccdf commit 7619840

File tree

88 files changed

+3170
-17080
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

88 files changed

+3170
-17080
lines changed

.eslintignore

+1-3
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,7 @@ coverage/
55
src/test/**/output/
66
src/test/e2e-emulated/map-tests/build
77
src/func/funcfiftlib.js
8-
**/grammar.ohm*.ts
9-
**/grammar.ohm*.js
10-
src/grammar/next/grammar.ts
8+
src/grammar/grammar.ts
119
jest.setup.js
1210
jest.globalSetup.js
1311
jest.teardown.js

.gitignore

-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@ node_modules
66
coverage
77
dist
88
output/
9-
**/grammar.ohm-bundle.js
10-
**/grammar.ohm-bundle.d.ts
119
src/func/funcfiftlib.wasm.js
1210
src/test/contracts/pretty-printer-output
1311
src/test/e2e-emulated/map-tests/build

.prettierignore

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
/dist
22
/src/func/funcfiftlib.js
33
/src/func/funcfiftlib.wasm.js
4-
/src/grammar/prev/grammar.ohm-bundle.d.ts
5-
/src/grammar/prev/grammar.ohm-bundle.js
6-
src/grammar/next/grammar.ts
4+
src/grammar/grammar.ts
75
/src/stdlib/stdlib.ts
86
/grammar
97
/docs

cspell.json

+2-3
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,12 @@
3434
"grammar/sample.json",
3535
"src/generator/writers/writeStdlib.ts",
3636
"src/func/funcfiftlib.*",
37-
"src/grammar/grammar.ohm-bundle.d.ts",
3837
"src/grammar/test/items-native-fun-funcid.tact",
3938
"src/grammar/test/items-asm-funs.tact",
4039
"src/grammar/test-asm/*.tact",
4140
"src/grammar/test-failed/funcid-*.tact",
42-
"src/grammar/next/grammar.gg",
43-
"src/grammar/next/grammar.ts",
41+
"src/grammar/grammar.gg",
42+
"src/grammar/grammar.ts",
4443
"src/stdlib/stdlib.ts",
4544
"src/stdlib/stdlib/std/stdlib.fc",
4645
"src/test/compilation-failed/const-eval-failed.spec.ts",

dev-docs/CHANGELOG.md

+18
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,20 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
77

88
## [Unreleased]
99

10+
## [1.6.3] - 2025-03-12
11+
12+
### Compiler configuration
13+
14+
- Added `internalExternalReceiversOutsideMethodsMap` config option as part of optimization options to protect potentially unwanted optimization: PR [#2370](https://github.com/tact-lang/tact/pull/2370)
15+
16+
### Standard Library
17+
18+
- Added `forceBasechain()` function: PR [#2330](https://github.com/tact-lang/tact/pull/2330)
19+
20+
### Internal infrastructure
21+
22+
- Removed old parser: PR [#2365](https://github.com/tact-lang/tact/pull/2365)
23+
1024
### Docs
1125

1226
- Added descriptions for `&&=`, `||=`, `>>=` and `<<=` augmented assignment operators: PR [#2328](https://github.com/tact-lang/tact/pull/2328)
@@ -18,6 +32,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
1832
### Release contributors
1933

2034
- [Novus Nota](https://github.com/novusnota)
35+
- [Maksim Lagus](https://github.com/Kaladin13)
36+
- [verytactical](https://github.com/verytactical)
37+
- [Shvetc Andrei](https://github.com/Shvandre)
38+
- [Petr Makhnev](https://github.com/i582)
2139

2240
## [1.6.2] - 2025-03-06
2341

dev-docs/CONTRIBUTING.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -210,11 +210,11 @@ For more info, refer to the package's GitHub repository: [`tact-lang/ton-opcode`
210210

211211
### Parser
212212

213-
The [`src/grammar/grammar.ohm`](../src/grammar/prev/grammar.ohm) file contains the Tact grammar expressed in the PEG-like language of the [Ohm.js](https://ohmjs.org) parser generator.
213+
The [`src/grammar/grammar.gg`](../src/grammar/grammar.gg) file contains the Tact grammar expressed in the PEG language of the [pgen](https://github.com/tact-lang/syntax-tools/tree/main/packages/pgen) parser generator.
214214

215-
The helper file [`src/grammar/grammar.ts`](../src/grammar/prev/grammar.ts) contains the logic that transforms concrete syntax trees produced with the help of the Ohm.js-generated parser into abstract syntax trees (ASTs) defined in [src/ast/ast.ts](../src/ast/ast.ts). The grammar.ts file also does grammar validation, like checking that function or constant attributes are not duplicated or that user identifiers do not start with specific reserved prefixes.
215+
The helper file [`src/grammar/index.ts`](../src/grammar/index.ts) contains the logic that transforms concrete syntax trees produced with the help of parser into abstract syntax trees (ASTs) defined in [src/ast/ast.ts](../src/ast/ast.ts). The index.ts file also does grammar validation, like checking that function or constant attributes are not duplicated or that user identifiers do not start with specific reserved prefixes.
216216

217-
The [`src/grammar/test`](../src/grammar/test) folder contains Tact files that are supposed to be parsed without any issues, and the [`src/grammar/test-failed`](../src/grammar/test-failed) folder contains grammatically incorrect test files which should result in parser errors. The parser error messages and the locations they point to are fixed in the [`src/grammar/**snapshots**/grammar.spec.ts.snap`](../src/grammar/prev/__snapshots__/grammar.spec.ts.snap) Jest snapshot file.
217+
The [`src/grammar/test`](../src/grammar/test) folder contains Tact files that are supposed to be parsed without any issues, and the [`src/grammar/test-failed`](../src/grammar/test-failed) folder contains grammatically incorrect test files which should result in parser errors. The parser error messages and the locations they point to are fixed in the [`src/grammar/**snapshots**/grammar.spec.ts.snap`](../src/grammar/__snapshots__/grammar.spec.ts.snap) Jest snapshot file.
218218

219219
### Standard Library
220220

docs/astro.config.mjs

-1
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,6 @@ export default defineConfig({
8787
langs: [
8888
() => JSON.parse(fs.readFileSync('grammars/grammar-tact.json', 'utf-8')),
8989
() => JSON.parse(fs.readFileSync('grammars/grammar-func.json', 'utf-8')),
90-
() => JSON.parse(fs.readFileSync('grammars/grammar-ohm.json', 'utf-8'))
9190
],
9291
},
9392
},

docs/grammars/grammar-ohm.json

-284
This file was deleted.

0 commit comments

Comments
 (0)