diff --git a/src/V3AstNodes.cpp b/src/V3AstNodes.cpp index cfa015b7d..df1187036 100644 --- a/src/V3AstNodes.cpp +++ b/src/V3AstNodes.cpp @@ -35,8 +35,10 @@ // Special methods // We need these here, because the classes they point to aren't defined when we declare the class -bool AstNodeVarRef::broken() const { return ((m_varScopep && !m_varScopep->brokeExists()) - || (m_varp && !m_varp->brokeExists())); } +bool AstNodeVarRef::broken() const { + return ((m_varScopep && !m_varScopep->brokeExists()) + || (m_varp && !m_varp->brokeExists())); +} void AstNodeVarRef::cloneRelink() { if (m_varp && m_varp->clonep()) { m_varp = m_varp->clonep()->castVar(); } diff --git a/src/V3Delayed.cpp b/src/V3Delayed.cpp index fa3fafb68..7b7c65001 100644 --- a/src/V3Delayed.cpp +++ b/src/V3Delayed.cpp @@ -124,10 +124,10 @@ private: AstVar* varp; AstNodeModule* addmodp = oldvarscp->scopep()->modp(); // We need a new AstVar, but only one for all scopes, to match the new AstVarScope - VarMap::iterator iter = m_modVarMap.find(make_pair(addmodp,name)); - if (iter != m_modVarMap.end()) { + VarMap::iterator it = m_modVarMap.find(make_pair(addmodp,name)); + if (it != m_modVarMap.end()) { // Created module's AstVar earlier under some other scope - varp = iter->second; + varp = it->second; } else { if (width==0) { varp = new AstVar (oldvarscp->fileline(), AstVarType::BLOCKTEMP, name, oldvarscp->varp()); diff --git a/src/V3Error.cpp b/src/V3Error.cpp index 4b433a31b..c70b8dc95 100644 --- a/src/V3Error.cpp +++ b/src/V3Error.cpp @@ -89,8 +89,8 @@ const string FileLineSingleton::filenameLetters(int no) { //! We associate a language with each source file, so we also set the default //! for this. int FileLineSingleton::nameToNumber(const string& filename) { - FileNameNumMap::const_iterator iter = m_namemap.find(filename); - if (VL_LIKELY(iter != m_namemap.end())) return iter->second; + FileNameNumMap::const_iterator it = m_namemap.find(filename); + if (VL_LIKELY(it != m_namemap.end())) return it->second; int num = m_names.size(); m_names.push_back(filename); m_languages.push_back(V3LangCode::mostRecent()); diff --git a/src/V3LanguageWords.h b/src/V3LanguageWords.h index 7f02a58b3..8e9b469c3 100644 --- a/src/V3LanguageWords.h +++ b/src/V3LanguageWords.h @@ -37,9 +37,9 @@ class V3LanguageWords { } public: string isKeyword(const string& kwd) { - map::iterator iter = m_kwdMap.find(kwd); - if (iter == m_kwdMap.end()) return ""; - return iter->second; + map::iterator it = m_kwdMap.find(kwd); + if (it == m_kwdMap.end()) return ""; + return it->second; } public: diff --git a/src/V3LinkDot.cpp b/src/V3LinkDot.cpp index 52588db91..cf009f9cb 100644 --- a/src/V3LinkDot.cpp +++ b/src/V3LinkDot.cpp @@ -77,13 +77,13 @@ private: AstUser4InUse m_inuser4; // TYPES - typedef std::multimap NameScopeMap; + typedef std::multimap NameScopeSymMap; typedef set > ImplicitNameSet; // MEMBERS VSymGraph m_syms; // Symbol table VSymEnt* m_dunitEntp; // $unit entry - NameScopeMap m_nameScopeMap; // Hash of scope referenced by non-pretty textual name + NameScopeSymMap m_nameScopeSymMap; // Map of scope referenced by non-pretty textual name ImplicitNameSet m_implicitNameSet; // For [module][signalname] if we can implicitly create it bool m_forPrimary; // First link bool m_forPrearray; // Compress cell__[array] refs @@ -195,7 +195,7 @@ public: nodep->user1p(symp); checkDuplicate(rootEntp(), nodep, nodep->origName()); rootEntp()->insert(nodep->origName(),symp); - if (forScopeCreation()) m_nameScopeMap.insert(make_pair(scopename, symp)); + if (forScopeCreation()) m_nameScopeSymMap.insert(make_pair(scopename, symp)); return symp; } VSymEnt* insertCell(VSymEnt* abovep, VSymEnt* modSymp, @@ -214,7 +214,7 @@ public: // Duplicates are possible, as until resolve generates might have 2 same cells under an if modSymp->reinsert(nodep->name(), symp); } - if (forScopeCreation()) m_nameScopeMap.insert(make_pair(scopename, symp)); + if (forScopeCreation()) m_nameScopeSymMap.insert(make_pair(scopename, symp)); return symp; } VSymEnt* insertInline(VSymEnt* abovep, VSymEnt* modSymp, @@ -278,17 +278,17 @@ public: return symp; } VSymEnt* getScopeSym(AstScope* nodep) { - NameScopeMap::iterator iter = m_nameScopeMap.find(nodep->name()); - if (iter == m_nameScopeMap.end()) { + NameScopeSymMap::iterator it = m_nameScopeSymMap.find(nodep->name()); + if (it == m_nameScopeSymMap.end()) { nodep->v3fatalSrc("Scope never assigned a symbol entry?"); } - return iter->second; + return it->second; } void implicitOkAdd(AstNodeModule* nodep, const string& varname) { // Mark the given variable name as being allowed to be implicitly declared if (nodep) { - ImplicitNameSet::iterator iter = m_implicitNameSet.find(make_pair(nodep,varname)); - if (iter == m_implicitNameSet.end()) { + ImplicitNameSet::iterator it = m_implicitNameSet.find(make_pair(nodep,varname)); + if (it == m_implicitNameSet.end()) { m_implicitNameSet.insert(make_pair(nodep,varname)); } } diff --git a/src/V3SymTable.h b/src/V3SymTable.h index 15a64e3f0..882611638 100644 --- a/src/V3SymTable.h +++ b/src/V3SymTable.h @@ -137,11 +137,11 @@ public: VSymEnt* findIdFlat(const string& name) const { // Find identifier without looking upward through symbol hierarchy // First, scan this begin/end block or module for the name - IdNameMap::const_iterator iter = m_idNameMap.find(name); + IdNameMap::const_iterator it = m_idNameMap.find(name); UINFO(9, " SymFind se"<<(void*)this<<" '"< "<<(iter == m_idNameMap.end() ? "NONE" - : "se"+cvtToStr((void*)(iter->second))+" n="+cvtToStr((void*)(iter->second->nodep())))<second); + <<"' -> "<<(it == m_idNameMap.end() ? "NONE" + : "se"+cvtToStr((void*)(it->second))+" n="+cvtToStr((void*)(it->second->nodep())))<second); return NULL; } VSymEnt* findIdFallback(const string& name) const {