Skip to content
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

Jump to bottom

Fix resolve failure for some nested items #631

Merged
merged 1 commit into from
Apr 6, 2024
Merged

Fix resolve failure for some nested items #631

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
34 changes: 9 additions & 25 deletions crates/analyzer/src/analyzer.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ use crate::namespace_table;
use crate::symbol::{
Direction, ParameterValue, Symbol, SymbolId, SymbolKind, TypeKind, VariableAffiniation,
};
use crate::symbol_table::{self, ResolveSymbol};
use crate::symbol_table;
use itertools::Itertools;
use std::path::Path;
use veryl_metadata::{Lint, Metadata};
Expand Down Expand Up @@ -249,9 +249,7 @@ fn traverse_type_symbol(id: SymbolId, path: &AssignPath) -> Vec<AssignPath> {
SymbolKind::Variable(x) => {
if let TypeKind::UserDefined(ref x) = x.r#type.kind {
if let Ok(symbol) = symbol_table::resolve((x, &symbol.namespace)) {
if let ResolveSymbol::Symbol(symbol) = symbol.found {
return traverse_type_symbol(symbol.id, path);
}
return traverse_type_symbol(symbol.found.id, path);
}
} else {
return vec![path.clone()];
Expand All @@ -260,9 +258,7 @@ fn traverse_type_symbol(id: SymbolId, path: &AssignPath) -> Vec<AssignPath> {
SymbolKind::StructMember(x) => {
if let TypeKind::UserDefined(ref x) = x.r#type.kind {
if let Ok(symbol) = symbol_table::resolve((x, &symbol.namespace)) {
if let ResolveSymbol::Symbol(symbol) = symbol.found {
return traverse_type_symbol(symbol.id, path);
}
return traverse_type_symbol(symbol.found.id, path);
}
} else {
return vec![path.clone()];
Expand All @@ -271,9 +267,7 @@ fn traverse_type_symbol(id: SymbolId, path: &AssignPath) -> Vec<AssignPath> {
SymbolKind::UnionMember(x) => {
if let TypeKind::UserDefined(ref x) = x.r#type.kind {
if let Ok(symbol) = symbol_table::resolve((x, &symbol.namespace)) {
if let ResolveSymbol::Symbol(symbol) = symbol.found {
return traverse_type_symbol(symbol.id, path);
}
return traverse_type_symbol(symbol.found.id, path);
}
} else {
return vec![path.clone()];
Expand All @@ -282,9 +276,7 @@ fn traverse_type_symbol(id: SymbolId, path: &AssignPath) -> Vec<AssignPath> {
SymbolKind::TypeDef(x) => {
if let TypeKind::UserDefined(ref x) = x.r#type.kind {
if let Ok(symbol) = symbol_table::resolve((x, &symbol.namespace)) {
if let ResolveSymbol::Symbol(symbol) = symbol.found {
return traverse_type_symbol(symbol.id, path);
}
return traverse_type_symbol(symbol.found.id, path);
}
} else {
return vec![path.clone()];
Expand All @@ -295,9 +287,7 @@ fn traverse_type_symbol(id: SymbolId, path: &AssignPath) -> Vec<AssignPath> {
let r#type: crate::symbol::Type = (&*x.scalar_type).into();
if let TypeKind::UserDefined(ref x) = r#type.kind {
if let Ok(symbol) = symbol_table::resolve((x, &symbol.namespace)) {
if let ResolveSymbol::Symbol(symbol) = symbol.found {
return traverse_type_symbol(symbol.id, path);
}
return traverse_type_symbol(symbol.found.id, path);
}
} else {
return vec![path.clone()];
Expand Down Expand Up @@ -334,9 +324,7 @@ fn traverse_type_symbol(id: SymbolId, path: &AssignPath) -> Vec<AssignPath> {
}
SymbolKind::ModportMember(x) if is_assignable(&x.direction) => {
if let Ok(symbol) = symbol_table::resolve(&symbol.token) {
if let ResolveSymbol::Symbol(symbol) = symbol.found {
return traverse_type_symbol(symbol.id, path);
}
return traverse_type_symbol(symbol.found.id, path);
}
}
SymbolKind::Enum(_) => {
Expand All @@ -361,9 +349,7 @@ fn traverse_assignable_symbol(id: SymbolId, path: &AssignPath) -> Vec<AssignPath
if let Some(ref x) = x.r#type {
if let TypeKind::UserDefined(ref x) = x.kind {
if let Ok(symbol) = symbol_table::resolve((x, &symbol.namespace)) {
if let ResolveSymbol::Symbol(symbol) = symbol.found {
return traverse_type_symbol(symbol.id, path);
}
return traverse_type_symbol(symbol.found.id, path);
}
} else {
return vec![path.clone()];
Expand All @@ -376,9 +362,7 @@ fn traverse_assignable_symbol(id: SymbolId, path: &AssignPath) -> Vec<AssignPath
{
if let TypeKind::UserDefined(ref x) = x.r#type.kind {
if let Ok(symbol) = symbol_table::resolve((x, &symbol.namespace)) {
if let ResolveSymbol::Symbol(symbol) = symbol.found {
return traverse_type_symbol(symbol.id, path);
}
return traverse_type_symbol(symbol.found.id, path);
}
} else {
return vec![path.clone()];
Expand Down
10 changes: 3 additions & 7 deletions crates/analyzer/src/evaluator.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
use crate::symbol::{Type, TypeKind};
use crate::symbol_table::{self, ResolveSymbol};
use crate::symbol_table;
use veryl_parser::veryl_grammar_trait::*;

#[derive(Clone, Copy, Debug)]
Expand Down Expand Up @@ -606,12 +606,8 @@ impl Evaluator {
// Identifier
let symbol = symbol_table::resolve(x.expression_identifier.as_ref());
if let Ok(symbol) = symbol {
if let ResolveSymbol::Symbol(symbol) = symbol.found {
if let Some(evaluated) = symbol.evaluated.get() {
evaluated
} else {
Evaluated::Unknown
}
if let Some(evaluated) = symbol.found.evaluated.get() {
evaluated
} else {
Evaluated::Unknown
}
Expand Down
Loading
Loading