Skip to content

refactor(codegen): serialize JSON artifacts with serde #311

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

Merged
tinovyatkin merged 2 commits into from
Aug 5, 2026
Merged

refactor(codegen): serialize JSON artifacts with serde #311

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
330f783
refactor(codegen): serialize JSON artifacts with serde
tinovyatkin Aug 5, 2026
8aef0a9
fix(codegen): close JSON migration review gaps
tinovyatkin Aug 5, 2026
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
64 changes: 15 additions & 49 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion crates/antlr-rust-codegen/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,9 +58,9 @@ rustpython-vm = { version = "0.5.0", default-features = false, features = [
"stdio",
] }
serde = { version = "1", features = ["derive"] }
serde_json = "1"
tempfile = "3"
thiserror.workspace = true
toml = "1.0"

[dev-dependencies]
insta.workspace = true
Expand Down
2 changes: 1 addition & 1 deletion crates/antlr-rust-codegen/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ antlr4-rust-gen JavaLexer.g4 JavaParser.g4 \
```

Persisted choices live in
`$XDG_CONFIG_HOME/antlr4-rust/trusted-support.toml` (or the platform config
`$XDG_CONFIG_HOME/antlr4-rust/trusted-support.json` (or the platform config
directory). Set `ANTLR4_RUST_TRUST_STORE` to use a different file. Automatic
transform execution is currently an `antlr4-rust-gen` CLI feature; the
`Builder` API does not execute sibling scripts.
Expand Down
27 changes: 22 additions & 5 deletions ...r/snapshots/antlr_rust_codegen__generator__tests__fixed_lookahead_decisions_manifest.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
---
source: crates/antlr-rust-codegen/src/generator.rs
assertion_line: 21988
source: crates/antlr-rust-codegen/src/generator/tests.rs
expression: manifest
---
{
Expand All @@ -9,10 +8,28 @@ expression: manifest
"grammars": [
{
"name": "T",
"summary": {"total": 2, "ll1": 1, "fixed": 1, "adaptive": 0},
"summary": {
"total": 2,
"ll1": 1,
"fixed": 1,
"adaptive": 0
},
"decisions": [
{"decision": 0, "rule": "s", "state": 7, "canDefer": false, "tier": "ll1"},
{"decision": 1, "rule": "a", "state": 20, "canDefer": true, "tier": "fixed", "lookahead": 2}
{
"decision": 0,
"rule": "s",
"state": 7,
"canDefer": false,
"tier": "ll1"
},
{
"decision": 1,
"rule": "a",
"state": 20,
"canDefer": true,
"tier": "fixed",
"lookahead": 2
}
]
}
]
Expand Down
28 changes: 23 additions & 5 deletions ...hots/antlr_rust_codegen__generator__tests__render_forced_adaptive_decisions_manifest.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
---
source: crates/antlr-rust-codegen/src/generator.rs
assertion_line: 22071
source: crates/antlr-rust-codegen/src/generator/tests.rs
expression: manifest
---
{
Expand All @@ -9,10 +8,29 @@ expression: manifest
"grammars": [
{
"name": "T",
"summary": {"total": 2, "ll1": 1, "fixed": 0, "adaptive": 1},
"summary": {
"total": 2,
"ll1": 1,
"fixed": 0,
"adaptive": 1
},
"decisions": [
{"decision": 0, "rule": "expr", "state": 15, "canDefer": true, "tier": "ll1"},
{"decision": 1, "rule": "expr", "state": 19, "canDefer": true, "tier": "adaptive", "reason": "precedence", "probedLookahead": 0}
{
"decision": 0,
"rule": "expr",
"state": 15,
"canDefer": true,
"tier": "ll1"
},
{
"decision": 1,
"rule": "expr",
"state": 19,
"canDefer": true,
"tier": "adaptive",
"reason": "precedence",
"probedLookahead": 0
}
]
}
]
Expand Down
16 changes: 13 additions & 3 deletions ...antlr_rust_codegen__generator__tests__semantics_manifest_with_untranslated_predicate.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
---
source: crates/antlr-rust-codegen/src/generator.rs
assertion_line: 23033
source: crates/antlr-rust-codegen/src/generator/tests.rs
expression: manifest
---
{
Expand All @@ -13,7 +12,18 @@ expression: manifest
"kind": "parser",
"name": "SParser",
"coordinates": [
{"kind": "parser-predicate", "rule": "s", "rule_index": 0, "index": 0, "atn_state": null, "line": 4, "column": 6, "body": "isTypeName()", "disposition": "assume-true", "template": null}
{
"kind": "parser-predicate",
"rule": "s",
"rule_index": 0,
"index": 0,
"atn_state": null,
"line": 4,
"column": 6,
"body": "isTypeName()",
"disposition": "assume-true",
"template": null
}
]
}
]
Expand Down
Loading
Loading