[PPL-devel] [GIT] ppl/ppl(master): Prefer if statement to switch having a single case.

[Enea Zaffanella]

Module: ppl/ppl
Branch: master
Commit: 8c89cabcad0b8e807538ec7dbc75985936ef621e
URL:    http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=8c89cabcad0b8e807538ec7dbc75985936ef621e

Author: Enea Zaffanella <zaffanella at cs.unipr.it>
Date:   Fri Dec  9 15:10:42 2011 +0100

Prefer if statement to switch having a single case.
Detected by ECLAIR service swchlabs.

---

 interfaces/Java/jni/ppl_java_common.cc |   12 ++++--------
 interfaces/OCaml/ppl_ocaml_common.cc   |   12 +++++-------
 2 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/interfaces/Java/jni/ppl_java_common.cc b/interfaces/Java/jni/ppl_java_common.cc
index 3358b90..0c9e0d0 100644
--- a/interfaces/Java/jni/ppl_java_common.cc
+++ b/interfaces/Java/jni/ppl_java_common.cc
@@ -637,12 +637,10 @@ build_cxx_control_parameter_name(JNIEnv* env, jobject j_cp_name) {
   CHECK_RESULT_ASSERT(env, cp_name_ordinal_id);
   jint cp_name = env->CallIntMethod(j_cp_name, cp_name_ordinal_id);
   CHECK_EXCEPTION_ASSERT(env);
-  switch (cp_name) {
-  case 0:
+  if (cp_name == 0)
     return MIP_Problem::PRICING;
-  default:
+  else
     PPL_JAVA_UNREACHABLE;
-  }
 }
 
 jobject
@@ -655,13 +653,11 @@ build_java_control_parameter_name
     = env->GetStaticFieldID(j_cp_name_class, "PRICING",
 			    "Lparma_polyhedra_library/Control_Parameter_Name;");
   CHECK_RESULT_ASSERT(env, cp_name_pricing_get_id);
-  switch (cp_name) {
-  case MIP_Problem::PRICING:
+  if (cp_name == MIP_Problem::PRICING)
     return env->GetStaticObjectField(j_cp_name_class,
 				     cp_name_pricing_get_id);
-  default:
+  else
     PPL_JAVA_UNREACHABLE;
-  }
 }
 
 MIP_Problem::Control_Parameter_Value
diff --git a/interfaces/OCaml/ppl_ocaml_common.cc b/interfaces/OCaml/ppl_ocaml_common.cc
index ffae786..ad085f1 100644
--- a/interfaces/OCaml/ppl_ocaml_common.cc
+++ b/interfaces/OCaml/ppl_ocaml_common.cc
@@ -251,12 +251,10 @@ build_ppl_Complexity_Class(value cc) {
 MIP_Problem::Control_Parameter_Name
 build_ppl_control_parameter_name(value caml_cp_name) {
   assert(Is_long(caml_cp_name));
-  switch (Int_val(caml_cp_name)) {
-  case 0:
-    return  MIP_Problem::PRICING;
-  default:
+  if (Int_val(caml_cp_name) == 0)
+    return MIP_Problem::PRICING;
+  else
     PPL_OCAML_UNREACHABLE_MSG("build_ppl_control_parameter_name(cpn)");
-  }
 }
 
 MIP_Problem::Control_Parameter_Value
@@ -279,9 +277,9 @@ build_ppl_pip_problem_control_parameter_name(value caml_cp_name) {
   assert(Is_long(caml_cp_name));
   switch (Int_val(caml_cp_name)) {
   case 0:
-    return  PIP_Problem::CUTTING_STRATEGY;
+    return PIP_Problem::CUTTING_STRATEGY;
   case 1:
-    return  PIP_Problem::PIVOT_ROW_STRATEGY;
+    return PIP_Problem::PIVOT_ROW_STRATEGY;
   default:
     PPL_OCAML_UNREACHABLE_MSG("build_ppl_pip_problem_"
                               "control_parameter_name(cpn)");