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

Internals: Remove some unneeded this->. No functional change.

This commit is contained in:
Wilson Snyder 2025-03-08 17:48:20 -05:00
parent 8026b2a7f3
commit 9632dfdf93
3 changed files with 58 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/V3AstNodeDType.h
View File

@ -532,7 +532,7 @@ public:
AstCDType(FileLine* fl, const string& name) AstCDType(FileLine* fl, const string& name)
: ASTGEN_SUPER_CDType(fl) : ASTGEN_SUPER_CDType(fl)
, m_name{name} { , m_name{name} {
this->dtypep(this); dtypep(this);
} }
public: public:
@ -572,8 +572,8 @@ public:
AstClassRefDType(FileLine* fl, AstClass* classp, AstPin* paramsp) AstClassRefDType(FileLine* fl, AstClass* classp, AstPin* paramsp)
: ASTGEN_SUPER_ClassRefDType(fl) : ASTGEN_SUPER_ClassRefDType(fl)
, m_classp{classp} { , m_classp{classp} {
this->dtypep(this); dtypep(this);
this->addParamsp(paramsp); addParamsp(paramsp);
} }
ASTGEN_MEMBERS_AstClassRefDType; ASTGEN_MEMBERS_AstClassRefDType;
// METHODS // METHODS
@ -1075,7 +1075,7 @@ class AstQueueDType final : public AstNodeDType {
public: public:
AstQueueDType(FileLine* fl, VFlagChildDType, AstNodeDType* dtp, AstNodeExpr* boundp) AstQueueDType(FileLine* fl, VFlagChildDType, AstNodeDType* dtp, AstNodeExpr* boundp)
: ASTGEN_SUPER_QueueDType(fl) { : ASTGEN_SUPER_QueueDType(fl) {
this->childDTypep(dtp); childDTypep(dtp);
this->boundp(boundp); this->boundp(boundp);
refDTypep(nullptr); refDTypep(nullptr);
dtypep(nullptr); // V3Width will resolve dtypep(nullptr); // V3Width will resolve
@ -1135,7 +1135,7 @@ public:
AstRefDType(FileLine* fl, const string& name, AstNodeExpr* classOrPackagep, AstPin* paramsp) AstRefDType(FileLine* fl, const string& name, AstNodeExpr* classOrPackagep, AstPin* paramsp)
: ASTGEN_SUPER_RefDType(fl) : ASTGEN_SUPER_RefDType(fl)
, m_name{name} { , m_name{name} {
this->classOrPackageOpp(classOrPackagep); classOrPackageOpp(classOrPackagep);
addParamsp(paramsp); addParamsp(paramsp);
} }
class FlagTypeOfExpr {}; // type(expr) for parser only class FlagTypeOfExpr {}; // type(expr) for parser only
@ -1352,7 +1352,7 @@ class AstUnpackArrayDType final : public AstNodeArrayDType {
public: public:
AstUnpackArrayDType(FileLine* fl, VFlagChildDType, AstNodeDType* dtp, AstRange* rangep) AstUnpackArrayDType(FileLine* fl, VFlagChildDType, AstNodeDType* dtp, AstRange* rangep)
: ASTGEN_SUPER_UnpackArrayDType(fl) { : ASTGEN_SUPER_UnpackArrayDType(fl) {
this->childDTypep(dtp); // Only for parser childDTypep(dtp); // Only for parser
this->rangep(rangep); this->rangep(rangep);
refDTypep(nullptr); refDTypep(nullptr);
dtypep(nullptr); // V3Width will resolve dtypep(nullptr); // V3Width will resolve

32
src/V3AstNodeExpr.h
View File

@ -243,12 +243,12 @@ protected:
AstNodeFTaskRef(VNType t, FileLine* fl, AstNode* namep, AstNodeExpr* pinsp) AstNodeFTaskRef(VNType t, FileLine* fl, AstNode* namep, AstNodeExpr* pinsp)
: AstNodeExpr{t, fl} { : AstNodeExpr{t, fl} {
this->namep(namep); this->namep(namep);
this->addPinsp(pinsp); addPinsp(pinsp);
} }
AstNodeFTaskRef(VNType t, FileLine* fl, const string& name, AstNodeExpr* pinsp) AstNodeFTaskRef(VNType t, FileLine* fl, const string& name, AstNodeExpr* pinsp)
: AstNodeExpr{t, fl} : AstNodeExpr{t, fl}
, m_name{name} { , m_name{name} {
this->addPinsp(pinsp); addPinsp(pinsp);
} }
public: public:
@ -648,7 +648,7 @@ public:
: ASTGEN_SUPER_CMethodHard(fl) : ASTGEN_SUPER_CMethodHard(fl)
, m_name{name} { , m_name{name} {
this->fromp(fromp); this->fromp(fromp);
this->addPinsp(pinsp); addPinsp(pinsp);
setPurity(); setPurity();
} }
ASTGEN_MEMBERS_AstCMethodHard; ASTGEN_MEMBERS_AstCMethodHard;
@ -675,7 +675,7 @@ public:
AstCast(FileLine* fl, AstNodeExpr* fromp, VFlagChildDType, AstNodeDType* dtp) AstCast(FileLine* fl, AstNodeExpr* fromp, VFlagChildDType, AstNodeDType* dtp)
: ASTGEN_SUPER_Cast(fl) { : ASTGEN_SUPER_Cast(fl) {
this->fromp(fromp); this->fromp(fromp);
this->childDTypep(dtp); childDTypep(dtp);
dtypeFrom(dtp); dtypeFrom(dtp);
} }
AstCast(FileLine* fl, AstNodeExpr* fromp, AstNodeDType* dtp) AstCast(FileLine* fl, AstNodeExpr* fromp, AstNodeDType* dtp)
@ -729,7 +729,7 @@ public:
AstCellArrayRef(FileLine* fl, const string& name, AstNodeExpr* selp) AstCellArrayRef(FileLine* fl, const string& name, AstNodeExpr* selp)
: ASTGEN_SUPER_CellArrayRef(fl) : ASTGEN_SUPER_CellArrayRef(fl)
, m_name{name} { , m_name{name} {
this->addSelp(selp); addSelp(selp);
} }
ASTGEN_MEMBERS_AstCellArrayRef; ASTGEN_MEMBERS_AstCellArrayRef;
// ACCESSORS // ACCESSORS
@ -770,7 +770,7 @@ public:
: ASTGEN_SUPER_ClassOrPackageRef(fl) : ASTGEN_SUPER_ClassOrPackageRef(fl)
, m_name{name} , m_name{name}
, m_classOrPackageNodep{classOrPackageNodep} { , m_classOrPackageNodep{classOrPackageNodep} {
this->addParamsp(paramsp); addParamsp(paramsp);
} }
ASTGEN_MEMBERS_AstClassOrPackageRef; ASTGEN_MEMBERS_AstClassOrPackageRef;
// METHODS // METHODS
@ -877,7 +877,7 @@ public:
AstConsPackMember* membersp = nullptr) AstConsPackMember* membersp = nullptr)
: ASTGEN_SUPER_ConsPackUOrStruct(fl) { : ASTGEN_SUPER_ConsPackUOrStruct(fl) {
this->dtypep(dtypep); this->dtypep(dtypep);
this->addMembersp(membersp); addMembersp(membersp);
} }
ASTGEN_MEMBERS_AstConsPackUOrStruct; ASTGEN_MEMBERS_AstConsPackUOrStruct;
const char* broken() const override { const char* broken() const override {
@ -1163,7 +1163,7 @@ public:
AstDist(FileLine* fl, AstNodeExpr* exprp, AstDistItem* itemsp) AstDist(FileLine* fl, AstNodeExpr* exprp, AstDistItem* itemsp)
: ASTGEN_SUPER_Inside(fl) { : ASTGEN_SUPER_Inside(fl) {
this->exprp(exprp); this->exprp(exprp);
this->addItemsp(itemsp); addItemsp(itemsp);
dtypeSetBit(); dtypeSetBit();
} }
ASTGEN_MEMBERS_AstDist; ASTGEN_MEMBERS_AstDist;
@ -1553,7 +1553,7 @@ public:
AstInside(FileLine* fl, AstNodeExpr* exprp, AstNodeExpr* itemsp) AstInside(FileLine* fl, AstNodeExpr* exprp, AstNodeExpr* itemsp)
: ASTGEN_SUPER_Inside(fl) { : ASTGEN_SUPER_Inside(fl) {
this->exprp(exprp); this->exprp(exprp);
this->addItemsp(itemsp); addItemsp(itemsp);
dtypeSetBit(); dtypeSetBit();
} }
ASTGEN_MEMBERS_AstInside; ASTGEN_MEMBERS_AstInside;
@ -1745,7 +1745,7 @@ class AstPatMember final : public AstNodeExpr {
public: public:
AstPatMember(FileLine* fl, AstNodeExpr* lhssp, AstNode* keyp, AstNodeExpr* repp) AstPatMember(FileLine* fl, AstNodeExpr* lhssp, AstNode* keyp, AstNodeExpr* repp)
: ASTGEN_SUPER_PatMember(fl) { : ASTGEN_SUPER_PatMember(fl) {
this->addLhssp(lhssp); addLhssp(lhssp);
this->keyp(keyp); this->keyp(keyp);
this->repp(repp); this->repp(repp);
} }
@ -1942,7 +1942,7 @@ public:
AstSScanF(FileLine* fl, const string& text, AstNode* fromp, AstNode* exprsp) AstSScanF(FileLine* fl, const string& text, AstNode* fromp, AstNode* exprsp)
: ASTGEN_SUPER_SScanF(fl) : ASTGEN_SUPER_SScanF(fl)
, m_text{text} { , m_text{text} {
this->addExprsp(exprsp); addExprsp(exprsp);
this->fromp(fromp); this->fromp(fromp);
} }
ASTGEN_MEMBERS_AstSScanF; ASTGEN_MEMBERS_AstSScanF;
@ -2030,7 +2030,7 @@ public:
AstSelLoopVars(FileLine* fl, AstNodeExpr* fromp, AstNode* elementsp) AstSelLoopVars(FileLine* fl, AstNodeExpr* fromp, AstNode* elementsp)
: ASTGEN_SUPER_SelLoopVars(fl) { : ASTGEN_SUPER_SelLoopVars(fl) {
this->fromp(fromp); this->fromp(fromp);
this->addElementsp(elementsp); addElementsp(elementsp);
} }
ASTGEN_MEMBERS_AstSelLoopVars; ASTGEN_MEMBERS_AstSelLoopVars;
bool sameNode(const AstNode* /*samep*/) const override { return true; } bool sameNode(const AstNode* /*samep*/) const override { return true; }
@ -2151,7 +2151,7 @@ class AstSysIgnore final : public AstNodeExpr {
public: public:
AstSysIgnore(FileLine* fl, AstNode* exprsp) AstSysIgnore(FileLine* fl, AstNode* exprsp)
: ASTGEN_SUPER_SysIgnore(fl) { : ASTGEN_SUPER_SysIgnore(fl) {
this->addExprsp(exprsp); addExprsp(exprsp);
} }
ASTGEN_MEMBERS_AstSysIgnore; ASTGEN_MEMBERS_AstSysIgnore;
string verilogKwd() const override { return "$ignored"; } string verilogKwd() const override { return "$ignored"; }
@ -2262,7 +2262,7 @@ class AstUCFunc final : public AstNodeExpr {
public: public:
AstUCFunc(FileLine* fl, AstNode* exprsp) AstUCFunc(FileLine* fl, AstNode* exprsp)
: ASTGEN_SUPER_UCFunc(fl) { : ASTGEN_SUPER_UCFunc(fl) {
this->addExprsp(exprsp); addExprsp(exprsp);
} }
ASTGEN_MEMBERS_AstUCFunc; ASTGEN_MEMBERS_AstUCFunc;
bool cleanOut() const override { return false; } bool cleanOut() const override { return false; }
@ -2344,7 +2344,7 @@ public:
: ASTGEN_SUPER_With(fl) { : ASTGEN_SUPER_With(fl) {
this->indexArgRefp(indexArgRefp); this->indexArgRefp(indexArgRefp);
this->valueArgRefp(valueArgRefp); this->valueArgRefp(valueArgRefp);
this->addExprp(exprp); addExprp(exprp);
} }
ASTGEN_MEMBERS_AstWith; ASTGEN_MEMBERS_AstWith;
bool sameNode(const AstNode* /*samep*/) const override { return true; } bool sameNode(const AstNode* /*samep*/) const override { return true; }
@ -2369,7 +2369,7 @@ public:
AstWithParse(FileLine* fl, AstNodeExpr* funcrefp, AstNode* exprsp) AstWithParse(FileLine* fl, AstNodeExpr* funcrefp, AstNode* exprsp)
: ASTGEN_SUPER_WithParse(fl) { : ASTGEN_SUPER_WithParse(fl) {
this->funcrefp(funcrefp); this->funcrefp(funcrefp);
this->addExprsp(exprsp); addExprsp(exprsp);
} }
ASTGEN_MEMBERS_AstWithParse; ASTGEN_MEMBERS_AstWithParse;
bool sameNode(const AstNode* /*samep*/) const override { return true; } bool sameNode(const AstNode* /*samep*/) const override { return true; }

72
src/V3AstNodeOther.h
View File

@ -388,7 +388,7 @@ protected:
AstNodeCase(VNType t, FileLine* fl, AstNodeExpr* exprp, AstCaseItem* itemsp) AstNodeCase(VNType t, FileLine* fl, AstNodeExpr* exprp, AstCaseItem* itemsp)
: AstNodeStmt{t, fl} { : AstNodeStmt{t, fl} {
this->exprp(exprp); this->exprp(exprp);
this->addItemsp(itemsp); addItemsp(itemsp);
} }
public: public:
@ -414,7 +414,7 @@ public:
, m_type{type} , m_type{type}
, m_directive{directive} { , m_directive{directive} {
this->propp(propp); this->propp(propp);
this->addPasssp(passsp); addPasssp(passsp);
} }
ASTGEN_MEMBERS_AstNodeCoverOrAssert; ASTGEN_MEMBERS_AstNodeCoverOrAssert;
string name() const override VL_MT_STABLE { return m_name; } // * = Var name string name() const override VL_MT_STABLE { return m_name; } // * = Var name
@ -440,10 +440,10 @@ protected:
AstNodeFor(VNType t, FileLine* fl, AstNode* initsp, AstNodeExpr* condp, AstNode* incsp, AstNodeFor(VNType t, FileLine* fl, AstNode* initsp, AstNodeExpr* condp, AstNode* incsp,
AstNode* stmtsp) AstNode* stmtsp)
: AstNodeStmt{t, fl} { : AstNodeStmt{t, fl} {
this->addInitsp(initsp); addInitsp(initsp);
this->condp(condp); this->condp(condp);
this->addIncsp(incsp); addIncsp(incsp);
this->addStmtsp(stmtsp); addStmtsp(stmtsp);
} }
public: public:
@ -459,7 +459,7 @@ public:
AstNodeForeach(VNType t, FileLine* fl, AstNode* arrayp, AstNode* stmtsp) AstNodeForeach(VNType t, FileLine* fl, AstNode* arrayp, AstNode* stmtsp)
: AstNodeStmt(t, fl) { : AstNodeStmt(t, fl) {
this->arrayp(arrayp); this->arrayp(arrayp);
this->addStmtsp(stmtsp); addStmtsp(stmtsp);
} }
ASTGEN_MEMBERS_AstNodeForeach; ASTGEN_MEMBERS_AstNodeForeach;
bool isGateOptimizable() const override { return false; } bool isGateOptimizable() const override { return false; }
@ -477,8 +477,8 @@ protected:
AstNodeIf(VNType t, FileLine* fl, AstNodeExpr* condp, AstNode* thensp, AstNode* elsesp) AstNodeIf(VNType t, FileLine* fl, AstNodeExpr* condp, AstNode* thensp, AstNode* elsesp)
: AstNodeStmt{t, fl} { : AstNodeStmt{t, fl} {
this->condp(condp); this->condp(condp);
this->addThensp(thensp); addThensp(thensp);
this->addElsesp(elsesp); addElsesp(elsesp);
isBoundsCheck(false); isBoundsCheck(false);
} }
@ -598,7 +598,7 @@ public:
: ASTGEN_SUPER_Bind(fl) : ASTGEN_SUPER_Bind(fl)
, m_name{name} { , m_name{name} {
UASSERT_OBJ(VN_IS(cellsp, Cell), cellsp, "Only instances allowed to be bound"); UASSERT_OBJ(VN_IS(cellsp, Cell), cellsp, "Only instances allowed to be bound");
this->addCellsp(cellsp); addCellsp(cellsp);
} }
ASTGEN_MEMBERS_AstBind; ASTGEN_MEMBERS_AstBind;
// ACCESSORS // ACCESSORS
@ -762,7 +762,7 @@ class AstCLocalScope final : public AstNode {
public: public:
AstCLocalScope(FileLine* fl, AstNode* stmtsp) AstCLocalScope(FileLine* fl, AstNode* stmtsp)
: ASTGEN_SUPER_CLocalScope(fl) { : ASTGEN_SUPER_CLocalScope(fl) {
this->addStmtsp(stmtsp); addStmtsp(stmtsp);
} }
ASTGEN_MEMBERS_AstCLocalScope; ASTGEN_MEMBERS_AstCLocalScope;
}; };
@ -790,8 +790,8 @@ class AstCaseItem final : public AstNode {
public: public:
AstCaseItem(FileLine* fl, AstNodeExpr* condsp, AstNode* stmtsp) AstCaseItem(FileLine* fl, AstNodeExpr* condsp, AstNode* stmtsp)
: ASTGEN_SUPER_CaseItem(fl) { : ASTGEN_SUPER_CaseItem(fl) {
this->addCondsp(condsp); addCondsp(condsp);
this->addStmtsp(stmtsp); addStmtsp(stmtsp);
} }
ASTGEN_MEMBERS_AstCaseItem; ASTGEN_MEMBERS_AstCaseItem;
int instrCount() const override { return widthInstrs() + INSTR_COUNT_BRANCH; } int instrCount() const override { return widthInstrs() + INSTR_COUNT_BRANCH; }
@ -824,8 +824,8 @@ public:
, m_hasIfaceVar{false} , m_hasIfaceVar{false}
, m_recursive{false} , m_recursive{false}
, m_trace{true} { , m_trace{true} {
this->addPinsp(pinsp); addPinsp(pinsp);
this->addParamsp(paramsp); addParamsp(paramsp);
this->rangep(rangep); this->rangep(rangep);
} }
ASTGEN_MEMBERS_AstCell; ASTGEN_MEMBERS_AstCell;
@ -1037,7 +1037,7 @@ public:
AstConstraint(FileLine* fl, const string& name, AstNode* itemsp) AstConstraint(FileLine* fl, const string& name, AstNode* itemsp)
: ASTGEN_SUPER_Constraint(fl) : ASTGEN_SUPER_Constraint(fl)
, m_name(name) { , m_name(name) {
this->addItemsp(itemsp); addItemsp(itemsp);
} }
ASTGEN_MEMBERS_AstConstraint; ASTGEN_MEMBERS_AstConstraint;
void dump(std::ostream& str) const override; void dump(std::ostream& str) const override;
@ -1067,8 +1067,8 @@ class AstConstraintBefore final : public AstNode {
public: public:
AstConstraintBefore(FileLine* fl, AstNodeExpr* lhssp, AstNodeExpr* rhssp) AstConstraintBefore(FileLine* fl, AstNodeExpr* lhssp, AstNodeExpr* rhssp)
: ASTGEN_SUPER_ConstraintBefore(fl) { : ASTGEN_SUPER_ConstraintBefore(fl) {
this->addLhssp(lhssp); addLhssp(lhssp);
this->addRhssp(rhssp); addRhssp(rhssp);
} }
ASTGEN_MEMBERS_AstConstraintBefore; ASTGEN_MEMBERS_AstConstraintBefore;
bool isGateOptimizable() const override { return false; } bool isGateOptimizable() const override { return false; }
@ -1187,7 +1187,7 @@ class AstImplicit final : public AstNode {
public: public:
AstImplicit(FileLine* fl, AstNode* exprsp) AstImplicit(FileLine* fl, AstNode* exprsp)
: ASTGEN_SUPER_Implicit(fl) { : ASTGEN_SUPER_Implicit(fl) {
this->addExprsp(exprsp); addExprsp(exprsp);
} }
ASTGEN_MEMBERS_AstImplicit; ASTGEN_MEMBERS_AstImplicit;
}; };
@ -1250,7 +1250,7 @@ public:
AstModport(FileLine* fl, const string& name, AstNode* varsp) AstModport(FileLine* fl, const string& name, AstNode* varsp)
: ASTGEN_SUPER_Modport(fl) : ASTGEN_SUPER_Modport(fl)
, m_name{name} { , m_name{name} {
this->addVarsp(varsp); addVarsp(varsp);
} }
string verilogKwd() const override { return "modport"; } string verilogKwd() const override { return "modport"; }
string name() const override VL_MT_STABLE { return m_name; } string name() const override VL_MT_STABLE { return m_name; }
@ -1645,7 +1645,7 @@ class AstSenTree final : public AstNode {
public: public:
AstSenTree(FileLine* fl, AstSenItem* sensesp) AstSenTree(FileLine* fl, AstSenItem* sensesp)
: ASTGEN_SUPER_SenTree(fl) { : ASTGEN_SUPER_SenTree(fl) {
this->addSensesp(sensesp); addSensesp(sensesp);
} }
ASTGEN_MEMBERS_AstSenTree; ASTGEN_MEMBERS_AstSenTree;
void dump(std::ostream& str) const override; void dump(std::ostream& str) const override;
@ -1797,7 +1797,7 @@ class AstUdpTable final : public AstNode {
public: public:
AstUdpTable(FileLine* fl, AstUdpTableLine* linesp) AstUdpTable(FileLine* fl, AstUdpTableLine* linesp)
: ASTGEN_SUPER_UdpTable(fl) { : ASTGEN_SUPER_UdpTable(fl) {
this->addLinesp(linesp); addLinesp(linesp);
} }
ASTGEN_MEMBERS_AstUdpTable; ASTGEN_MEMBERS_AstUdpTable;
}; };
@ -2783,7 +2783,7 @@ class AstCStmt final : public AstNodeStmt {
public: public:
AstCStmt(FileLine* fl, AstNode* exprsp) AstCStmt(FileLine* fl, AstNode* exprsp)
: ASTGEN_SUPER_CStmt(fl) { : ASTGEN_SUPER_CStmt(fl) {
this->addExprsp(exprsp); addExprsp(exprsp);
} }
inline AstCStmt(FileLine* fl, const string& textStmt); inline AstCStmt(FileLine* fl, const string& textStmt);
ASTGEN_MEMBERS_AstCStmt; ASTGEN_MEMBERS_AstCStmt;
@ -2832,7 +2832,7 @@ class AstConstraintUnique final : public AstNodeStmt {
public: public:
AstConstraintUnique(FileLine* fl, AstNode* rangesp) AstConstraintUnique(FileLine* fl, AstNode* rangesp)
: ASTGEN_SUPER_ConstraintUnique(fl) { : ASTGEN_SUPER_ConstraintUnique(fl) {
this->addRangesp(rangesp); addRangesp(rangesp);
} }
ASTGEN_MEMBERS_AstConstraintUnique; ASTGEN_MEMBERS_AstConstraintUnique;
bool isGateOptimizable() const override { return false; } bool isGateOptimizable() const override { return false; }
@ -2998,14 +2998,14 @@ public:
AstNodeExpr* exprsp, char missingArgChar = 'd') AstNodeExpr* exprsp, char missingArgChar = 'd')
: ASTGEN_SUPER_Display(fl) : ASTGEN_SUPER_Display(fl)
, m_displayType{dispType} { , m_displayType{dispType} {
this->fmtp(new AstSFormatF{fl, text, true, exprsp, missingArgChar}); fmtp(new AstSFormatF{fl, text, true, exprsp, missingArgChar});
this->filep(filep); this->filep(filep);
} }
AstDisplay(FileLine* fl, VDisplayType dispType, AstNodeExpr* filep, AstNodeExpr* exprsp, AstDisplay(FileLine* fl, VDisplayType dispType, AstNodeExpr* filep, AstNodeExpr* exprsp,
char missingArgChar = 'd') char missingArgChar = 'd')
: ASTGEN_SUPER_Display(fl) : ASTGEN_SUPER_Display(fl)
, m_displayType{dispType} { , m_displayType{dispType} {
this->fmtp(new AstSFormatF{fl, AstSFormatF::NoFormat{}, exprsp, missingArgChar}); fmtp(new AstSFormatF{fl, AstSFormatF::NoFormat{}, exprsp, missingArgChar});
this->filep(filep); this->filep(filep);
} }
ASTGEN_MEMBERS_AstDisplay; ASTGEN_MEMBERS_AstDisplay;
@ -3078,7 +3078,7 @@ public:
AstEventControl(FileLine* fl, AstSenTree* sensesp, AstNode* stmtsp) AstEventControl(FileLine* fl, AstSenTree* sensesp, AstNode* stmtsp)
: ASTGEN_SUPER_EventControl(fl) { : ASTGEN_SUPER_EventControl(fl) {
this->sensesp(sensesp); this->sensesp(sensesp);
this->addStmtsp(stmtsp); addStmtsp(stmtsp);
} }
ASTGEN_MEMBERS_AstEventControl; ASTGEN_MEMBERS_AstEventControl;
string verilogKwd() const override { return "@(%l) %r"; } string verilogKwd() const override { return "@(%l) %r"; }
@ -3159,7 +3159,7 @@ public:
// After construction must call ->labelp to associate with appropriate label // After construction must call ->labelp to associate with appropriate label
AstJumpBlock(FileLine* fl, AstNode* stmtsp) AstJumpBlock(FileLine* fl, AstNode* stmtsp)
: ASTGEN_SUPER_JumpBlock(fl) { : ASTGEN_SUPER_JumpBlock(fl) {
this->addStmtsp(stmtsp); addStmtsp(stmtsp);
} }
ASTGEN_MEMBERS_AstJumpBlock; ASTGEN_MEMBERS_AstJumpBlock;
const char* broken() const override; const char* broken() const override;
@ -3291,7 +3291,7 @@ public:
AstRepeat(FileLine* fl, AstNodeExpr* countp, AstNode* stmtsp) AstRepeat(FileLine* fl, AstNodeExpr* countp, AstNode* stmtsp)
: ASTGEN_SUPER_Repeat(fl) { : ASTGEN_SUPER_Repeat(fl) {
this->countp(countp); this->countp(countp);
this->addStmtsp(stmtsp); addStmtsp(stmtsp);
} }
ASTGEN_MEMBERS_AstRepeat; ASTGEN_MEMBERS_AstRepeat;
bool isGateOptimizable() const override { return false; } // Not relevant - converted to FOR bool isGateOptimizable() const override { return false; } // Not relevant - converted to FOR
@ -3320,12 +3320,12 @@ public:
AstSFormat(FileLine* fl, AstNodeExpr* lhsp, const string& text, AstNodeExpr* exprsp, AstSFormat(FileLine* fl, AstNodeExpr* lhsp, const string& text, AstNodeExpr* exprsp,
char missingArgChar = 'd') char missingArgChar = 'd')
: ASTGEN_SUPER_SFormat(fl) { : ASTGEN_SUPER_SFormat(fl) {
this->fmtp(new AstSFormatF{fl, text, true, exprsp, missingArgChar}); fmtp(new AstSFormatF{fl, text, true, exprsp, missingArgChar});
this->lhsp(lhsp); this->lhsp(lhsp);
} }
AstSFormat(FileLine* fl, AstNodeExpr* lhsp, AstNodeExpr* exprsp, char missingArgChar = 'd') AstSFormat(FileLine* fl, AstNodeExpr* lhsp, AstNodeExpr* exprsp, char missingArgChar = 'd')
: ASTGEN_SUPER_SFormat(fl) { : ASTGEN_SUPER_SFormat(fl) {
this->fmtp(new AstSFormatF{fl, AstSFormatF::NoFormat{}, exprsp, missingArgChar}); fmtp(new AstSFormatF{fl, AstSFormatF::NoFormat{}, exprsp, missingArgChar});
this->lhsp(lhsp); this->lhsp(lhsp);
} }
ASTGEN_MEMBERS_AstSFormat; ASTGEN_MEMBERS_AstSFormat;
@ -3555,7 +3555,7 @@ class AstUCStmt final : public AstNodeStmt {
public: public:
AstUCStmt(FileLine* fl, AstNode* exprsp) AstUCStmt(FileLine* fl, AstNode* exprsp)
: ASTGEN_SUPER_UCStmt(fl) { : ASTGEN_SUPER_UCStmt(fl) {
this->addExprsp(exprsp); addExprsp(exprsp);
} }
ASTGEN_MEMBERS_AstUCStmt; ASTGEN_MEMBERS_AstUCStmt;
bool isGateOptimizable() const override { return false; } bool isGateOptimizable() const override { return false; }
@ -3571,7 +3571,7 @@ public:
AstWait(FileLine* fl, AstNodeExpr* condp, AstNode* stmtsp) AstWait(FileLine* fl, AstNodeExpr* condp, AstNode* stmtsp)
: ASTGEN_SUPER_Wait(fl) { : ASTGEN_SUPER_Wait(fl) {
this->condp(condp); this->condp(condp);
this->addStmtsp(stmtsp); addStmtsp(stmtsp);
} }
ASTGEN_MEMBERS_AstWait; ASTGEN_MEMBERS_AstWait;
bool isFirstInMyListOfStatements(AstNode* n) const override { return n == stmtsp(); } bool isFirstInMyListOfStatements(AstNode* n) const override { return n == stmtsp(); }
@ -3595,8 +3595,8 @@ public:
AstWhile(FileLine* fl, AstNodeExpr* condp, AstNode* stmtsp = nullptr, AstNode* incsp = nullptr) AstWhile(FileLine* fl, AstNodeExpr* condp, AstNode* stmtsp = nullptr, AstNode* incsp = nullptr)
: ASTGEN_SUPER_While(fl) { : ASTGEN_SUPER_While(fl) {
this->condp(condp); this->condp(condp);
this->addStmtsp(stmtsp); addStmtsp(stmtsp);
this->addIncsp(incsp); addIncsp(incsp);
} }
ASTGEN_MEMBERS_AstWhile; ASTGEN_MEMBERS_AstWhile;
void dump(std::ostream& str) const override; void dump(std::ostream& str) const override;
@ -3771,7 +3771,7 @@ public:
AstAssert(FileLine* fl, AstNode* propp, AstNode* passsp, AstNode* failsp, VAssertType type, AstAssert(FileLine* fl, AstNode* propp, AstNode* passsp, AstNode* failsp, VAssertType type,
VAssertDirectiveType directive, const string& name = "") VAssertDirectiveType directive, const string& name = "")
: ASTGEN_SUPER_Assert(fl, propp, passsp, type, directive, name) { : ASTGEN_SUPER_Assert(fl, propp, passsp, type, directive, name) {
this->addFailsp(failsp); addFailsp(failsp);
} }
}; };
class AstAssertIntrinsic final : public AstNodeCoverOrAssert { class AstAssertIntrinsic final : public AstNodeCoverOrAssert {
@ -3784,7 +3784,7 @@ public:
// Intrinsic asserts are always enabled thus 'type' field is set to INTERNAL. // Intrinsic asserts are always enabled thus 'type' field is set to INTERNAL.
: ASTGEN_SUPER_AssertIntrinsic(fl, propp, passsp, VAssertType::INTERNAL, : ASTGEN_SUPER_AssertIntrinsic(fl, propp, passsp, VAssertType::INTERNAL,
VAssertDirectiveType::INTRINSIC, name) { VAssertDirectiveType::INTRINSIC, name) {
this->addFailsp(failsp); addFailsp(failsp);
} }
}; };
class AstCover final : public AstNodeCoverOrAssert { class AstCover final : public AstNodeCoverOrAssert {