Per #2673, update the enum_to_string and flex/bison inputs to make it…

… more compliant with the SonarQube standards.
dtcenter · Mar 13, 2024 · fca4b29 · fca4b29
1 parent 4d7d4a2
commit fca4b29
Show file tree

Hide file tree

Showing 11 changed files with 132 additions and 137 deletions.
diff --git a/src/basic/enum_to_string/code.cc b/src/basic/enum_to_string/code.cc
@@ -489,21 +489,19 @@ warning(out);
 out << "\n\n"
     << sep
     << "\n\n"
-    << "using namespace std;\n"
-    << "\n\n"
     << "#include <string.h>\n"
     << "\n"
     << "#include " << L << lower << "_to_string";
 
 if ( header_suffix )    out << header_suffix;
 
-out << R 
-    << "\n"
+out << R
+    << "\n\n"
+    << "using namespace std;\n"
     << "\n\n"
     << sep
     << "\n\n";
 
-
 forward(e, lower, out);
 
 out << "\n\n"
@@ -607,21 +605,19 @@ warning(out);
 out << "\n\n"
     << sep
     << "\n\n"
-    << "using namespace std;\n"
-    << "\n\n"
     << "#include <string.h>\n"
     << "\n"
     << "#include " << L << lower << "_to_string";
 
 if ( header_suffix )    out << header_suffix;
 
 out << R 
-    << "\n"
+    << "\n\n"
+    << "using namespace std;\n"
     << "\n\n"
     << sep
     << "\n\n";
 
-
 forward_cs(e, lower, out);
 
 out << "\n\n"
@@ -758,7 +754,7 @@ out << e.name() << " t)\n"
     << "{\n"
     << "\n";
 
-out << "const char * s = (const char *) 0;\n\n";
+out << "const char * s = (const char *) nullptr;\n\n";
 
 out << "switch ( t )  {\n"
     << "\n";
@@ -802,7 +798,7 @@ out << "\n"
     << "}   //  switch\n"
     << "\n\n";
 
-out << "return ( ConcatString (s) );\n"
+out << "return ConcatString(s);\n"
     << "\n";
 
 out << "}\n";

diff --git a/src/basic/enum_to_string/enum_parser.yy b/src/basic/enum_to_string/enum_parser.yy
@@ -46,7 +46,7 @@ extern bool do_concat_string;
 
 EnumInfo einfo;
 
-const char * header_filename = (const char *) 0;
+const char * header_filename = (const char *) nullptr;
 
 ScopeStack ss;
 
@@ -171,7 +171,7 @@ void set_name(const char * text)
 {
 
 int j, n;
-const char * c = (const char *) 0;
+const char * c = (const char *) nullptr;
 ostringstream s;
 
 

diff --git a/src/basic/enum_to_string/enum_scanner.ll b/src/basic/enum_to_string/enum_scanner.ll
@@ -89,16 +89,16 @@ WS      " "|"\t"
 
 %%
 
-enum                             { do_enum();   return ( token(ENUM)  ); }
-class                            { do_class();  return ( token(CLASS) ); }
+enum                             { do_enum();   return token(ENUM);  }
+class                            { do_class();  return token(CLASS); }
 
-"{"                              { if ( do_left_curly()  )  return ( token(L_CURLY) ); }
-"}"                              { if ( do_right_curly() )  return ( token(R_CURLY) ); }
-"="                              { if ( do_equals()      )  return ( token (EQ) );     }
-";"                              { if ( do_semi()        )  return ( token(';') );     }
-","                              { if ( do_comma()       )  return ( token(',') );     }
-("-"?)({DIGIT})+                 { if ( do_int()         )  return ( token(INTEGER) ); }
-({LETTER})({LETTER}|{DIGIT})*    { if ( do_id()          )  return ( token(ID) );      }
+"{"                              { if ( do_left_curly()  )  return token(L_CURLY); }
+"}"                              { if ( do_right_curly() )  return token(R_CURLY); }
+"="                              { if ( do_equals()      )  return token (EQ);     }
+";"                              { if ( do_semi()        )  return token(';');     }
+","                              { if ( do_comma()       )  return token(',');     }
+("-"?)({DIGIT})+                 { if ( do_int()         )  return token(INTEGER); }
+({LETTER})({LETTER}|{DIGIT})*    { if ( do_id()          )  return token(ID);      }
 
 
 
@@ -160,13 +160,13 @@ if ( enum_mode || last_was_enum || last_was_class )  {
 
    strncpy(yylval.name, yytext, sizeof(yylval.name));
 
-   return ( 1 );
+   return 1;
 
 }
 
 
 
-return ( 0 );
+return 0;
 
 }
 
@@ -180,13 +180,13 @@ int do_int()
 
 column += strlen(yytext);
 
-if ( !enum_mode )  return ( 0 );
+if ( !enum_mode )  return 0;
 
 yylval.ival = atoi(yytext);
 
 
 
-return ( 1 );
+return 1;
 
 }
 
