Merge pull request #2849 from dtcenter/feature_2830_sonarqube_enum

Feature 2830 sonarqube enum
dtcenter · Apr 8, 2024 · 3d543fc · 3d543fc
2 parents e71debf + 78f1824
commit 3d543fc
Show file tree

Hide file tree

Showing 128 changed files with 2,936 additions and 2,860 deletions.
diff --git a/src/basic/vx_config/builtin.cc b/src/basic/vx_config/builtin.cc
@@ -75,54 +75,54 @@ static double  my_C_to_F    (double);
 
 const BuiltinInfo binfo[] = {
 
-   { "sin",    1, builtin_sin,     nullptr, nullptr, sin, nullptr },
-   { "cos",    1, builtin_cos,     nullptr, nullptr, cos, nullptr },
-   { "tan",    1, builtin_tan,     nullptr, nullptr, tan, nullptr },
+   { "sin",    1, Builtin::sin,     nullptr, nullptr, sin, nullptr },
+   { "cos",    1, Builtin::cos,     nullptr, nullptr, cos, nullptr },
+   { "tan",    1, Builtin::tan,     nullptr, nullptr, tan, nullptr },
 
-   { "sind",   1, builtin_sind,    nullptr, nullptr, sin_deg, nullptr },
-   { "cosd",   1, builtin_cosd,    nullptr, nullptr, cos_deg, nullptr },
-   { "tand",   1, builtin_tand,    nullptr, nullptr, tan_deg, nullptr },
+   { "sind",   1, Builtin::sind,    nullptr, nullptr, sin_deg, nullptr },
+   { "cosd",   1, Builtin::cosd,    nullptr, nullptr, cos_deg, nullptr },
+   { "tand",   1, Builtin::tand,    nullptr, nullptr, tan_deg, nullptr },
 
-   { "asin",   1, builtin_asin,    nullptr, nullptr, asin, nullptr },
-   { "acos",   1, builtin_acos,    nullptr, nullptr, acos, nullptr },
-   { "atan",   1, builtin_atan,    nullptr, nullptr, atan, nullptr },
+   { "asin",   1, Builtin::asin,    nullptr, nullptr, asin, nullptr },
+   { "acos",   1, Builtin::acos,    nullptr, nullptr, acos, nullptr },
+   { "atan",   1, Builtin::atan,    nullptr, nullptr, atan, nullptr },
 
-   { "asind",  1, builtin_sind,    nullptr, nullptr, arc_sin_deg, nullptr },
-   { "acosd",  1, builtin_cosd,    nullptr, nullptr, arc_cos_deg, nullptr },
-   { "atand",  1, builtin_tand,    nullptr, nullptr, arc_tan_deg, nullptr },
+   { "asind",  1, Builtin::sind,    nullptr, nullptr, arc_sin_deg, nullptr },
+   { "acosd",  1, Builtin::cosd,    nullptr, nullptr, arc_cos_deg, nullptr },
+   { "atand",  1, Builtin::tand,    nullptr, nullptr, arc_tan_deg, nullptr },
 
-   { "atan2",  2, builtin_atan2,   nullptr, nullptr, nullptr, atan2 },
-   { "atan2d", 2, builtin_atan2d,  nullptr, nullptr, nullptr, atan2_deg },
+   { "atan2",  2, Builtin::atan2,   nullptr, nullptr, nullptr, atan2 },
+   { "atan2d", 2, Builtin::atan2d,  nullptr, nullptr, nullptr, atan2_deg },
 
-   { "arg",    2, builtin_arg,     nullptr, nullptr, nullptr, my_arg     },
-   { "argd",   2, builtin_argd,    nullptr, nullptr, nullptr, my_arg_deg },
+   { "arg",    2, Builtin::arg,     nullptr, nullptr, nullptr, my_arg     },
+   { "argd",   2, Builtin::argd,    nullptr, nullptr, nullptr, my_arg_deg },
 
-   { "log",    1, builtin_log,     nullptr, nullptr, log, nullptr },
-   { "exp",    1, builtin_exp,     nullptr, nullptr, exp, nullptr },
+   { "log",    1, Builtin::log,     nullptr, nullptr, log, nullptr },
+   { "exp",    1, Builtin::exp,     nullptr, nullptr, exp, nullptr },
 
-   { "log10",  1, builtin_log10,   nullptr, nullptr, log10,    nullptr },
-   { "exp10",  1, builtin_exp10,   nullptr, nullptr, my_exp10, nullptr },
+   { "log10",  1, Builtin::log10,   nullptr, nullptr, log10,    nullptr },
+   { "exp10",  1, Builtin::exp10,   nullptr, nullptr, my_exp10, nullptr },
 
-   { "sqrt",   1, builtin_sqrt,    nullptr, nullptr, sqrt, nullptr },
+   { "sqrt",   1, Builtin::sqrt,    nullptr, nullptr, sqrt, nullptr },
 
-   { "abs",    1, builtin_abs,     abs, nullptr, fabs, nullptr },
+   { "abs",    1, Builtin::abs,     abs, nullptr, fabs, nullptr },
 
-   { "min",    2, builtin_min,     nullptr, my_imin, nullptr, my_dmin },
-   { "max",    2, builtin_max,     nullptr, my_imax, nullptr, my_dmax },
+   { "min",    2, Builtin::min,     nullptr, my_imin, nullptr, my_dmin },
+   { "max",    2, Builtin::max,     nullptr, my_imax, nullptr, my_dmax },
 
-   { "mod",    2, builtin_mod,     nullptr, my_imod, nullptr, my_dmod },
+   { "mod",    2, Builtin::mod,     nullptr, my_imod, nullptr, my_dmod },
 
-   { "floor",  1, builtin_floor,   nullptr, nullptr, floor, nullptr },
-   { "ceil",   1, builtin_ceil,    nullptr, nullptr, ceil,  nullptr },
+   { "floor",  1, Builtin::floor,   nullptr, nullptr, floor, nullptr },
+   { "ceil",   1, Builtin::ceil,    nullptr, nullptr, ceil,  nullptr },
 
-   { "step",   1, builtin_step,    my_istep, nullptr, my_dstep,  nullptr },
+   { "step",   1, Builtin::step,    my_istep, nullptr, my_dstep,  nullptr },
 
    // Functions defined in ConfigConstants
-   // { "F_to_C", 1, builtin_F_to_C,  nullptr, nullptr, my_F_to_C,  nullptr },
-   // { "C_to_F", 1, builtin_C_to_F,  nullptr, nullptr, my_C_to_F,  nullptr },
+   // { "F_to_C", 1, Builtin::F_to_C,  nullptr, nullptr, my_F_to_C,  nullptr },
+   // { "C_to_F", 1, Builtin::C_to_F,  nullptr, nullptr, my_C_to_F,  nullptr },
 
-   { "nint",   1, builtin_nint,    nullptr, nullptr, nullptr,  nullptr },
-   { "sign",   1, builtin_sign,    nullptr, nullptr, nullptr,  nullptr },
+   { "nint",   1, Builtin::nint,    nullptr, nullptr, nullptr,  nullptr },
+   { "sign",   1, Builtin::sign,    nullptr, nullptr, nullptr,  nullptr },
 
 
       //

diff --git a/src/basic/vx_config/builtin.h b/src/basic/vx_config/builtin.h
@@ -30,69 +30,69 @@ static const int max_builtin_args = 2;
 ////////////////////////////////////////////////////////////////////////
 
 
-enum Builtin {
+enum class Builtin {
 
 
       //
       //  built-in functions of one variable
       //
 
-   builtin_sin,
-   builtin_cos,
-   builtin_tan,
+   sin,
+   cos,
+   tan,
 
-   builtin_sind,
-   builtin_cosd,
-   builtin_tand,
+   sind,
+   cosd,
+   tand,
 
-   builtin_asin,
-   builtin_acos,
-   builtin_atan,
+   asin,
+   acos,
+   atan,
 
-   builtin_asind,
-   builtin_acosd,
-   builtin_atand,
+   asind,
+   acosd,
+   atand,
 
-   builtin_log,
-   builtin_exp,
+   log,
+   exp,
 
-   builtin_log10,
-   builtin_exp10,
+   log10,
+   exp10,
 
-   builtin_sqrt,
-   builtin_abs,
-   builtin_floor,
-   builtin_ceil,
-   builtin_nint,
-   builtin_sign,
+   sqrt,
+   abs,
+   floor,
+   ceil,
+   nint,
+   sign,
 
-   builtin_step,
+   step,
 
    // Functions defined in ConfigConstants
-   // builtin_F_to_C,
-   // builtin_C_to_F,
+   // F_to_C,
+   // C_to_F,
 
 
       //
       //  built-in functions of two variables
       //
 
-   builtin_atan2,
-   builtin_atan2d,
+   atan2,
+   atan2d,
 
-   builtin_arg,
-   builtin_argd,
+   arg,
+   argd,
 
-   builtin_min,
-   builtin_max,
+   min,
+   max,
 
-   builtin_mod,
+   mod,
 
       //
       //  built-in functions of three variables
       //
 
-   // builtin_ifte
+   // ifte
 
       //
       //  flag value

diff --git a/src/basic/vx_config/calculator.cc b/src/basic/vx_config/calculator.cc
@@ -391,9 +391,9 @@ const BuiltinInfo & info = binfo[which];
    //  nint and sign are treated differently
    //
 
-if ( info.id == builtin_nint )  { do_nint();  return; }
+if ( info.id == Builtin::nint )  { do_nint();  return; }
 
-if ( info.id == builtin_sign )  { do_sign();  return; }
+if ( info.id == Builtin::sign )  { do_sign();  return; }
 
    //
    //