Internals: Misc cleanups for classes.

This commit is contained in:
Wilson Snyder 2020-01-20 16:53:27 -05:00
parent 4a122fd0f2
commit abf3850d08
4 changed files with 9 additions and 5 deletions

View File

@ -51,7 +51,10 @@ typedef std::set<int> MTaskIdSet; // Set of mtaskIds for Var sorting
//###################################################################### //######################################################################
// For broken() function, return error string if have a match // For broken() function, return error string if have a match
#define BROKEN_RTN(test) do { if (VL_UNCOVERABLE(test)) return # test; } while(0) #define BROKEN_RTN(test) \
do { \
if (VL_UNCOVERABLE(test)) return #test; \
} while (0)
// (V)erilator (N)ode is: True if AstNode is of a a given AstType // (V)erilator (N)ode is: True if AstNode is of a a given AstType
#define VN_IS(nodep,nodetypename) (AstNode::privateIs ## nodetypename(nodep)) #define VN_IS(nodep,nodetypename) (AstNode::privateIs ## nodetypename(nodep))

View File

@ -1367,7 +1367,7 @@ public:
}; };
class AstCMethodHard : public AstNodeStmt { class AstCMethodHard : public AstNodeStmt {
// A reference to a "C" hardocded member task (or function) // A reference to a "C" hardcoded member task (or function)
// PARENTS: stmt/math // PARENTS: stmt/math
// Not all calls are statments vs math. AstNodeStmt needs isStatement() to deal. // Not all calls are statments vs math. AstNodeStmt needs isStatement() to deal.
private: private:

View File

@ -1098,13 +1098,12 @@ class LinkDotFindVisitor : public AstNVisitor {
} }
} }
virtual void visit(AstTypedef* nodep) { virtual void visit(AstTypedef* nodep) {
// Remember its name for later resolution UASSERT_OBJ(m_curSymp, nodep, "Typedef not under module/package/$unit");
UASSERT_OBJ(m_curSymp, nodep, "Typedef not under module?");
iterateChildren(nodep); iterateChildren(nodep);
m_statep->insertSym(m_curSymp, nodep->name(), nodep, m_packagep); m_statep->insertSym(m_curSymp, nodep->name(), nodep, m_packagep);
} }
virtual void visit(AstParamTypeDType* nodep) { virtual void visit(AstParamTypeDType* nodep) {
UASSERT_OBJ(m_curSymp, nodep, "Parameter type not under module?"); UASSERT_OBJ(m_curSymp, nodep, "Parameter type not under module/package/$unit");
iterateChildren(nodep); iterateChildren(nodep);
m_statep->insertSym(m_curSymp, nodep->name(), nodep, m_packagep); m_statep->insertSym(m_curSymp, nodep->name(), nodep, m_packagep);
} }

View File

@ -59,6 +59,7 @@ private:
if (addPvt) { if (addPvt) {
string newname = string("__PVT__")+nodep->name(); string newname = string("__PVT__")+nodep->name();
nodep->name(newname); nodep->name(newname);
nodep->editCountInc();
} else { } else {
string rsvd = m_words.isKeyword(nodep->name()); string rsvd = m_words.isKeyword(nodep->name());
if (rsvd != "") { if (rsvd != "") {
@ -66,6 +67,7 @@ private:
+": "<<nodep->prettyNameQ()); +": "<<nodep->prettyNameQ());
string newname = string("__SYM__")+nodep->name(); string newname = string("__SYM__")+nodep->name();
nodep->name(newname); nodep->name(newname);
nodep->editCountInc();
} }
} }
nodep->user1(1); nodep->user1(1);