kirigaya/digital-lsp-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

skip architecture when there is no entity

Browse Source
This commit is contained in:
light-ly 2024-11-16 10:23:49 +08:00
parent 0aa6ef0462
commit 989b66b737
1 changed files with 49 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/core/vhdl_parser.rs
View File

@ -144,26 +144,34 @@ fn parse_tokens(tokens: Vec<Token>) -> Vec<Module> {
"architecture" => { "architecture" => {
if (i >= 1 as usize) && (kind_str(tokens[i-1].kind) != "end") || (i < 1) { if (i >= 1 as usize) && (kind_str(tokens[i-1].kind) != "end") || (i < 1) {
// !!! We not think of Architecture as VHDL Module Now // !!! We not think of Architecture as VHDL Module Now
// let name = get_value(&tokens[i+3]); // !!! So skip all Architecture Parse when there is no it's Entity
// if let None = modules.iter().find(|module| module.name == name) { let name = get_value(&tokens[i+3]);
if let None = modules.iter().find(|module| module.name == name) {
// let start_pos = tokens[i].pos.range.start; // let start_pos = tokens[i].pos.range.start;
// i += 1; i += 1;
// let arch_name = get_value(&tokens[i]); let arch_name = get_value(&tokens[i]);
// // println!("arch name {:?}", arch_name); // println!("arch name {:?}", arch_name);
// let mut end = i; let mut end = i;
// while (end+1 < tokens.len()) && while (end+1 < tokens.len()) &&
// !(kind_str(tokens[end].kind) == "end" && !(kind_str(tokens[end].kind) == "end" &&
// (kind_str(tokens[end+1].kind) == "architecture" || get_value(&tokens[end+1]) == arch_name)) { (kind_str(tokens[end+1].kind) == "architecture" || get_value(&tokens[end+1]) == arch_name)) {
// end += 1; end += 1;
// } }
if end+1 < tokens.len() && get_value(&tokens[end+1]) == arch_name {
i = end + 2;
} else if end + 3 < tokens.len() {
i = end + 3;
} else {
i = end;
};
// let end_pos = if end+1 < tokens.len() && get_value(&tokens[end+1]) == arch_name { // let end_pos = if end+1 < tokens.len() && get_value(&tokens[end+1]) == arch_name {
// // i = end + 2; // i = end + 2;
// tokens[end+2].pos.range.end // tokens[end+2].pos.range.end
// } else if end + 3 < tokens.len() { // } else if end + 3 < tokens.len() {
// // i = end + 3; // i = end + 3;
// tokens[end+3].pos.range.end // tokens[end+3].pos.range.end
// } else { // } else {
// // i = end; // i = end;
// tokens[end].pos.range.end // tokens[end].pos.range.end
// }; // };
// let module = Module { // let module = Module {
@ -184,7 +192,7 @@ fn parse_tokens(tokens: Vec<Token>) -> Vec<Module> {
// }; // };
// last_module_name = name.to_string(); // last_module_name = name.to_string();
// modules.push(module); // modules.push(module);
// } }
} }
} }
"configuration" => { "configuration" => {