mirrors/yosys
3
0
Fork 0
mirror of https://github.com/YosysHQ/yosys synced 2025-08-12 06:00:55 +00:00
Code Activity

ast: fix import node

Browse source
This commit is contained in:
Emil J. Tywoniak 2025-08-08 16:15:20 +02:00
parent df8422d244
commit 5195f81257
2 changed files with 10 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

16
frontends/ast/simplify.cc
View file

@ -1089,7 +1089,7 @@ bool AstNode::simplify(bool const_fold, int stage, int width_hint, bool sign_hin
// Process package imports after clearing the scope but before processing module declarations // Process package imports after clearing the scope but before processing module declarations
for (size_t i = 0; i < children.size(); i++) { for (size_t i = 0; i < children.size(); i++) {
AstNode *child = children[i]; AstNode *child = children[i].get();
if (child->type == AST_IMPORT) { if (child->type == AST_IMPORT) {
// Find the package in the design // Find the package in the design
AstNode *package_node = nullptr; AstNode *package_node = nullptr;
@ -1099,7 +1099,7 @@ bool AstNode::simplify(bool const_fold, int stage, int width_hint, bool sign_hin
for (auto &design_child : current_ast->children) { for (auto &design_child : current_ast->children) {
if (design_child->type == AST_PACKAGE) { if (design_child->type == AST_PACKAGE) {
if (design_child->str == child->str) { if (design_child->str == child->str) {
package_node = design_child; package_node = design_child.get();
break; break;
} }
} }
@ -1115,7 +1115,7 @@ bool AstNode::simplify(bool const_fold, int stage, int width_hint, bool sign_hin
package_name = package_name.substr(1); package_name = package_name.substr(1);
} }
if (package_name == child->str || design_package->str == child->str) { if (package_name == child->str || design_package->str == child->str) {
package_node = design_package; package_node = design_package.get();
break; break;
} }
} }
@ -1123,30 +1123,28 @@ bool AstNode::simplify(bool const_fold, int stage, int width_hint, bool sign_hin
if (package_node) { if (package_node) {
// Import all names from the package into current scope // Import all names from the package into current scope
for (auto &pkg_child : package_node->children) { for (auto& pkg_child : package_node->children) {
if (pkg_child->type == AST_PARAMETER || pkg_child->type == AST_LOCALPARAM || if (pkg_child->type == AST_PARAMETER || pkg_child->type == AST_LOCALPARAM ||
pkg_child->type == AST_TYPEDEF || pkg_child->type == AST_FUNCTION || pkg_child->type == AST_TYPEDEF || pkg_child->type == AST_FUNCTION ||
pkg_child->type == AST_TASK || pkg_child->type == AST_ENUM) { pkg_child->type == AST_TASK || pkg_child->type == AST_ENUM) {
current_scope[pkg_child->str] = pkg_child; current_scope[pkg_child->str] = pkg_child.get();
} }
if (pkg_child->type == AST_ENUM) { if (pkg_child->type == AST_ENUM) {
for (auto enode : pkg_child->children) { for (auto& enode : pkg_child->children) {
log_assert(enode->type==AST_ENUM_ITEM); log_assert(enode->type==AST_ENUM_ITEM);
if (current_scope.count(enode->str) == 0) if (current_scope.count(enode->str) == 0)
current_scope[enode->str] = enode; current_scope[enode->str] = enode.get();
else else
input_error("enum item %s already exists in current scope\n", enode->str.c_str()); input_error("enum item %s already exists in current scope\n", enode->str.c_str());
} }
} }
} }
// Remove the import node since it's been processed // Remove the import node since it's been processed
delete child;
children.erase(children.begin() + i); children.erase(children.begin() + i);
i--; // Adjust index since we removed an element i--; // Adjust index since we removed an element
} else { } else {
// If we can't find the package, just remove the import node to avoid errors later // If we can't find the package, just remove the import node to avoid errors later
log_warning("Package `%s' not found for import, removing import statement\n", child->str.c_str()); log_warning("Package `%s' not found for import, removing import statement\n", child->str.c_str());
delete child;
children.erase(children.begin() + i); children.erase(children.begin() + i);
i--; // Adjust index since we removed an element i--; // Adjust index since we removed an element
} }

7
frontends/verilog/verilog_parser.y
View file

@ -831,12 +831,11 @@ package_body_stmt:
typedef_decl | localparam_decl | param_decl | task_func_decl; typedef_decl | localparam_decl | param_decl | task_func_decl;
import_stmt: import_stmt:
TOK_IMPORT hierarchical_id TOK_PACKAGESEP '*' ';' { TOK_IMPORT hierarchical_id TOK_PACKAGESEP TOK_ASTER TOK_SEMICOL {
// Create an import node to track package imports // Create an import node to track package imports
AstNode *import_node = new AstNode(AST_IMPORT); auto import_node = std::make_unique<AstNode>(@$, AST_IMPORT);
import_node->str = *$2; import_node->str = *$2;
ast_stack.back()->children.push_back(import_node); extra->ast_stack.back()->children.push_back(std::move(import_node));
delete $2;
}; };
interface: interface: