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

Disentangle grammar resolution and related PG code #1018

Merged
merged 10 commits into from
Jun 21, 2024
Merged

Disentangle grammar resolution and related PG code #1018

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
95e24fe
refactor: Simplify initialization of ResolveCtx
Xanewok Jun 4, 2024
1154a52
Attempt no. 2512 at simplifying grammar resolution
Xanewok Jun 4, 2024
be0c800
Break down resolve_grammat_element a bit
Xanewok Jun 4, 2024
64b8566
refactor: Derive all_scanners from the grammar elements directly
Xanewok Jun 4, 2024
6fc41a4
refactor: Do not emit synthetic parser to account for keywords
Xanewok Jun 4, 2024
9e6420a
Reduce as much as possible state when walking the grammar in PG
Xanewok Jun 5, 2024
bd5caef
Separate the collectors in the PG
Xanewok Jun 5, 2024
2ffeb5e
Add more details to the panicking functions
Xanewok Jun 21, 2024
a56b35f
Separate combining the final PG model from the lexer model collection
Xanewok Jun 21, 2024
234c924
Rename `Resolution::original` to `Resolution::lex_ctx`
Xanewok Jun 21, 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 Cargo.lock
View file
Open in desktop

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

1 change: 1 addition & 0 deletions crates/codegen/runtime/generator/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ quote = { workspace = true }
semver = { workspace = true }
serde = { workspace = true }
strum = { workspace = true }
strum_macros = { workspace = true }

[lints]
workspace = true
5 changes: 3 additions & 2 deletions crates/codegen/runtime/generator/src/parser/grammar.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,15 @@ use std::rc::Rc;

use codegen_language_definition::model::{self, Identifier};

pub mod constructor;
pub mod parser_definition;
pub mod precedence_parser_definition;
pub mod resolver;
pub mod scanner_definition;
pub mod visitor;

pub use parser_definition::*;
pub use precedence_parser_definition::*;
pub use resolver::ResolveCtx;
pub use scanner_definition::*;
pub use visitor::*;

Expand All @@ -35,7 +36,7 @@ impl Grammar {
}

#[allow(clippy::enum_variant_names)] // this will be removed soon
#[derive(Clone)]
#[derive(Clone, strum_macros::EnumTryAs)]
pub enum GrammarElement {
ScannerDefinition(ScannerDefinitionRef),
KeywordScannerDefinition(Rc<model::KeywordItem>),
Expand Down
Loading
Loading