Skip to content

Implement more ast features #6986

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
youknowone merged 10 commits into from
Feb 5, 2026
Merged

Implement more ast features #6986

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
30848ec
ast __annotations__
youknowone Feb 3, 2026
ec181d5
Implement more ast
youknowone Feb 3, 2026
53d5d6c
optimize
youknowone Feb 4, 2026
95421a9
more macro
youknowone Feb 4, 2026
32b9eb3
tstring unparse
youknowone Feb 4, 2026
6486a3c
fix win
youknowone Feb 4, 2026
1d1bed7
dict
youknowone Feb 4, 2026
bb9b56a
fix more
youknowone Feb 4, 2026
29c6672
align validation
youknowone Feb 4, 2026
ebe063b
ast
youknowone Feb 4, 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
Prev Previous commit
Next Next commit
fix more
  • Loading branch information
@youknowone
youknowone committed Feb 5, 2026
commit bb9b56a31d34ddf96c990f543225d98b4dbe8065
25 changes: 17 additions & 8 deletions crates/vm/src/stdlib/ast/string.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,7 @@ fn ruff_format_spec_to_joined_str(
let values: Vec<_> = ruff_fstring_element_into_iter(elements)
.map(ruff_fstring_element_to_joined_str_part)
.collect();
let values = values.into_boxed_slice();
let values = normalize_joined_str_parts(values).into_boxed_slice();
Some(Box::new(JoinedStr { range, values }))
}
}
Expand Down Expand Up @@ -610,10 +610,19 @@ fn tstring_interpolation_expr_str(
interpolation_range: TextRange,
expr_range: TextRange,
) -> String {
let expr_range =
extend_expr_range_with_wrapping_parens(source_file, interpolation_range, expr_range)
.unwrap_or(expr_range);
let expr_source = source_file.slice(expr_range);
let expr_range = extend_expr_range_with_wrapping_parens(
source_file,
interpolation_range,
expr_range,
)
.unwrap_or(expr_range);
let start = interpolation_range.start() + TextSize::from(1);
let start = if start > expr_range.end() {
expr_range.start()
} else {
start
};
let expr_source = source_file.slice(TextRange::new(start, expr_range.end()));
strip_interpolation_expr(expr_source)
}

Expand Down Expand Up @@ -667,10 +676,10 @@ fn strip_interpolation_expr(expr_source: &str) -> String {
for (idx, ch) in expr_source.char_indices().rev() {
if ch.is_whitespace() || ch == '=' {
end = idx;
} else {
end = idx + ch.len_utf8();
break;
continue;
}
end = idx + ch.len_utf8();
break;
}
expr_source[..end].to_owned()
}
Expand Down
8 changes: 8 additions & 0 deletions crates/vm/src/stdlib/ast/validate.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -403,6 +403,14 @@ fn validate_expr(vm: &VirtualMachine, expr: &ast::Expr, ctx: ast::ExprContext) -
validate_expr(vm, &await_expr.value, ast::ExprContext::Load)
}
ast::Expr::Compare(compare) => {
if compare.comparators.is_empty() {
return Err(vm.new_value_error("Compare with no comparators".to_owned()));
}
if compare.comparators.len() != compare.ops.len() {
return Err(vm.new_value_error(
"Compare has a different number of comparators and operands".to_owned(),
));
}
validate_exprs(vm, &compare.comparators, ast::ExprContext::Load, false)?;
validate_expr(vm, &compare.left, ast::ExprContext::Load)
}
Expand Down