mirror of
https://github.com/YosysHQ/yosys
synced 2025-05-11 17:54:44 +00:00
Revert "Merge upstream"
This reverts commitc58a50f880
, reversing changes made toa1c3c98773
.
This commit is contained in:
parent
c58a50f880
commit
e73d51dbf0
15 changed files with 49 additions and 110 deletions
|
@ -337,14 +337,12 @@ template<typename O>
|
|||
std::vector<IdString> parse_hdlname(const O* object)
|
||||
{
|
||||
std::vector<IdString> path;
|
||||
if (!object->name.isPublic())
|
||||
return path;
|
||||
for (auto const &item : object->get_hdlname_attribute())
|
||||
path.push_back("\\" + item);
|
||||
if (path.empty() && object->name.isPublic())
|
||||
if (path.empty())
|
||||
path.push_back(object->name);
|
||||
if (!path.empty() && !(object->name.isPublic() || object->name.begins_with("$paramod") || object->name.begins_with("$abstract"))) {
|
||||
path.pop_back();
|
||||
path.push_back(object->name);
|
||||
}
|
||||
return path;
|
||||
}
|
||||
|
||||
|
@ -353,22 +351,17 @@ std::pair<std::vector<IdString>, IdString> parse_scopename(const O* object)
|
|||
{
|
||||
std::vector<IdString> path;
|
||||
IdString trailing = object->name;
|
||||
if (object->name.isPublic() || object->name.begins_with("$paramod") || object->name.begins_with("$abstract")) {
|
||||
if (object->name.isPublic()) {
|
||||
for (auto const &item : object->get_hdlname_attribute())
|
||||
path.push_back("\\" + item);
|
||||
if (!path.empty()) {
|
||||
trailing = path.back();
|
||||
path.pop_back();
|
||||
}
|
||||
} else if (object->has_attribute(ID::hdlname)) {
|
||||
for (auto const &item : object->get_hdlname_attribute())
|
||||
path.push_back("\\" + item);
|
||||
if (!path.empty()) {
|
||||
path.pop_back();
|
||||
}
|
||||
} else {
|
||||
for (auto const &item : split_tokens(object->get_string_attribute(ID(scopename)), " "))
|
||||
path.push_back("\\" + item);
|
||||
|
||||
}
|
||||
return {path, trailing};
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue