luke
/
iverilog
mirror of https://github.com/steveicarus/iverilog.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

vhdlpp: Simplified a few find_* functions.

This commit is contained in:
Maciej Suminski 2015-08-27 14:13:58 +02:00
parent 0569474d17
commit 5b0bf08638
1 changed files with 14 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
vhdlpp/scope.cc
View File

@ -99,11 +99,10 @@ const VType*ScopeBase::find_type(perm_string by_name)
if (cur == cur_types_.end()) { if (cur == cur_types_.end()) {
cur = use_types_.find(by_name); cur = use_types_.find(by_name);
if (cur == use_types_.end()) if (cur == use_types_.end())
return 0; return NULL; // nothing found
else }
return cur->second;
} else return cur->second;
return cur->second;
} }
bool ScopeBase::find_constant(perm_string by_name, const VType*&typ, Expression*&exp) const bool ScopeBase::find_constant(perm_string by_name, const VType*&typ, Expression*&exp) const
@ -115,19 +114,12 @@ bool ScopeBase::find_constant(perm_string by_name, const VType*&typ, Expression*
if (cur == cur_constants_.end()) { if (cur == cur_constants_.end()) {
cur = use_constants_.find(by_name); cur = use_constants_.find(by_name);
if (cur == use_constants_.end()) if (cur == use_constants_.end())
return false; return false; // nothing found
else {
typ = cur->second->typ;
exp = cur->second->val;
return true;
}
} else {
typ = cur->second->typ;
exp = cur->second->val;
return true;
} }
return false; typ = cur->second->typ;
exp = cur->second->val;
return true;
} }
Signal* ScopeBase::find_signal(perm_string by_name) const Signal* ScopeBase::find_signal(perm_string by_name) const
@ -136,12 +128,10 @@ Signal* ScopeBase::find_signal(perm_string by_name) const
if (cur == new_signals_.end()) { if (cur == new_signals_.end()) {
cur = old_signals_.find(by_name); cur = old_signals_.find(by_name);
if (cur == old_signals_.end()) if (cur == old_signals_.end())
return 0; return NULL; // nothing found
else
return cur->second;
} else {
return cur->second;
} }
return cur->second;
} }
Variable* ScopeBase::find_variable(perm_string by_name) const Variable* ScopeBase::find_variable(perm_string by_name) const
@ -150,12 +140,10 @@ Variable* ScopeBase::find_variable(perm_string by_name) const
if (cur == new_variables_.end()) { if (cur == new_variables_.end()) {
cur = old_variables_.find(by_name); cur = old_variables_.find(by_name);
if (cur == old_variables_.end()) if (cur == old_variables_.end())
return 0; return 0; // nothing found
else
return cur->second;
} else {
return cur->second;
} }
return cur->second;
} }
const InterfacePort* ScopeBase::find_param(perm_string) const const InterfacePort* ScopeBase::find_param(perm_string) const
@ -232,7 +220,6 @@ void ScopeBase::do_use_from(const ScopeBase*that)
use_subprograms_[cur->first] = cur->second; use_subprograms_[cur->first] = cur->second;
} }
for (map<perm_string,const VType*>::const_iterator cur = that->cur_types_.begin() for (map<perm_string,const VType*>::const_iterator cur = that->cur_types_.begin()
; cur != that->cur_types_.end() ; ++ cur) { ; cur != that->cur_types_.end() ; ++ cur) {
if (cur->second == 0) if (cur->second == 0)