Commentary

src/V3Ast.cpp

@@ -372,8 +372,8 @@ AstNode* AstNode::addNext<AstNode, AstNode>(AstNode* nodep, AstNode* newp) {
 
 void AstNode::addNextHere(AstNode* newp) {
     // Add to m_nextp on exact node passed, not at the end.
-    //  This could be at head, tail, or both (single)
-    //  New  could be head of single node, or list
+    //  'this' could be at head, tail, or both (single)
+    //  'newp' could be head of single node, or list
     UASSERT(newp, "Null item passed to addNext");
     UASSERT_OBJ(!newp->backp(), newp, "New node (back) already assigned?");
     debugTreeChange(this, "-addHereThs: ", __LINE__, false);

src/V3Config.cpp

@@ -590,8 +590,8 @@ void V3Config::addVarAttr(FileLine* fl, const string& module, const string& ftas
     }
 }
 
-void V3Config::addWaiver(V3ErrorCode code, const string& filename, const string& message) {
-    V3ConfigResolver::s().files().at(filename).addWaiver(code, message);
+void V3Config::addWaiver(V3ErrorCode code, const string& filename, const string& match) {
+    V3ConfigResolver::s().files().at(filename).addWaiver(code, match);
 }
 
 void V3Config::applyCase(AstCase* nodep) {

src/V3Config.h

@@ -41,7 +41,7 @@ public:
     static void addScopeTraceOn(bool on, const string& scope, int levels);
     static void addVarAttr(FileLine* fl, const string& module, const string& ftask,
                            const string& signal, VAttrType type, AstSenTree* nodep);
-    static void addWaiver(V3ErrorCode code, const string& filename, const string& message);
+    static void addWaiver(V3ErrorCode code, const string& filename, const string& match);
 
     static void applyCase(AstCase* nodep);
     static void applyCoverageBlock(AstNodeModule* modulep, AstBegin* nodep);

src/V3FileLine.h

@@ -121,7 +121,7 @@ std::ostream& operator<<(std::ostream& os, VFileContent* contentp);
 
 // File and line number of an object, mostly for error reporting
 
-// This class is instantiated for every source code line (potentially millions), and  instances
+// This class is instantiated for every source code line (potentially millions), and instances
 // created at any point usually persist until the end of the program. To save space, per-file
 // information (e.g. filename, source language) is held in tables in the FileLineSingleton class.
 // Similarly, message enablement flags are interned in FileLineSingleton.