From 8943ad5966f49fe7373f3b9c5c72704e13e71979 Mon Sep 17 00:00:00 2001 From: Wilson Snyder Date: Fri, 28 Apr 2017 20:09:27 -0400 Subject: [PATCH] internals: Remove extra newlines on v3fatalSrc. No functional change. --- src/V3ActiveTop.cpp | 2 +- src/V3Broken.cpp | 10 +++++----- src/V3Case.cpp | 2 +- src/V3Cdc.cpp | 4 ++-- src/V3Changed.cpp | 2 +- src/V3ClkGater.cpp | 2 +- src/V3Clock.cpp | 2 +- src/V3Combine.cpp | 2 +- src/V3Const.cpp | 2 +- src/V3Delayed.cpp | 8 ++++---- src/V3EmitC.cpp | 2 +- src/V3FileLine.cpp | 2 +- src/V3Gate.cpp | 8 ++++---- src/V3GraphAlg.cpp | 2 +- src/V3GraphDfa.cpp | 4 ++-- src/V3Inline.cpp | 6 +++--- src/V3LinkDot.cpp | 10 +++++----- src/V3LinkResolve.cpp | 4 ++-- src/V3Number_test.cpp | 2 +- src/V3Options.cpp | 2 +- src/V3Order.cpp | 10 +++++----- src/V3Param.cpp | 2 +- src/V3Split.cpp | 8 ++++---- src/V3Task.cpp | 4 ++-- src/V3Unknown.cpp | 2 +- src/VlcMain.cpp | 2 +- 26 files changed, 53 insertions(+), 53 deletions(-) diff --git a/src/V3ActiveTop.cpp b/src/V3ActiveTop.cpp index 3d6c3935c..d19af0d26 100644 --- a/src/V3ActiveTop.cpp +++ b/src/V3ActiveTop.cpp @@ -108,7 +108,7 @@ private: // Move the active's contents to the other active UINFO(4," merge active "<sensesStorep()) { - if (sensesp != nodep->sensesStorep()) nodep->v3fatalSrc("sensesStore should have been deleted earlier if different\n"); + if (sensesp != nodep->sensesStorep()) nodep->v3fatalSrc("sensesStore should have been deleted earlier if different"); sensesp->unlinkFrBack(); // There may be other references to same sense tree, // we'll be removing all references when we get to them, diff --git a/src/V3Broken.cpp b/src/V3Broken.cpp index 979ccbcea..c490b6f08 100644 --- a/src/V3Broken.cpp +++ b/src/V3Broken.cpp @@ -62,7 +62,7 @@ public: if (debug()>=9) cout<<"-nodeDel: "<<(void*)(nodep)<second & FLAG_ALLOCATED)) { - ((AstNode*)(nodep))->v3fatalSrc("Deleting AstNode object that was never tracked or already deleted\n"); + ((AstNode*)(nodep))->v3fatalSrc("Deleting AstNode object that was never tracked or already deleted"); } if (iter!=s_nodes.end()) s_nodes.erase(iter); } @@ -71,7 +71,7 @@ public: if (debug()>=9) cout<<"-nodeNew: "<<(void*)(nodep)<second & FLAG_ALLOCATED)) { - ((AstNode*)(nodep))->v3fatalSrc("Newing AstNode object that is already allocated\n"); + ((AstNode*)(nodep))->v3fatalSrc("Newing AstNode object that is already allocated"); } if (iter == s_nodes.end()) { int flags = FLAG_ALLOCATED; // This int needed to appease GCC 4.1.2 @@ -94,16 +94,16 @@ public: NodeMap::iterator iter = s_nodes.find(nodep); if (iter == s_nodes.end()) { #ifdef VL_LEAK_CHECKS - nodep->v3fatalSrc("AstNode is in tree, but not allocated\n"); + nodep->v3fatalSrc("AstNode is in tree, but not allocated"); #endif } else { if (!(iter->second & FLAG_ALLOCATED)) { #ifdef VL_LEAK_CHECKS - nodep->v3fatalSrc("AstNode is in tree, but not allocated\n"); + nodep->v3fatalSrc("AstNode is in tree, but not allocated"); #endif } if (iter->second & FLAG_IN_TREE) { - nodep->v3fatalSrc("AstNode is already in tree at another location\n"); + nodep->v3fatalSrc("AstNode is already in tree at another location"); } } int or_flags = FLAG_IN_TREE | (linkable?FLAG_LINKABLE:0); diff --git a/src/V3Case.cpp b/src/V3Case.cpp index cfc1efa57..c8b29f918 100644 --- a/src/V3Case.cpp +++ b/src/V3Case.cpp @@ -174,7 +174,7 @@ private: for (AstNode* icondp = itemp->condsp(); icondp!=NULL; icondp=icondp->nextp()) { //if (debug()>=9) icondp->dumpTree(cout," caseitem: "); AstConst* iconstp = icondp->castConst(); - if (!iconstp) nodep->v3fatalSrc("above 'can't parse' should have caught this\n"); + if (!iconstp) nodep->v3fatalSrc("above 'can't parse' should have caught this"); if (neverItem(nodep, iconstp)) { // X in casez can't ever be executed } else { diff --git a/src/V3Cdc.cpp b/src/V3Cdc.cpp index ea9abf246..27af06266 100644 --- a/src/V3Cdc.cpp +++ b/src/V3Cdc.cpp @@ -629,9 +629,9 @@ private: } virtual void visit(AstNodeVarRef* nodep) { if (m_scopep) { - if (!m_logicVertexp) nodep->v3fatalSrc("Var ref not under a logic block\n"); + if (!m_logicVertexp) nodep->v3fatalSrc("Var ref not under a logic block"); AstVarScope* varscp = nodep->varScopep(); - if (!varscp) nodep->v3fatalSrc("Var didn't get varscoped in V3Scope.cpp\n"); + if (!varscp) nodep->v3fatalSrc("Var didn't get varscoped in V3Scope.cpp"); CdcVarVertex* varvertexp = makeVarVertex(varscp); UINFO(5," VARREF to "<scopep(); - if (!scopep) nodep->v3fatalSrc("No scope found on top level, perhaps you have no statements?\n"); + if (!scopep) nodep->v3fatalSrc("No scope found on top level, perhaps you have no statements?"); m_statep->m_scopetopp = scopep; // Create a wrapper change detection function that calls each change detection function diff --git a/src/V3ClkGater.cpp b/src/V3ClkGater.cpp index 292a6c0f7..5bf3bcbc7 100644 --- a/src/V3ClkGater.cpp +++ b/src/V3ClkGater.cpp @@ -559,7 +559,7 @@ class GaterVisitor : public GaterBaseVisitor { if (!vVxp->inBeginp()) { // At this point, any variable not linked is an error // (It should have at least landed under the Head node) - vVxp->nodep()->v3fatalSrc("Variable became stranded in clk gate detection\n"); + vVxp->nodep()->v3fatalSrc("Variable became stranded in clk gate detection"); } if (!lastVxp || vVxp->sortCmp(lastVxp)) { // Different sources for this new node diff --git a/src/V3Clock.cpp b/src/V3Clock.cpp index b34486534..4197deacc 100644 --- a/src/V3Clock.cpp +++ b/src/V3Clock.cpp @@ -192,7 +192,7 @@ private: UINFO(4," TOPSCOPE "<scopep(); - if (!m_scopep) nodep->v3fatalSrc("No scope found on top level, perhaps you have no statements?\n"); + if (!m_scopep) nodep->v3fatalSrc("No scope found on top level, perhaps you have no statements?"); //VV***** We reset all user1p() AstNode::user1ClearTree(); // Make top functions diff --git a/src/V3Combine.cpp b/src/V3Combine.cpp index 79ef472bd..974b12091 100644 --- a/src/V3Combine.cpp +++ b/src/V3Combine.cpp @@ -239,7 +239,7 @@ private: V3Hash hashval = it->first; AstNode* node1p = it->second; if (!node1p->castCFunc()) continue; - if (hashval.isIllegal()) node1p->v3fatalSrc("Illegal (unhashed) nodes\n"); + if (hashval.isIllegal()) node1p->v3fatalSrc("Illegal (unhashed) nodes"); for (V3Hashed::iterator eqit = it; eqit != m_hashed.end(); ++eqit) { AstNode* node2p = eqit->second; if (!(eqit->first == hashval)) break; diff --git a/src/V3Const.cpp b/src/V3Const.cpp index f036d69d2..fc704bc64 100644 --- a/src/V3Const.cpp +++ b/src/V3Const.cpp @@ -555,7 +555,7 @@ private: // Replace oldp node with a constant set to specified value UASSERT (oldp, "Null old\n"); if (oldp->castConst() && !oldp->castConst()->num().isFourState()) { - oldp->v3fatalSrc("Already constant??\n"); + oldp->v3fatalSrc("Already constant??"); } AstNode* newp = new AstConst(oldp->fileline(), num); newp->dtypeFrom(oldp); diff --git a/src/V3Delayed.cpp b/src/V3Delayed.cpp index df4e15ba7..937e70d74 100644 --- a/src/V3Delayed.cpp +++ b/src/V3Delayed.cpp @@ -207,8 +207,8 @@ private: dimvalp.push_front(valp); } AstVarRef* varrefp = dimselp->castVarRef(); - if (!varrefp) nodep->v3fatalSrc("No var underneath arraysels\n"); - if (!varrefp->varScopep()) varrefp->v3fatalSrc("Var didn't get varscoped in V3Scope.cpp\n"); + if (!varrefp) nodep->v3fatalSrc("No var underneath arraysels"); + if (!varrefp->varScopep()) varrefp->v3fatalSrc("Var didn't get varscoped in V3Scope.cpp"); varrefp->unlinkFrBack(); AstVar* oldvarp = varrefp->varp(); int modVecNum = oldvarp->user4(); oldvarp->user4(modVecNum+1); @@ -393,7 +393,7 @@ private: if (!m_activep) nodep->v3fatalSrc("<= not under sensitivity block"); if (!m_activep->hasClocked()) nodep->v3error("Internal: Blocking <= assignment in non-clocked block, should have converted in V3Active"); AstVarScope* oldvscp = nodep->varScopep(); - if (!oldvscp) nodep->v3fatalSrc("Var didn't get varscoped in V3Scope.cpp\n"); + if (!oldvscp) nodep->v3fatalSrc("Var didn't get varscoped in V3Scope.cpp"); AstVarScope* dlyvscp = oldvscp->user1p()->castVarScope(); if (dlyvscp) { // Multiple use of delayed variable AstActive* oldactivep = dlyvscp->user2p()->castActive(); @@ -433,7 +433,7 @@ private: } virtual void visit(AstNodeFor* nodep) { - nodep->v3fatalSrc("For statements should have been converted to while statements in V3Begin\n"); + nodep->v3fatalSrc("For statements should have been converted to while statements in V3Begin"); } virtual void visit(AstWhile* nodep) { bool oldloop = m_inLoop; diff --git a/src/V3EmitC.cpp b/src/V3EmitC.cpp index fb5aade6b..a72c629be 100644 --- a/src/V3EmitC.cpp +++ b/src/V3EmitC.cpp @@ -217,7 +217,7 @@ public: } virtual void visit(AstNodeCase* nodep) { // In V3Case... - nodep->v3fatalSrc("Case statements should have been reduced out\n"); + nodep->v3fatalSrc("Case statements should have been reduced out"); } virtual void visit(AstComment* nodep) { putsDecoration((string)"// "+nodep->name()+" at "+nodep->fileline()->ascii()+"\n"); diff --git a/src/V3FileLine.cpp b/src/V3FileLine.cpp index b12874298..8d76620d5 100644 --- a/src/V3FileLine.cpp +++ b/src/V3FileLine.cpp @@ -270,7 +270,7 @@ void FileLine::operator delete(void* objp, size_t size) { if (it != fileLineLeakChecks.end()) { fileLineLeakChecks.erase(it); } else { - flp->v3fatalSrc("Deleting FileLine object that was never tracked\n"); + flp->v3fatalSrc("Deleting FileLine object that was never tracked"); } ::operator delete(objp); } diff --git a/src/V3Gate.cpp b/src/V3Gate.cpp index 76f3365f6..124cdb5b5 100644 --- a/src/V3Gate.cpp +++ b/src/V3Gate.cpp @@ -409,9 +409,9 @@ private: } virtual void visit(AstNodeVarRef* nodep) { if (m_scopep) { - if (!m_logicVertexp) nodep->v3fatalSrc("Var ref not under a logic block\n"); + if (!m_logicVertexp) nodep->v3fatalSrc("Var ref not under a logic block"); AstVarScope* varscp = nodep->varScopep(); - if (!varscp) nodep->v3fatalSrc("Var didn't get varscoped in V3Scope.cpp\n"); + if (!varscp) nodep->v3fatalSrc("Var didn't get varscoped in V3Scope.cpp"); GateVarVertex* vvertexp = makeVarVertex(varscp); UINFO(5," VARREF to "<setIsClock(); @@ -484,7 +484,7 @@ private: } virtual void visit(AstConcat* nodep) { if (nodep->backp()->castNodeAssign() && nodep->backp()->castNodeAssign()->lhsp()==nodep) { - nodep->v3fatalSrc("Concat on LHS of assignment; V3Const should have deleted it\n"); + nodep->v3fatalSrc("Concat on LHS of assignment; V3Const should have deleted it"); } nodep->iterateChildren(*this); } @@ -704,7 +704,7 @@ void GateVisitor::replaceAssigns() { if (!vscp->valuep()->castNodeMath() || vscp->valuep()->nextp()) { vscp->dumpTree(cerr, "vscStrange: "); - vscp->v3fatalSrc("Value of varscope not mathematical\n"); + vscp->v3fatalSrc("Value of varscope not mathematical"); } } } diff --git a/src/V3GraphAlg.cpp b/src/V3GraphAlg.cpp index 741cb5566..6bf2be5cd 100644 --- a/src/V3GraphAlg.cpp +++ b/src/V3GraphAlg.cpp @@ -529,7 +529,7 @@ double V3Graph::orderDFSIterate(V3GraphVertex* vertexp) { // Compute fanouts of each node // If forward edge, don't double count that fanout if (vertexp->user() == 2) return vertexp->fanout(); // Already processed it - if (vertexp->user() == 1) v3fatalSrc("Loop found, backward edges should be dead\n"); + if (vertexp->user() == 1) v3fatalSrc("Loop found, backward edges should be dead"); vertexp->user(1); double fanout = 0; for (V3GraphEdge* edgep = vertexp->outBeginp(); edgep; edgep = edgep->outNextp()) { diff --git a/src/V3GraphDfa.cpp b/src/V3GraphDfa.cpp index d8b4cae1a..cd46ac106 100644 --- a/src/V3GraphDfa.cpp +++ b/src/V3GraphDfa.cpp @@ -44,7 +44,7 @@ DfaVertex* DfaGraph::findStart() { startp = vvertexp; } } else { - v3fatalSrc("Non DfaVertex in DfaGraph\n"); + v3fatalSrc("Non DfaVertex in DfaGraph"); } } if (!startp) v3fatalSrc("No start point in NFA graph"); @@ -520,7 +520,7 @@ private: } } } - if (!acceptp) v3fatalSrc("No accepting vertex in DFA\n"); + if (!acceptp) v3fatalSrc("No accepting vertex in DFA"); // Remap edges for (V3GraphVertex* vertexp = m_graphp->verticesBeginp(); vertexp; vertexp=vertexp->verticesNextp()) { diff --git a/src/V3Inline.cpp b/src/V3Inline.cpp index 0c1a11ef1..db08a3807 100644 --- a/src/V3Inline.cpp +++ b/src/V3Inline.cpp @@ -277,7 +277,7 @@ private: AstVarRef* exprvarrefp = nodep->user2p()->castVarRef(); UINFO(8,"connectto: "<user2p()<v3fatalSrc("Unknown interconnect type; pinReconnectSimple should have cleared up\n"); + nodep->v3fatalSrc("Unknown interconnect type; pinReconnectSimple should have cleared up"); } if (exprconstp) { m_modp->addStmtp(new AstAssignW(nodep->fileline(), @@ -362,7 +362,7 @@ private: nodep->varp( exprvarrefp->varp() ); } else { - nodep->v3fatalSrc("Null connection?\n"); + nodep->v3fatalSrc("Null connection?"); } } nodep->name(nodep->varp()->name()); @@ -514,7 +514,7 @@ private: AstNode* connectRefp = pinp->exprp(); if (!connectRefp->castConst() && !connectRefp->castVarRef()) { - pinp->v3fatalSrc("Unknown interconnect type; pinReconnectSimple should have cleared up\n"); + pinp->v3fatalSrc("Unknown interconnect type; pinReconnectSimple should have cleared up"); } if (pinNewVarp->isOutOnly() && connectRefp->castConst()) { pinp->v3error("Output port is connected to a constant pin, electrical short"); diff --git a/src/V3LinkDot.cpp b/src/V3LinkDot.cpp index 6547bcdbd..1e3edf65b 100644 --- a/src/V3LinkDot.cpp +++ b/src/V3LinkDot.cpp @@ -839,7 +839,7 @@ class LinkDotFindVisitor : public AstNVisitor { virtual void visit(AstNodeFTask* nodep) { // NodeTask: Remember its name for later resolution UINFO(5," "<v3fatalSrc("Function/Task not under module??\n"); + if (!m_curSymp || !m_modSymp) nodep->v3fatalSrc("Function/Task not under module?"); // Remember the existing symbol table scope VSymEnt* oldCurSymp = m_curSymp; { @@ -873,7 +873,7 @@ class LinkDotFindVisitor : public AstNVisitor { } virtual void visit(AstVar* nodep) { // Var: Remember its name for later resolution - if (!m_curSymp || !m_modSymp) nodep->v3fatalSrc("Var not under module??\n"); + if (!m_curSymp || !m_modSymp) nodep->v3fatalSrc("Var not under module?"); nodep->iterateChildren(*this); if (!m_statep->forScopeCreation()) { // Find under either a task or the module's vars @@ -957,12 +957,12 @@ class LinkDotFindVisitor : public AstNVisitor { } virtual void visit(AstTypedef* nodep) { // Remember its name for later resolution - if (!m_curSymp) nodep->v3fatalSrc("Typedef not under module??\n"); + if (!m_curSymp) nodep->v3fatalSrc("Typedef not under module?"); nodep->iterateChildren(*this); m_statep->insertSym(m_curSymp, nodep->name(), nodep, m_packagep); } virtual void visit(AstParamTypeDType* nodep) { - if (!m_curSymp) nodep->v3fatalSrc("Parameter type not under module??\n"); + if (!m_curSymp) nodep->v3fatalSrc("Parameter type not under module?"); nodep->iterateChildren(*this); m_statep->insertSym(m_curSymp, nodep->name(), nodep, m_packagep); } @@ -1593,7 +1593,7 @@ private: checkNoDot(nodep); nodep->iterateChildren(*this); if (!nodep->modVarp()) { - if (!m_pinSymp) nodep->v3fatalSrc("Pin not under cell?\n"); + if (!m_pinSymp) nodep->v3fatalSrc("Pin not under cell?"); VSymEnt* foundp = m_pinSymp->findIdFlat(nodep->name()); const char* whatp = nodep->param() ? "parameter pin" : "pin"; if (!foundp) { diff --git a/src/V3LinkResolve.cpp b/src/V3LinkResolve.cpp index 8026d7587..45587155d 100644 --- a/src/V3LinkResolve.cpp +++ b/src/V3LinkResolve.cpp @@ -236,12 +236,12 @@ private: virtual void visit(AstPragma* nodep) { if (nodep->pragType() == AstPragmaType::PUBLIC_MODULE) { - if (!m_modp) nodep->v3fatalSrc("PUBLIC_MODULE not under a module\n"); + if (!m_modp) nodep->v3fatalSrc("PUBLIC_MODULE not under a module"); m_modp->modPublic(true); nodep->unlinkFrBack(); pushDeletep(nodep); VL_DANGLING(nodep); } else if (nodep->pragType() == AstPragmaType::PUBLIC_TASK) { - if (!m_ftaskp) nodep->v3fatalSrc("PUBLIC_TASK not under a task\n"); + if (!m_ftaskp) nodep->v3fatalSrc("PUBLIC_TASK not under a task"); m_ftaskp->taskPublic(true); m_modp->modPublic(true); // Need to get to the task... nodep->unlinkFrBack(); pushDeletep(nodep); VL_DANGLING(nodep); diff --git a/src/V3Number_test.cpp b/src/V3Number_test.cpp index 4883f2f17..d1489a7ae 100644 --- a/src/V3Number_test.cpp +++ b/src/V3Number_test.cpp @@ -84,7 +84,7 @@ void test(string lhss, string op, string rhss, string exps) { V3Number ok (new FileLine("ck",__LINE__), 1); ok.opCaseEq(expnum,gotnum); if (ok.toUInt()!=1) { - v3fatalSrc("%Error:Test FAILED\n"); + v3fatalSrc("%Error:Test FAILED"); } } diff --git a/src/V3Options.cpp b/src/V3Options.cpp index 68d0b732f..f3e3152cd 100644 --- a/src/V3Options.cpp +++ b/src/V3Options.cpp @@ -607,7 +607,7 @@ bool V3Options::onoff(const char* sw, const char* arg, bool& flag) { // if sw=="-no-arg", then return true (found it), and flag=false // if sw=="-noarg", then return true (found it), and flag=false // else return false - if (arg[0]!='-') v3fatalSrc("OnOff switches must have leading dash.\n"); + if (arg[0]!='-') v3fatalSrc("OnOff switches must have leading dash"); if (0==strcmp(sw,arg)) { flag=true; return true; } else if (0==strncmp(sw,"-no",3) && (0==strcmp(sw+3,arg+1))) { flag=false; return true; } else if (0==strncmp(sw,"-no-",4) && (0==strcmp(sw+4,arg+1))) { flag=false; return true; } diff --git a/src/V3Order.cpp b/src/V3Order.cpp index 396a00c12..004e92da0 100644 --- a/src/V3Order.cpp +++ b/src/V3Order.cpp @@ -194,7 +194,7 @@ public: // METHODS OrderVarVertex* newVarUserVertex(V3Graph* graphp, AstScope* scopep, AstVarScope* varscp, WhichVertex type, bool* createdp=NULL) { - if (type>=WV_MAX) varscp->v3fatalSrc("Bad Case\n"); + if (type>=WV_MAX) varscp->v3fatalSrc("Bad case"); OrderVarVertex* vertexp = m_vertexp[type]; if (!vertexp) { UINFO(6,"New vertex "<v3fatalSrc("Bad Case\n"); + default: varscp->v3fatalSrc("Bad case"); } m_vertexp[type] = vertexp; } else { @@ -806,15 +806,15 @@ private: virtual void visit(AstNodeVarRef* nodep) { if (m_scopep) { AstVarScope* varscp = nodep->varScopep(); - if (!varscp) nodep->v3fatalSrc("Var didn't get varscoped in V3Scope.cpp\n"); + if (!varscp) nodep->v3fatalSrc("Var didn't get varscoped in V3Scope.cpp"); if (m_inSenTree) { // Add CLOCK dependency... This is a root of the tree we'll trace - if (nodep->lvalue()) nodep->v3fatalSrc("How can a sensitivity be setting a var?\n"); + if (nodep->lvalue()) nodep->v3fatalSrc("How can a sensitivity be setting a var?"); OrderVarVertex* varVxp = newVarUserVertex(varscp, WV_STD); varVxp->isClock(true); new OrderEdge(&m_graph, varVxp, m_activeSenVxp, WEIGHT_MEDIUM); } else { - if (!m_logicVxp) nodep->v3fatalSrc("Var ref not under a logic block\n"); + if (!m_logicVxp) nodep->v3fatalSrc("Var ref not under a logic block"); // What new directions is this used // We don't want to add extra edges if the logic block has many usages of same var bool gen = false; diff --git a/src/V3Param.cpp b/src/V3Param.cpp index 4121877cd..c0fdce4ef 100644 --- a/src/V3Param.cpp +++ b/src/V3Param.cpp @@ -204,7 +204,7 @@ private: pinp->modPTypep(cloneiter->second->castParamTypeDType()); } else { - pinp->v3fatalSrc("Not linked?\n"); + pinp->v3fatalSrc("Not linked?"); } } } diff --git a/src/V3Split.cpp b/src/V3Split.cpp index 6c7929835..ff88efbca 100644 --- a/src/V3Split.cpp +++ b/src/V3Split.cpp @@ -272,12 +272,12 @@ private: //UINFO(9," push "<user3p()) nodep->v3fatalSrc("user3p should not be used; cleared in processBlock\n"); + if (nodep->user3p()) nodep->v3fatalSrc("user3p should not be used; cleared in processBlock"); nodep->user3p(vertexp); } void scoreboardPopStmt() { //UINFO(9," pop"<user3p(); vvertexp->splitColor(vvertexp->color()); uint32_t color = vvertexp->splitColor(); - if (color >= numVertexes) nextp->v3fatalSrc("More colors than vertexes!\n"); - if (!color) nextp->v3fatalSrc("No node color assigned\n"); + if (color >= numVertexes) nextp->v3fatalSrc("More colors than vertexes"); + if (!color) nextp->v3fatalSrc("No node color assigned"); if (lastOfColor[color]) { new SplitStrictEdge(&m_graph, lastOfColor[color], vvertexp); } diff --git a/src/V3Task.cpp b/src/V3Task.cpp index c3164b19d..b75f87a0e 100644 --- a/src/V3Task.cpp +++ b/src/V3Task.cpp @@ -263,7 +263,7 @@ private: if (nodep->varp()->user2p()) { // It's being converted to a alias. UINFO(9, " relinkVar "<<(void*)nodep->varp()->user2p()<<" "<varp()->user2p()->castVarScope(); - if (!newvscp) nodep->v3fatalSrc("Null?\n"); + if (!newvscp) nodep->v3fatalSrc("not linked"); nodep->varScopep(newvscp); nodep->varp(nodep->varScopep()->varp()); nodep->name(nodep->varp()->name()); @@ -1147,7 +1147,7 @@ private: m_insStmtp = NULL; // Next thing should be new statement } virtual void visit(AstNodeFor* nodep) { - nodep->v3fatalSrc("For statements should have been converted to while statements in V3Begin.cpp\n"); + nodep->v3fatalSrc("For statements should have been converted to while statements in V3Begin.cpp"); } virtual void visit(AstNodeStmt* nodep) { m_insMode = IM_BEFORE; diff --git a/src/V3Unknown.cpp b/src/V3Unknown.cpp index 933e1d5a2..d6a4b29f2 100644 --- a/src/V3Unknown.cpp +++ b/src/V3Unknown.cpp @@ -387,7 +387,7 @@ private: } else if (basefromp->castConst()) { // If it's a PARAMETER[bit], then basefromp may be a constant instead of a varrefp } else { - nodep->v3fatalSrc("No VarRef or Const under ArraySel\n"); + nodep->v3fatalSrc("No VarRef or Const under ArraySel"); } // Find range of dtype we are selecting from int declElements = -1; diff --git a/src/VlcMain.cpp b/src/VlcMain.cpp index ea1cc0f5a..86629b34a 100644 --- a/src/VlcMain.cpp +++ b/src/VlcMain.cpp @@ -52,7 +52,7 @@ bool VlcOptions::onoff(const char* sw, const char* arg, bool& flag) { // if sw=="-no-arg", then return true (found it), and flag=false // if sw=="-noarg", then return true (found it), and flag=false // else return false - if (arg[0]!='-') v3fatalSrc("OnOff switches must have leading dash.\n"); + if (arg[0]!='-') v3fatalSrc("OnOff switches must have leading dash."); if (0==strcmp(sw,arg)) { flag=true; return true; } else if (0==strncmp(sw,"-no",3) && (0==strcmp(sw+3,arg+1))) { flag=false; return true; } else if (0==strncmp(sw,"-no-",4) && (0==strcmp(sw+4,arg+1))) { flag=false; return true; }