Skip to content

Tracking SyntaxNode and interning through a tracked function #8489

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Tracking SyntaxNode and interning through a tracked function #8489

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 5 additions & 5 deletions crates/cairo-lang-syntax-codegen/src/generator.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -502,7 +502,7 @@ fn gen_enum_code(
}
}
fn stable_ptr(&self, db: &'db dyn Database) -> Self::StablePtr {
$(&ptr_name)(self.as_syntax_node().long(db).stable_ptr)
$(&ptr_name)(self.as_syntax_node().stable_ptr(db))
}
}
impl<'db> $(&name)<'db> {
Expand Down Expand Up @@ -532,7 +532,7 @@ fn gen_token_code(name: String) -> rust::Tokens {
}.intern(db))
}
fn text(&self, db: &'db dyn Database) -> SmolStrId<'db> {
*extract_matches!(&self.node.long(db).green.long(db).details,
*extract_matches!(&self.node.green_node(db).details,
GreenNodeDetails::Token)
}
}
Expand Down Expand Up @@ -570,7 +570,7 @@ fn gen_token_code(name: String) -> rust::Tokens {
}.intern(db))
}
fn from_syntax_node(db: &'db dyn Database, node: SyntaxNode<'db>) -> Self {
match node.long(db).green.long(db).details {
match node.green_node(db).details {
GreenNodeDetails::Token(_) => Self { node },
GreenNodeDetails::Node { .. } => panic!(
"Expected a token {:?}, not an internal node",
Expand All @@ -579,7 +579,7 @@ fn gen_token_code(name: String) -> rust::Tokens {
}
}
fn cast(db: &'db dyn Database, node: SyntaxNode<'db>) -> Option<Self> {
match node.long(db).green.long(db).details {
match node.green_node(db).details {
GreenNodeDetails::Token(_) => Some(Self { node }),
GreenNodeDetails::Node { .. } => None,
}
Expand Down Expand Up @@ -658,7 +658,7 @@ fn gen_struct_code(name: String, members: Vec<Member>, is_terminal: bool) -> rus
}.intern(db))
}
fn text(&self, db: &'db dyn Database) -> SmolStrId<'db> {
let GreenNodeDetails::Node{children,..} = &self.node.long(db).green.long(db).details else {
let GreenNodeDetails::Node{children,..} = &self.node.green_node(db).details else {
unreachable!("Expected a node, not a token");
};
*extract_matches!(&children[1].long(db).details, GreenNodeDetails::Token)
Expand Down
Loading