mirrors/yosys
3
0
Fork 0
mirror of https://github.com/YosysHQ/yosys synced 2025-04-27 19:05:52 +00:00
Code Activity

Another name resolution bugfix for generate blocks

Browse source
This commit is contained in:
Clifford Wolf 2013-11-20 13:57:40 +01:00
parent 92035fb38e
commit 65ad556f3d
2 changed files with 61 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

17
frontends/ast/simplify.cc
View file

@ -383,7 +383,10 @@ bool AstNode::simplify(bool const_fold, bool at_zero, bool in_lvalue, int stage,
}
assert(children[1]->type == AST_IDENTIFIER);
newNode = children[1]->clone();
newNode->str = stringf("%s[%d].%s", str.c_str(), children[0]->integer, children[1]->str.c_str());
const char *second_part = children[1]->str.c_str();
if (second_part[0] == '\\')
second_part++;
newNode->str = stringf("%s[%d].%s", str.c_str(), children[0]->integer, second_part);
goto apply_newNode;
}
@ -599,8 +602,10 @@ bool AstNode::simplify(bool const_fold, bool at_zero, bool in_lvalue, int stage,
buf->expand_genblock(varbuf->str, sstr.str(), name_map);
if (type == AST_GENFOR) {
for (size_t i = 0; i < buf->children.size(); i++)
for (size_t i = 0; i < buf->children.size(); i++) {
buf->children[i]->simplify(false, false, false, stage, -1, false);
current_ast_mod->children.push_back(buf->children[i]);
}
} else {
for (size_t i = 0; i < buf->children.size(); i++)
current_block->children.insert(current_block->children.begin() + current_block_idx++, buf->children[i]);
@ -633,8 +638,10 @@ bool AstNode::simplify(bool const_fold, bool at_zero, bool in_lvalue, int stage,
expand_genblock(std::string(), str + ".", name_map);
}
for (size_t i = 0; i < children.size(); i++)
for (size_t i = 0; i < children.size(); i++) {
children[i]->simplify(false, false, false, stage, -1, false);
current_ast_mod->children.push_back(children[i]);
}
children.clear();
did_something = true;
@ -668,8 +675,10 @@ bool AstNode::simplify(bool const_fold, bool at_zero, bool in_lvalue, int stage,
buf->expand_genblock(std::string(), buf->str + ".", name_map);
}
for (size_t i = 0; i < buf->children.size(); i++)
for (size_t i = 0; i < buf->children.size(); i++) {
buf->children[i]->simplify(false, false, false, stage, -1, false);
current_ast_mod->children.push_back(buf->children[i]);
}
buf->children.clear();
delete buf;