@@ -202,12 +202,12 @@ int do_left_curly()
 
 ++column;
 
-if ( !enum_mode )  return ( 0 );
+if ( !enum_mode )  return 0;
 
 yylval.ival = bracket_level;
 
 
-return ( 1 );
+return 1;
 
 }
 
@@ -225,12 +225,12 @@ int do_right_curly()
 
 ss.clear_to_level(bracket_level);
 
-if ( !enum_mode )  return ( 0 );
+if ( !enum_mode )  return 0;
 
 yylval.ival = bracket_level + 1;
 
 
-return ( 1 );
+return 1;
 
 }
 
@@ -244,10 +244,10 @@ int do_semi()
 
 ++column;
 
-if ( enum_mode )  return ( 1 );
+if ( enum_mode )  return 1;
 
 
-return ( 0 );
+return 0;
 
 }
 
@@ -261,10 +261,10 @@ int do_equals()
 
 ++column;
 
-if ( enum_mode )  return ( 1 );
+if ( enum_mode )  return 1;
 
 
-return ( 0 );
+return 0;
 
 }
 
@@ -278,10 +278,10 @@ int do_comma()
 
 ++column;
 
-if ( enum_mode )  return ( 1 );
+if ( enum_mode )  return 1;
 
 
-return ( 0 );
+return 0;
 
 }
 
@@ -300,7 +300,7 @@ c1 = nextchar();
 c2 = nextchar();
 
 
-while ( 1 )  {
+while ( true )  {
 
    if ( (c1 == EOF) || (c2 == EOF) )  break;
 
@@ -329,7 +329,7 @@ void do_cpp_comment()
 int c;
 
 
-while ( 1 )  {
+while ( true )  {
 
    c = nextchar();
 
@@ -366,7 +366,7 @@ if ( c == '\n' )  {
 }
 
 
-return ( c );
+return c;
 
 }
 
@@ -388,7 +388,7 @@ if ( t == CLASS )  last_was_class = 1;
 if ( t == ENUM  )  last_was_enum  = 1;
 
 
-return ( t );
+return t;
 
 }
 

diff --git a/src/basic/enum_to_string/info.cc b/src/basic/enum_to_string/info.cc
@@ -275,7 +275,7 @@ for (j=0; j<Nids; ++j)  {
 }
 
 
-return ( max_len );
+return max_len;
 
 }
 

diff --git a/src/basic/enum_to_string/info.h b/src/basic/enum_to_string/info.h
@@ -90,17 +90,17 @@ class EnumInfo {
 ////////////////////////////////////////////////////////////////////////
 
 
-inline int EnumInfo::n_ids() const { return ( Nids ); }
+inline int EnumInfo::n_ids() const { return Nids; }
 
-inline const char * EnumInfo::name() const { return ( Name ); }
+inline const char * EnumInfo::name() const { return Name; }
 
-inline const char * EnumInfo::lowercase_name() const { return ( LowerCaseName ); }
+inline const char * EnumInfo::lowercase_name() const { return LowerCaseName; }
 
-inline const char * EnumInfo::scope() const { return ( Scope ); }
+inline const char * EnumInfo::scope() const { return Scope; }
 
-inline const char * EnumInfo::u_scope() const { return ( U_Scope ); }
+inline const char * EnumInfo::u_scope() const { return U_Scope; }
 
-inline const char * EnumInfo::header() const { return ( Header ); }
+inline const char * EnumInfo::header() const { return Header; }
 
 
 ////////////////////////////////////////////////////////////////////////

diff --git a/src/basic/enum_to_string/my_enum_scanner.cc b/src/basic/enum_to_string/my_enum_scanner.cc
@@ -365,7 +365,7 @@ for (j=j_start; j<max_lexeme_size; ++j)  {
 
 
 
-return ( digit_count > 0 );
+return digit_count > 0;
 
 }
 

diff --git a/src/basic/enum_to_string/scope.h b/src/basic/enum_to_string/scope.h
@@ -57,9 +57,9 @@ class ScopeStackElement {
 ////////////////////////////////////////////////////////////////////////
 
 
-inline int ScopeStackElement::level() const { return ( Level ); }
+inline int ScopeStackElement::level() const { return Level; }
 
-inline const char * ScopeStackElement::name() const { return ( Name ); }
+inline const char * ScopeStackElement::name() const { return Name; }
 
 
 ////////////////////////////////////////////////////////////////////////
@@ -113,7 +113,7 @@ class ScopeStack {
 ////////////////////////////////////////////////////////////////////////
 
 
-inline int ScopeStack::n_elements() const { return ( N ); }
+inline int ScopeStack::n_elements() const { return N; }
 
 
 ////////////////////////////////////////////////////////////////////////

diff --git a/src/basic/vx_config/config.tab.yy b/src/basic/vx_config/config.tab.yy
@@ -815,7 +815,7 @@ DictionaryEntry e;
 
 count = 0;
 
-while ( 1 )  {
+while ( true )  {
 
    v = icvs.pop();