Skip to content

Fix build_green_tree token ownership #63

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
leynos merged 1 commit into from
Jul 7, 2025
+6 −6
Merged

Fix build_green_tree token ownership #63

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
12 changes: 6 additions & 6 deletions src/parser/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -255,7 +255,7 @@ pub fn parse(src: &str) -> Parsed {
let tokens = tokenize(src);
let (spans, errors) = parse_tokens(&tokens, src);

let green = build_green_tree(tokens, src, &spans);
let green = build_green_tree(&tokens, src, &spans);
let root = ast::Root::from_green(green.clone());

Parsed {
Expand Down Expand Up @@ -846,7 +846,7 @@ fn collect_rule_spans(
/// `spans.imports` and `spans.typedefs` must be sorted and non-overlapping so
/// that tokens are wrapped into well-formed nodes during tree construction.
/// Spans are checked with debug assertions.
fn build_green_tree(tokens: Vec<(SyntaxKind, Span)>, src: &str, spans: &ParsedSpans) -> GreenNode {
fn build_green_tree(tokens: &[(SyntaxKind, Span)], src: &str, spans: &ParsedSpans) -> GreenNode {
spans.assert_sorted();
let mut builder = GreenNodeBuilder::new();
builder.start_node(DdlogLanguage::kind_to_raw(SyntaxKind::N_DATALOG_PROGRAM));
Expand All @@ -858,7 +858,7 @@ fn build_green_tree(tokens: Vec<(SyntaxKind, Span)>, src: &str, spans: &ParsedSp
let mut function_iter = spans.functions.iter().peekable();
let mut rule_iter = spans.rules.iter().peekable();

for (kind, span) in tokens {
for &(kind, ref span) in tokens {
advance_span_iter(&mut import_iter, span.start);
advance_span_iter(&mut typedef_iter, span.start);
advance_span_iter(&mut relation_iter, span.start);
Expand Down Expand Up @@ -898,7 +898,7 @@ fn build_green_tree(tokens: Vec<(SyntaxKind, Span)>, src: &str, spans: &ParsedSp
);
maybe_start(&mut builder, &mut rule_iter, span.start, SyntaxKind::N_RULE);

push_token(&mut builder, kind, &span, src);
push_token(&mut builder, kind, span, src);

maybe_finish(&mut builder, &mut import_iter, span.end);
maybe_finish(&mut builder, &mut typedef_iter, span.end);
Expand Down Expand Up @@ -1846,7 +1846,7 @@ mod tests {
..Default::default()
};
let result = std::panic::catch_unwind(|| {
super::build_green_tree(tokens, src, &spans);
super::build_green_tree(&tokens, src, &spans);
});
let Err(msg) = result else {
panic!("expected panic")
Expand Down Expand Up @@ -1874,7 +1874,7 @@ mod tests {
..Default::default()
};
let result = std::panic::catch_unwind(|| {
super::build_green_tree(tokens, src, &spans);
super::build_green_tree(&tokens, src, &spans);
});
let Err(msg) = result else {
panic!("expected panic")
Expand Down