Skip to content

Update Rust crate tree-sitter to 0.26 #13

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
lammermann merged 4 commits into from
Jan 1, 2026
Merged

Update Rust crate tree-sitter to 0.26 #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
07280aa
Update Rust crate tree-sitter to 0.26
renovate[bot] Dec 31, 2025
7f4884f
Update parser.rs
lammermann Jan 1, 2026
0352531
Update parser.rs
lammermann Jan 1, 2026
8ae1648
Update derive_interface.rs
lammermann Jan 1, 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
60 changes: 39 additions & 21 deletions tools/cpp_code_analyzer/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 tools/cpp_code_analyzer/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ edition = "2021"
[dependencies]
clap = { version = "4.5.40", features = ["derive"] }
codespan-reporting = "0.13"
tree-sitter = "0.25"
tree-sitter = "0.26"
tree-sitter-cpp = "0.23"
layout-rs = "0.1"
log = "0.4"
Expand Down
4 changes: 2 additions & 2 deletions tools/cpp_code_analyzer/src/fix/derive_interface.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ pub fn modify_to_derive_from_interface(class: &AST, content: &str) -> String {
fn find_derive_position(node: &Node) -> usize {
let mut pos = 0;

for idx in 0..node.child_count() {
for idx in 0..node.child_count() as u32 {
let child = node.child(idx).unwrap();

match child.kind() {
Expand All @@ -43,7 +43,7 @@ fn find_derive_position(node: &Node) -> usize {
}

fn find_include_position(node: &Node) -> usize {
for idx in 0..node.child_count() {
for idx in 0..node.child_count() as u32 {
let child = node.child(idx).unwrap();

match child.kind() {
Expand Down
52 changes: 26 additions & 26 deletions tools/cpp_code_analyzer/src/parser.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ pub fn parse_cpp_chunc(name: &str, input: &str) -> AST {
}

fn parse_global_codechunk(base: &mut AST, cl: &Node, code: &str) {
for idx in 0..cl.child_count() {
for idx in 0..cl.child_count() as u32 {
let child = cl.child(idx).unwrap();
match child.kind() {
"class_specifier" => base.children.push(extract_class(&child, code)),
Expand Down Expand Up @@ -57,7 +57,7 @@ fn parse_include(node: &Node, code: &str) -> AST {
let mut children = vec![];
let mut name = "";

for idx in 0..node.child_count() {
for idx in 0..node.child_count() as u32 {
let child = node.child(idx).unwrap();
match child.kind() {
"string_literal"|"system_lib_string" => {
Expand Down Expand Up @@ -91,7 +91,7 @@ fn extract_class(cl: &Node, code: &str) -> AST {

find_lint_instructions(cl, code, &mut instructions, &mut children);

for idx in 0..cl.child_count() {
for idx in 0..cl.child_count() as u32 {
let child = cl.child(idx).unwrap();
match child.kind() {
"field_declaration_list" => {
Expand Down Expand Up @@ -155,7 +155,7 @@ fn extract_class_fields(fields: &Node, code: &str) -> Vec<AST> {
let mut children = vec![];

let mut access_specifier = "public";
for idx in 0..fields.child_count() {
for idx in 0..fields.child_count() as u32 {
let child = fields.child(idx).unwrap();
let range = child.byte_range();
match child.kind() {
Expand All @@ -182,7 +182,7 @@ fn extract_derives(fields: &Node, code: &str, class_name: &str) -> (Vec<AST>, Ve
let mut derived_from = vec![];
let mut errors = vec![];

for idx in 0..fields.child_count() {
for idx in 0..fields.child_count() as u32 {
let child = fields.child(idx).unwrap();
let range = child.byte_range();
match child.kind() {
Expand Down Expand Up @@ -235,7 +235,7 @@ fn is_default_destructor(node: &Node) -> bool {
let mut is_destructor = false;
let mut is_default = false;

for idx in 0..node.child_count() {
for idx in 0..node.child_count() as u32 {
let child = node.child(idx).unwrap();
match child.kind() {
"function_declarator" => is_destructor = check_is_destructor(&child),
Expand All @@ -248,7 +248,7 @@ fn is_default_destructor(node: &Node) -> bool {
}

fn check_is_destructor(node: &Node) -> bool {
for idx in 0..node.child_count() {
for idx in 0..node.child_count() as u32 {
let child = node.child(idx).unwrap();
match child.kind() {
"destructor_name" => return true,
Expand All @@ -262,7 +262,7 @@ fn check_is_destructor(node: &Node) -> bool {
fn extract_declaration(field: &Node, code: &str, access_specifier: &str) -> Vec<AST> {
let mut children = vec![];

for idx in 0..field.child_count() {
for idx in 0..field.child_count() as u32 {
let child = field.child(idx).unwrap();
let range = child.byte_range();
match child.kind() {
Expand Down Expand Up @@ -349,7 +349,7 @@ fn extract_function(field: &Node, code: &str, access_specifier: &str) -> AST {
let mut dependencies = vec![];
let mut children = vec![];

for idx in 0..field.child_count() {
for idx in 0..field.child_count() as u32 {
let child = field.child(idx).unwrap();
match child.kind() {
x if is_primitive_type(x) => dependencies.push(AST {
Expand Down Expand Up @@ -392,7 +392,7 @@ fn extract_function(field: &Node, code: &str, access_specifier: &str) -> AST {
fn extract_statement(node: &Node, code: &str) -> Vec<AST> {
let mut children = vec![];

for idx in 0..node.child_count() {
for idx in 0..node.child_count() as u32 {
let child = node.child(idx).unwrap();
let range = child.byte_range();
match child.kind() {
Expand Down Expand Up @@ -430,7 +430,7 @@ fn extract_statement(node: &Node, code: &str) -> Vec<AST> {
fn extract_update_expression(node: &Node, code: &str) -> Vec<AST> {
let mut children = vec![];

for idx in 0..node.child_count() {
for idx in 0..node.child_count() as u32 {
let child = node.child(idx).unwrap();
let range = child.byte_range();
match child.kind() {
Expand Down Expand Up @@ -471,7 +471,7 @@ fn extract_update_expression(node: &Node, code: &str) -> Vec<AST> {
fn extract_call_expression(node: &Node, code: &str) -> Vec<AST> {
let mut children = vec![];

for idx in 0..node.child_count() {
for idx in 0..node.child_count() as u32 {
let child = node.child(idx).unwrap();
let range = child.byte_range();
match child.kind() {
Expand Down Expand Up @@ -500,7 +500,7 @@ fn extract_call_expression(node: &Node, code: &str) -> Vec<AST> {
fn extract_template_type(node: &Node, code: &str) -> Vec<AST> {
let mut dependencies = vec![];

for idx in 0..node.child_count() {
for idx in 0..node.child_count() as u32 {
let child = node.child(idx).unwrap();
let range = child.byte_range();
match child.kind() {
Expand All @@ -525,7 +525,7 @@ fn extract_template_type(node: &Node, code: &str) -> Vec<AST> {
fn extract_template_arguments(node: &Node, code: &str) -> Vec<AST> {
let mut dependencies = vec![];

for idx in 0..node.child_count() {
for idx in 0..node.child_count() as u32 {
let child = node.child(idx).unwrap();
let range = child.byte_range();
match child.kind() {
Expand Down Expand Up @@ -553,7 +553,7 @@ fn extract_template_arguments(node: &Node, code: &str) -> Vec<AST> {
fn extract_field_expression(node: &Node, code: &str) -> Vec<AST> {
let mut children = vec![];

for idx in 0..node.child_count() {
for idx in 0..node.child_count() as u32 {
let child = node.child(idx).unwrap();
let range = child.byte_range();
match child.kind() {
Expand Down Expand Up @@ -582,7 +582,7 @@ fn extract_field_expression(node: &Node, code: &str) -> Vec<AST> {
fn extract_parameters(node: &Node, code: &str) -> Vec<AST> {
let mut children = vec![];

for idx in 0..node.child_count() {
for idx in 0..node.child_count() as u32 {
let child = node.child(idx).unwrap();
match child.kind() {
"parameter_declaration"|"optional_parameter_declaration" => children.append(&mut extract_param(&child, code)),
Expand All @@ -606,7 +606,7 @@ fn extract_parameters(node: &Node, code: &str) -> Vec<AST> {
fn extract_arguments(node: &Node, code: &str) -> Vec<AST> {
let mut children = vec![];

for idx in 0..node.child_count() {
for idx in 0..node.child_count() as u32 {
let child = node.child(idx).unwrap();
let range = child.byte_range();
match child.kind() {
Expand Down Expand Up @@ -647,7 +647,7 @@ fn extract_param(node: &Node, code: &str) -> Vec<AST> {
let mut children = vec![];
let mut name = "".to_string();

for idx in 0..node.child_count() {
for idx in 0..node.child_count() as u32 {
let child = node.child(idx).unwrap();
let range = child.byte_range();
match child.kind() {
Expand Down Expand Up @@ -693,7 +693,7 @@ fn parse_enum(node: &Node, code: &str) -> Vec<AST> {
let mut children = vec![];
let mut name = "";

for idx in 0..node.child_count() {
for idx in 0..node.child_count() as u32 {
let child = node.child(idx).unwrap();
let range = child.byte_range();
match child.kind() {
Expand Down Expand Up @@ -722,7 +722,7 @@ fn parse_enum(node: &Node, code: &str) -> Vec<AST> {
fn parse_enum_variant(node: &Node, code: &str, namespace: &str) -> Vec<AST> {
let mut children = vec![];

for idx in 0..node.child_count() {
for idx in 0..node.child_count() as u32 {
let child = node.child(idx).unwrap();
let range = child.byte_range();
match child.kind() {
Expand Down Expand Up @@ -765,7 +765,7 @@ fn parse_struct(node: &Node, code: &str) -> AST {
let mut children = vec![];
let mut name = "";

for idx in 0..node.child_count() {
for idx in 0..node.child_count() as u32 {
let child = node.child(idx).unwrap();
match child.kind() {
"type_identifier" => {
Expand Down Expand Up @@ -795,7 +795,7 @@ fn parse_alias(node: &Node, code: &str) -> AST {
let mut children = vec![];
let mut name = "";

for idx in 0..node.child_count() {
for idx in 0..node.child_count() as u32 {
let child = node.child(idx).unwrap();
match child.kind() {
"type_identifier" => {
Expand All @@ -821,7 +821,7 @@ fn parse_alias(node: &Node, code: &str) -> AST {
}

fn get_class_name(node: &Node, code: &str) -> String {
for idx in 0..node.child_count() {
for idx in 0..node.child_count() as u32 {
let child = node.child(idx).unwrap();
let range = child.byte_range();
match child.kind() {
Expand All @@ -848,7 +848,7 @@ fn get_variable_name(node: &Node, code: &str) -> String {
},
"array_declarator"|"enumerator"|"pointer_declarator"
|"reference_declarator" => {
for idx in 0..node.child_count() {
for idx in 0..node.child_count() as u32 {
let child = node.child(idx).unwrap();
match child.kind() {
"identifier"|"field_identifier"|"qualified_identifier"
Expand All @@ -871,7 +871,7 @@ fn get_variable_name(node: &Node, code: &str) -> String {
fn get_function_name(node: &Node, code: &str) -> (String, Option<String>) {
let mut namespace = None;

for idx in 0..node.child_count() {
for idx in 0..node.child_count() as u32 {
let child = node.child(idx).unwrap();
let range = child.byte_range();
match child.kind() {
Expand All @@ -896,7 +896,7 @@ fn get_function_name(node: &Node, code: &str) -> (String, Option<String>) {
}

fn check_is_const(node: &Node, code: &str) -> bool {
for idx in 0..node.child_count() {
for idx in 0..node.child_count() as u32 {
let child = node.child(idx).unwrap();
let range = child.byte_range();
match child.kind() {
Expand Down