forked from github/verilator
clang-format uses C++11 style. No functional change.
This commit is contained in:
parent
953a442827
commit
9927e8b3ee
@ -104,7 +104,7 @@ SpacesInContainerLiterals: true
|
||||
SpacesInCStyleCastParentheses: false
|
||||
SpacesInParentheses: false
|
||||
SpacesInSquareBrackets: false
|
||||
Standard: Cpp03
|
||||
Standard: Cpp11
|
||||
TabWidth: 8
|
||||
UseTab: Never
|
||||
...
|
||||
|
@ -2310,7 +2310,7 @@ const char* Verilated::catName(const char* n1, const char* n2, const char* delim
|
||||
|
||||
// Keeping these out of class Verilated to avoid having to include <list>
|
||||
// in verilated.h (for compilation speed)
|
||||
typedef std::list<std::pair<Verilated::VoidPCb, void*> > VoidPCbList;
|
||||
typedef std::list<std::pair<Verilated::VoidPCb, void*>> VoidPCbList;
|
||||
static VoidPCbList g_flushCbs;
|
||||
static VoidPCbList g_exitCbs;
|
||||
|
||||
|
@ -360,7 +360,7 @@ public:
|
||||
os << "# SystemC::Coverage-3\n";
|
||||
|
||||
// Build list of events; totalize if collapsing hierarchy
|
||||
typedef std::map<std::string, std::pair<std::string, vluint64_t> > EventMap;
|
||||
typedef std::map<std::string, std::pair<std::string, vluint64_t>> EventMap;
|
||||
EventMap eventCounts;
|
||||
for (ItemList::iterator it = m_items.begin(); it != m_items.end(); ++it) {
|
||||
VerilatedCovImpItem* itemp = *(it);
|
||||
|
@ -97,7 +97,7 @@ template <typename T> struct vl_equal_to<T*> {
|
||||
//===================================================================
|
||||
//
|
||||
/// Functional clone of the std::unordered_set hash table.
|
||||
template <class T_Key, class T_Hash = vl_hash<T_Key>, class T_Equal = vl_equal_to<T_Key> >
|
||||
template <class T_Key, class T_Hash = vl_hash<T_Key>, class T_Equal = vl_equal_to<T_Key>>
|
||||
class vl_unordered_set {
|
||||
public:
|
||||
// TYPES
|
||||
@ -400,7 +400,7 @@ private:
|
||||
//
|
||||
/// Functional clone of the std::unordered_map hash table.
|
||||
template <class T_Key, class T_Value, class T_Hash = vl_hash<T_Key>,
|
||||
class T_Equal = vl_equal_to<T_Key> >
|
||||
class T_Equal = vl_equal_to<T_Key>>
|
||||
class vl_unordered_map {
|
||||
private:
|
||||
// TYPES
|
||||
|
@ -35,7 +35,7 @@ private:
|
||||
AstUser1InUse m_inuser1;
|
||||
string m_prefix; // String prefix to add to name based on hier
|
||||
AstScope* m_classScopep; // Package moving scopes into
|
||||
typedef std::vector<std::pair<AstNode*, AstScope*> > MoveVector;
|
||||
typedef std::vector<std::pair<AstNode*, AstScope*>> MoveVector;
|
||||
MoveVector m_moves;
|
||||
|
||||
// NODE STATE
|
||||
|
@ -228,6 +228,6 @@ private:
|
||||
// GraphStreamUnordered is GraphStream using a plain pointer compare to
|
||||
// break ties in the graph order. This WILL return nodes in
|
||||
// nondeterministic order.
|
||||
typedef GraphStream<std::less<const V3GraphVertex*> > GraphStreamUnordered;
|
||||
typedef GraphStream<std::less<const V3GraphVertex*>> GraphStreamUnordered;
|
||||
|
||||
#endif // Guard
|
||||
|
@ -357,7 +357,7 @@ void V3HierBlockPlan::createPlan(AstNetlist* nodep) {
|
||||
}
|
||||
|
||||
V3HierBlockPlan::HierVector V3HierBlockPlan::hierBlocksSorted() const {
|
||||
typedef std::map<const V3HierBlock*, std::set<const V3HierBlock*> > ChildrenMap;
|
||||
typedef std::map<const V3HierBlock*, std::set<const V3HierBlock*>> ChildrenMap;
|
||||
ChildrenMap childrenOfHierBlock;
|
||||
|
||||
HierVector sorted;
|
||||
|
@ -46,7 +46,7 @@ public:
|
||||
private:
|
||||
// TYPES
|
||||
// Parameter name, stringified value
|
||||
typedef std::vector<std::pair<string, string> > StrGParams;
|
||||
typedef std::vector<std::pair<string, string>> StrGParams;
|
||||
|
||||
// MEMBERS
|
||||
const AstNodeModule* m_modp; // Hierarchical block module
|
||||
|
@ -151,7 +151,7 @@ private:
|
||||
|
||||
// Map each varscope to one or more locations where it's accessed.
|
||||
// These maps will not include any ASSIGNPOST accesses:
|
||||
typedef vl_unordered_map<const AstVarScope*, std::set<LifeLocation> > LocMap;
|
||||
typedef vl_unordered_map<const AstVarScope*, std::set<LifeLocation>> LocMap;
|
||||
LocMap m_reads; // VarScope read locations
|
||||
LocMap m_writes; // VarScope write locations
|
||||
|
||||
|
@ -140,9 +140,9 @@ private:
|
||||
// TYPES
|
||||
typedef std::multimap<string, VSymEnt*> NameScopeSymMap;
|
||||
typedef std::map<VSymEnt*, VSymEnt*> ScopeAliasMap;
|
||||
typedef std::set<std::pair<AstNodeModule*, string> > ImplicitNameSet;
|
||||
typedef std::set<std::pair<AstNodeModule*, string>> ImplicitNameSet;
|
||||
typedef std::vector<VSymEnt*> IfaceVarSyms;
|
||||
typedef std::vector<std::pair<AstIface*, VSymEnt*> > IfaceModSyms;
|
||||
typedef std::vector<std::pair<AstIface*, VSymEnt*>> IfaceModSyms;
|
||||
|
||||
static LinkDotState* s_errorThisp; // Last self, for error reporting only
|
||||
|
||||
|
@ -53,7 +53,7 @@
|
||||
class V3OptionsImp {
|
||||
public:
|
||||
// TYPES
|
||||
typedef std::map<string, std::set<string> > DirMap; // Directory listing
|
||||
typedef std::map<string, std::set<string>> DirMap; // Directory listing
|
||||
|
||||
// STATE
|
||||
std::list<string> m_allArgs; // List of every argument encountered
|
||||
|
@ -215,7 +215,7 @@ private:
|
||||
|
||||
// TYPES
|
||||
// Note may have duplicate entries
|
||||
typedef std::deque<std::pair<AstIfaceRefDType*, AstIfaceRefDType*> > IfaceRefRefs;
|
||||
typedef std::deque<std::pair<AstIfaceRefDType*, AstIfaceRefDType*>> IfaceRefRefs;
|
||||
|
||||
// STATE
|
||||
typedef std::map<AstNode*, AstNode*> CloneMap;
|
||||
|
@ -48,7 +48,7 @@ private:
|
||||
typedef vl_unordered_map<AstNodeModule*, AstScope*> PackageScopeMap;
|
||||
// These cannot be unordered unless make a specialized hashing pair (gcc-8)
|
||||
typedef std::map<std::pair<AstVar*, AstScope*>, AstVarScope*> VarScopeMap;
|
||||
typedef std::set<std::pair<AstVarRef*, AstScope*> > VarRefScopeSet;
|
||||
typedef std::set<std::pair<AstVarRef*, AstScope*>> VarRefScopeSet;
|
||||
|
||||
// STATE, inside processing a single module
|
||||
AstNodeModule* m_modp; // Current module
|
||||
|
@ -40,7 +40,7 @@
|
||||
/// value-sorted order. Values need not be unique. Uses T_KeyCompare to
|
||||
/// break ties in the sort when values collide.
|
||||
|
||||
template <typename T_Key, typename T_Value, class T_KeyCompare = std::less<T_Key> >
|
||||
template <typename T_Key, typename T_Value, class T_KeyCompare = std::less<T_Key>>
|
||||
class SortByValueMap {
|
||||
// TYPES
|
||||
private:
|
||||
@ -350,7 +350,7 @@ private:
|
||||
/// when the subset of elements whose scores change is much smaller than
|
||||
/// the full set size.
|
||||
|
||||
template <typename T_Elem, typename T_Score, class T_ElemCompare = std::less<T_Elem> >
|
||||
template <typename T_Elem, typename T_Score, class T_ElemCompare = std::less<T_Elem>>
|
||||
class V3Scoreboard {
|
||||
private:
|
||||
// TYPES
|
||||
|
@ -922,7 +922,7 @@ public:
|
||||
std::vector<SplitNewVar> splitPlan(bool skipUnused) const {
|
||||
UASSERT(m_dedupDone, "dedup() must be called before");
|
||||
std::vector<SplitNewVar> plan;
|
||||
std::vector<std::pair<int, bool> > points; // <bit location, is end>
|
||||
std::vector<std::pair<int, bool>> points; // <bit location, is end>
|
||||
points.reserve(m_lhs.size() * 2 + 2); // 2 points will be added per one PackedVarRefEntry
|
||||
for (const_iterator it = m_lhs.begin(), itend = m_lhs.end(); it != itend; ++it) {
|
||||
points.push_back(std::make_pair(it->lsb(), false)); // Start of a region
|
||||
|
@ -333,7 +333,7 @@ private:
|
||||
IM_AFTER, // Pointing at last inserted stmt, insert after
|
||||
IM_WHILE_PRECOND // Pointing to for loop, add to body end
|
||||
};
|
||||
typedef std::map<string, std::pair<AstNodeFTask*, string> > DpiNames;
|
||||
typedef std::map<string, std::pair<AstNodeFTask*, string>> DpiNames;
|
||||
|
||||
// STATE
|
||||
TaskStateVisitor* m_statep; // Common state between visitors
|
||||
|
Loading…
Reference in New Issue
Block a user