Fix whitespace issues, bug1203.

src/V3Active.cpp

@@ -176,7 +176,7 @@ private:
 	    if (m_check == CT_INITIAL) {
 		nodep->v3warn(INITIALDLY,"Delayed assignments (<=) in initial or final block; suggest blocking assignments (=).");
 	    } else if (m_check == CT_LATCH) {
-		// Suppress. Shouldn't matter that the interior of the latch races 
+		// Suppress. Shouldn't matter that the interior of the latch races
 	    } else {
 		nodep->v3warn(COMBDLY,"Delayed assignments (<=) in non-clocked (non flop or latch) block; suggest blocking assignments (=).");
 	    }

src/V3Assert.cpp

@@ -162,7 +162,7 @@ private:
 	// Bye
 	pushDeletep(nodep); VL_DANGLING(nodep);
     }
-    
+
     virtual void visit(AstIf* nodep) {
 	if (nodep->user1SetOnce()) return;
 	if (nodep->uniquePragma() || nodep->unique0Pragma()) {
@@ -177,12 +177,12 @@ private:
 
 		// Recurse into the true case.
 		ifp->ifsp()->iterateAndNext(*this);
-		
+
 		// If the last else is not an else if, recurse into that too.
 		if (ifp->elsesp() && !nextifp) {
 		    ifp->elsesp()->iterateAndNext(*this);
 		}
-		
+
 		// Build a bitmask of the true predicates
 	        AstNode* predp = ifp->condp()->cloneTree(false);
 	        if (propp) {
@@ -195,13 +195,13 @@ private:
 		if (ifp->elsesp() && !nextifp) {
 		    hasDefaultElse = true;
 		}
-		
+
 		ifp = nextifp;
 	    } while (ifp);
 
 	    AstNode *newifp = nodep->cloneTree(false);
 	    bool allow_none = nodep->unique0Pragma();
-	    
+
 	    // Note: if this ends with an 'else', then we don't need to validate that one of the
 	    // predicates evaluates to true.
 	    AstNode* ohot = ((allow_none || hasDefaultElse)

src/V3AstNodes.h

@@ -254,7 +254,7 @@ public:
 	m_uniqueNum = uniqueNumInc();
     }
     ASTNODE_NODE_FUNCS(DefImplicitDType)
-    virtual bool same(AstNode* samep) const { return m_uniqueNum==samep->castDefImplicitDType()->m_uniqueNum; } 
+    virtual bool same(AstNode* samep) const { return m_uniqueNum==samep->castDefImplicitDType()->m_uniqueNum; }
     virtual bool similarDType(AstNodeDType* samep) const {
 	return type()==samep->type() && same(samep); }
     virtual V3Hash sameHash() const { return V3Hash(m_uniqueNum); }

src/V3Changed.cpp

@@ -111,8 +111,8 @@ private:
     AstVarScope*	m_vscp;		// Original (non-change) variable we're change-detecting
     AstVarScope*	m_newvscp;	// New (change detect) variable we're change-detecting
     AstNode*		m_varEqnp;	// Original var's equation to get var value
-    AstNode*		m_newLvEqnp;	// New var's equation to read value 
-    AstNode*		m_newRvEqnp;	// New var's equation to set value 
+    AstNode*		m_newLvEqnp;	// New var's equation to read value
+    AstNode*		m_newRvEqnp;	// New var's equation to set value
     uint32_t		m_detects;	// # detects created
 
     // CONSTANTS
@@ -278,7 +278,7 @@ private:
 	}
     }
     virtual void visit(AstNodeMath* nodep) {
-	// Short-circuit 
+	// Short-circuit
     }
     //--------------------
     // Default: Just iterate

src/V3EmitC.cpp

@@ -603,7 +603,7 @@ public:
 	puts(nodep->hiername());
 	puts(nodep->varp()->name());
     }
