From 434538722594f9d9a3327696e5ba13ff4e95228f Mon Sep 17 00:00:00 2001 From: Eric Eide Date: Sat, 25 Jun 2011 13:00:30 -0600 Subject: [PATCH] Insert missing `break's. Out of the box, the Eclipse Indigo CDT complains about missing break statements. This commit adds breaks to avoid most of those warnings. --- src/AbsRndNumGenerator.cpp | 1 + src/CrestExtension.cpp | 2 +- src/DeltaMonitor.cpp | 3 +++ src/DepthSpec.cpp | 1 + src/FunctionInvocationBinary.cpp | 1 + src/FunctionInvocationUnary.cpp | 1 + src/SafeOpFlags.cpp | 9 +++++---- src/StatementAssign.cpp | 5 +++-- src/Type.cpp | 1 + 9 files changed, 17 insertions(+), 7 deletions(-) diff --git a/src/AbsRndNumGenerator.cpp b/src/AbsRndNumGenerator.cpp index 1fa461113..79c557426 100644 --- a/src/AbsRndNumGenerator.cpp +++ b/src/AbsRndNumGenerator.cpp @@ -81,6 +81,7 @@ AbsRndNumGenerator::make_rndnum_generator(RNDNUM_GENERATOR impl, const unsigned break; default: assert(!"unknown random generator"); + break; } return rImpl; diff --git a/src/CrestExtension.cpp b/src/CrestExtension.cpp index 0d519c13e..bd79a393b 100644 --- a/src/CrestExtension.cpp +++ b/src/CrestExtension.cpp @@ -65,7 +65,7 @@ CrestExtension::type_to_string(const Type *t) case eUInt: return "unsigned_int"; case eLong: return "int"; case eULong: return "unsigned_int"; - default: assert(0); + default: assert(0); break; } assert(0); return ""; diff --git a/src/DeltaMonitor.cpp b/src/DeltaMonitor.cpp index 2a3810215..855ceb941 100644 --- a/src/DeltaMonitor.cpp +++ b/src/DeltaMonitor.cpp @@ -76,6 +76,7 @@ DeltaMonitor::GetSequence() break; default: assert("DeltaMonitor GetSequence error" && 0); + break; } assert(DeltaMonitor::seq_); return DeltaMonitor::seq_; @@ -97,6 +98,7 @@ DeltaMonitor::CreateRndNumInstance(const unsigned long seed) break; default: assert("DeltaMonitor CreateRndNumInstance error" && 0); + break; } } @@ -168,6 +170,7 @@ DeltaMonitor::OutputStatistics(ostream &out) break; default: assert(0); + break; } } diff --git a/src/DepthSpec.cpp b/src/DepthSpec.cpp index ab345eff5..ca0d2b78b 100644 --- a/src/DepthSpec.cpp +++ b/src/DepthSpec.cpp @@ -424,6 +424,7 @@ int DepthSpec::depth_guard_by_type(enum dType ty, int extra_flag) DEPTH_GUARD_CASE(dtSafeOpFlags, extra_flag) default: assert(0); + break; } return GOOD_DEPTH; diff --git a/src/FunctionInvocationBinary.cpp b/src/FunctionInvocationBinary.cpp index f562f9231..6cc81262e 100644 --- a/src/FunctionInvocationBinary.cpp +++ b/src/FunctionInvocationBinary.cpp @@ -197,6 +197,7 @@ FunctionInvocationBinary::get_type(void) const switch (eFunc) { default: assert(!"invalid operator in FunctionInvocationBinary::get_type()"); + break; case eAdd: case eSub: diff --git a/src/FunctionInvocationUnary.cpp b/src/FunctionInvocationUnary.cpp index 15e66bc9d..c1f91462d 100644 --- a/src/FunctionInvocationUnary.cpp +++ b/src/FunctionInvocationUnary.cpp @@ -124,6 +124,7 @@ FunctionInvocationUnary::get_type(void) const switch (eFunc) { default: assert(!"invalid operator in FunctionInvocationUnary::get_type()"); + break; case ePlus: case eMinus: diff --git a/src/SafeOpFlags.cpp b/src/SafeOpFlags.cpp index d30b850e7..f65e9ad9a 100644 --- a/src/SafeOpFlags.cpp +++ b/src/SafeOpFlags.cpp @@ -81,7 +81,7 @@ SafeOpFlags::flags_to_type(bool sign, enum SafeOpSize size) case sInt16: return eShort; case sInt32: return eInt; case sInt64: return eLongLong; - default: assert(0); + default: assert(0); break; } } else { @@ -90,7 +90,7 @@ SafeOpFlags::flags_to_type(bool sign, enum SafeOpSize size) case sInt16: return eUShort; case sInt32: return eUInt; case sInt64: return eULongLong; - default: assert(0); + default: assert(0); break; } } assert(0); @@ -174,6 +174,7 @@ SafeOpFlags::OutputSize(std::ostream &out) const break; default: assert(!"invalid size!"); + break; } } @@ -221,7 +222,7 @@ SafeOpFlags::to_string(enum eBinaryOps op) const case eDiv: s = "safe_div_"; break; case eLShift: s = "safe_lshift_"; break; case eRShift: s = "safe_rshift_"; break; - default: ; + default: break; } ostringstream oss; OutputFuncOrMacro(oss); @@ -239,7 +240,7 @@ SafeOpFlags::to_string(enum eUnaryOps op) const string s; switch (op) { case eMinus: s = "safe_unary_minus_"; break; - default: ; + default: break; } ostringstream oss; OutputFuncOrMacro(oss); diff --git a/src/StatementAssign.cpp b/src/StatementAssign.cpp index 06e75a6e2..60f0f8523 100644 --- a/src/StatementAssign.cpp +++ b/src/StatementAssign.cpp @@ -545,7 +545,8 @@ StatementAssign::OutputAsExpr(std::ostream &out) const break; default: - assert (false); + assert(false); + break; } } else { OutputSimple(out); @@ -559,4 +560,4 @@ StatementAssign::OutputAsExpr(std::ostream &out) const // tab-width: 4 // End: -// End of file. \ No newline at end of file +// End of file. diff --git a/src/Type.cpp b/src/Type.cpp index 8c367f9a8..90326c56b 100644 --- a/src/Type.cpp +++ b/src/Type.cpp @@ -765,6 +765,7 @@ Type::get_bitfield_length(int length_flag) break; default: assert(0); + break; } return length; }