-    void emitCvtPackStr(AstNode* nodep) { 
+    void emitCvtPackStr(AstNode* nodep) {
 	if (AstConst* constp = nodep->castConst()) {
 	    putbs("string(");
 	    putsQuoted(constp->num().toString());

src/V3Gate.cpp

@@ -1133,7 +1133,7 @@ void GateVisitor::dedupe() {
 
 
 //######################################################################
-// Recurse through the graph, try to merge assigns 
+// Recurse through the graph, try to merge assigns
 
 class GateMergeAssignsGraphVisitor : public GateGraphBaseVisitor {
 private:
@@ -1145,7 +1145,7 @@ private:
     V3Double0        m_numMergedAssigns;	// Statistic tracking
 
 
-    // assemble two Sel into one if possible 
+    // assemble two Sel into one if possible
     AstSel* merge(AstSel* pre, AstSel* cur) {
 	AstVarRef* preVarRefp = pre->fromp()->castVarRef();
 	AstVarRef* curVarRefp = cur->fromp()->castVarRef();
@@ -1201,7 +1201,7 @@ private:
 			    // update the graph
 			    {
 				// delete all inedges to lvertexp
-				if (!lvertexp->inEmpty()) { 
+				if (!lvertexp->inEmpty()) {
 				    for (V3GraphEdge* ledgep = lvertexp->inBeginp(); ledgep; ) {
 					V3GraphEdge* oedgep = ledgep;
 					ledgep = ledgep->inNextp();

src/V3Number.cpp

@@ -446,7 +446,7 @@ bool V3Number::displayedFmtLegal(char format) {
     case 's': return true;
     case 't': return true;
     case 'u': return true; // Packed 2-state
-    case 'v': return true; // Strength 
+    case 'v': return true; // Strength
     case 'x': return true;
     case 'z': return true; // Packed 4-state
     case '@': return true; // Packed string

src/V3Options.h

@@ -145,7 +145,7 @@ class V3Options {
     bool	m_oCombine;	// main switch: -Ob: common icode packing
     bool	m_oConst;	// main switch: -Oc: constant folding
     bool	m_oDedupe;	// main switch: -Od: logic deduplication
-    bool	m_oAssemble;	// main switch: -Om: assign assemble 
+    bool	m_oAssemble;	// main switch: -Om: assign assemble
     bool	m_oExpand;	// main switch: -Ox: expansion of C macros
     bool	m_oFlopGater;	// main switch: -Of: flop gater detection
     bool	m_oGate;	// main switch: -Og: gate wire elimination

src/V3Order.cpp

@@ -242,7 +242,7 @@ struct OrderVarFanoutCmp {
 };
 
 //######################################################################
-// The class is used for propagating the clocker attribute for further 
+// The class is used for propagating the clocker attribute for further
 // avoiding marking clock signals as circular.
 // Transformation:
 //    while (newClockerMarked)
@@ -251,7 +251,7 @@ struct OrderVarFanoutCmp {
 //                mark LHS as clocker as well.
 //                newClockerMarked = true;
 //
-// In addition it also check whether clock and data signals are mixed, and 
+// In addition it also check whether clock and data signals are mixed, and
 // produce a CLKDATA warning if so.
 //
 class OrderClkMarkVisitor : public AstNVisitor {

src/V3Os.cpp

@@ -68,7 +68,7 @@ void V3Os::setenvStr(const string& envvar, const string& value, const string& wh
 }
 
 //######################################################################
-// Generic filename utilities 
+// Generic filename utilities
 
 string V3Os::filenameFromDirBase (const string& dir, const string& basename) {
     // Don't return ./{filename} because if filename was absolute, that makes it relative

src/V3PreProc.cpp

@@ -323,8 +323,10 @@ void V3PreProcImp::define(FileLine* fl, const string& name, const string& value,
     UINFO(4,"DEFINE '"<<name<<"' as '"<<value<<"' params '"<<params<<"'"<<endl);
     if (defExists(name)) {
 	if (!(defValue(name)==value && defParams(name)==params)) {  // Duplicate defs are OK
-	    fl->v3warn(REDEFMACRO,"Redefining existing define: "<<name<<", with different value: "<<value<<" "<<params);
-	    defFileline(name)->v3warn(REDEFMACRO,"Previous definition is here, with value: "<<defValue(name)<<" "<<defParams(name));
+	    fl->v3warn(REDEFMACRO,"Redefining existing define: "<<name<<", with different value: "
+		       <<value<<(params=="" ? "":" ")<<params);
+	    defFileline(name)->v3warn(REDEFMACRO,"Previous definition is here, with value: "
+				      <<defValue(name)<<(defParams(name)=="" ? "":" ")<<defParams(name));
 	}
 	undef(name);
     }

src/V3Scope.cpp

@@ -60,7 +60,7 @@ private:
     // STATE, for passing down one level of hierarchy (may need save/restore)
     AstCell*	m_aboveCellp;	// Cell that instantiates this module
     AstScope*	m_aboveScopep;	// Scope that instantiates this scope
-    
+
     PackageScopeMap	m_packageScopes;	// Scopes for each package
     VarScopeMap		m_varScopes;		// Varscopes created for each scope and var
     VarRefScopeSet	m_varRefScopes;		// Varrefs-in-scopes needing fixup when donw
@@ -265,7 +265,7 @@ private:
 	    // the var's referenced package etc might not be created yet.
 	    // So push to a list and post-correct
 	    m_varRefScopes.insert(make_pair(nodep, m_scopep));
-	} 
+	}
    }
     virtual void visit(AstScopeName* nodep) {
 	// If there's a %m in the display text, we add a special node that will contain the name()

src/V3Width.cpp

@@ -2181,7 +2181,7 @@ private:
 		// TODO Simple dtype checking, should be a more general check
 		AstNodeArrayDType* exprArrayp = exprDTypep->skipRefp()->castUnpackArrayDType();
 		AstNodeArrayDType* modArrayp = modDTypep->skipRefp()->castUnpackArrayDType();
-		if (exprArrayp && modArrayp && exprArrayp->subDTypep()->skipRefp()->castIfaceRefDType() 
+		if (exprArrayp && modArrayp && exprArrayp->subDTypep()->skipRefp()->castIfaceRefDType()
 		    && exprArrayp->declRange().elements() != modArrayp->declRange().elements()) {
 		    int exprSize = exprArrayp->declRange().elements();
 		    int modSize = modArrayp->declRange().elements();
@@ -3555,7 +3555,7 @@ private:
 	}
 	return patmap;
     }
-    
+
 
     //----------------------------------------------------------------------
     // METHODS - special type detection
@@ -3599,7 +3599,7 @@ private:
 	}
 	m_vup = saveVup;
     }
-    void userIterateAndNext(AstNode* nodep, WidthVP* vup) {	
+    void userIterateAndNext(AstNode* nodep, WidthVP* vup) {
 	if (!nodep) return;
 	WidthVP* saveVup = m_vup;
 	{

src/VlcMain.cpp

@@ -179,7 +179,7 @@ int main(int argc, char** argv, char** env) {
 	    }
         }
     }
-    
+
     // Final writing shouldn't throw warnings, but...
     V3Error::abortIfWarnings();
 

src/VlcOptions.h

@@ -74,7 +74,7 @@ public:
     bool rank() const { return m_rank; }
     bool unlink() const { return m_unlink; }
     string writeFile() const { return m_writeFile; }
-    
+
     // METHODS (from main)
     static string version();
 };

src/VlcTop.cpp

@@ -208,7 +208,7 @@ void VlcTop::annotateOutputFiles(const string& dirname) {
 	    v3error("Can't read "<<filename);
 	    return;
 	}
-	
+
 	ofstream os (outfilename.c_str());
 	if (!os) {
 	    v3fatal("Can't write "<<outfilename);

src/verilog.y

@@ -127,7 +127,7 @@ public:
 	    pkgp = PARSEP->rootp()->dollarUnitPkgAddp();
 	    SYMP->reinsert(pkgp, SYMP->symRootp());  // Don't push/pop scope as they're global
 	} else {
-	    pkgp = symp->nodep()->castPackage(); 
+	    pkgp = symp->nodep()->castPackage();
 	}
 	return pkgp;
     }