Changes in / [3b5dcfa:b738974]

Location:

src

Files:

• Common/SemanticError.h (modified) (4 diffs)
• Parser/parser.yy (modified) (7 diffs)

src/Common/SemanticError.h

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Jul 19 10:09:17 2018
-// Update Count     : 31
+// Last Modified On : Wed May  4 14:08:26 2022
+// Update Count     : 35
 //
 
@@ -59 +59 @@
         {"aggregate-forward-decl" , Severity::Warn    , "forward declaration of nested aggregate: %s"                },
         {"superfluous-decl"       , Severity::Warn    , "declaration does not allocate storage: %s"                  },
+        {"superfluous-else"       , Severity::Warn    , "else clause never executed for empty loop conditional"      },
         {"gcc-attributes"         , Severity::Warn    , "invalid attribute: %s"                                      },
         {"c++-like-copy"          , Severity::Warn    , "Constructor from reference is not a valid copy constructor" },
@@ -69 +70 @@
         AggrForwardDecl,
         SuperfluousDecl,
+        SuperfluousElse,
         GccAttributes,
         CppCopy,
@@ -79 +81 @@
 );
 
-#define SemanticWarning(loc, id, ...) SemanticWarningImpl(loc, id, WarningFormats[(int)id].message, __VA_ARGS__)
+#define SemanticWarning(loc, id, ...) SemanticWarningImpl(loc, id, WarningFormats[(int)id].message, ##__VA_ARGS__)
 
 void SemanticWarningImpl (CodeLocation loc, Warning warn, const char * const fmt, ...) __attribute__((format(printf, 3, 4)));

src/Parser/parser.yy

@@ -10 +10 @@
 // Created On       : Sat Sep  1 20:22:55 2001
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Mon Mar 14 16:35:29 2022
-// Update Count     : 5276
+// Last Modified On : Wed May  4 14:25:20 2022
+// Update Count     : 5277
 //
 
@@ -111 +111 @@
 
 void distInl( DeclarationNode * declaration ) {
-        // distribute EXTENSION across all declarations
+        // distribute INLINE across all declarations
         for ( DeclarationNode *iter = declaration; iter != nullptr; iter = (DeclarationNode *)iter->get_next() ) {
                 iter->set_inLine( true );
@@ -1221 +1221 @@
 
 iteration_statement:
-        WHILE '(' ')' statement                                                         // CFA => while ( 1 )
+        WHILE '(' ')' statement                                                         %prec THEN // CFA => while ( 1 )
                 { $$ = new StatementNode( build_while( new CondCtl( nullptr, new ExpressionNode( build_constantInteger( *new string( "1" ) ) ) ), maybe_build_compound( $4 ) ) ); }
+        | WHILE '(' ')' statement ELSE statement                        // CFA
+                { SemanticWarning( yylloc, Warning::SuperfluousElse ); }
         | WHILE '(' conditional_declaration ')' statement       %prec THEN
                 { $$ = new StatementNode( build_while( $3, maybe_build_compound( $5 ) ) ); }
@@ -1229 +1231 @@
         | DO statement WHILE '(' ')' ';'                                        // CFA => do while( 1 )
                 { $$ = new StatementNode( build_do_while( new ExpressionNode( build_constantInteger( *new string( "1" ) ) ), maybe_build_compound( $2 ) ) ); }
+        | DO statement WHILE '(' ')' ELSE statement                     // CFA
+                { SemanticWarning( yylloc, Warning::SuperfluousElse ); }
         | DO statement WHILE '(' comma_expression ')' ';'       %prec THEN
                 { $$ = new StatementNode( build_do_while( $5, maybe_build_compound( $2 ) ) ); }
@@ -2318 +2322 @@
                         { SemanticError( yylloc, "storage-class and CV qualifiers are not meaningful for enumeration constants, which are const." ); }
 
-                        $$ = DeclarationNode::newEnum( nullptr, $7, true, $3 ) ->addQualifiers( $5 );
+                        $$ = DeclarationNode::newEnum( nullptr, $7, true, $3 )->addQualifiers( $5 );
                 }
         | ENUM '(' cfa_abstract_parameter_declaration ')' attribute_list_opt identifier attribute_list_opt
@@ -2327 +2331 @@
           '{' enumerator_list comma_opt '}'
                 {
-                        $$ = DeclarationNode::newEnum( $6, $10, true, $3 ) -> addQualifiers( $5 ) -> addQualifiers( $7 );
+                        $$ = DeclarationNode::newEnum( $6, $10, true, $3 )->addQualifiers( $5 )->addQualifiers( $7 );
                 }
         | ENUM '(' cfa_abstract_parameter_declaration ')' attribute_list_opt typedef_name attribute_list_opt '{' enumerator_list comma_opt '}'
@@ -2333 +2337 @@
                         if ( $3->storageClasses.val != 0 || $3->type->qualifiers.val != 0 ) { SemanticError( yylloc, "storage-class and CV qualifiers are not meaningful for enumeration constants, which are const." ); }
                         typedefTable.makeTypedef( *$6->name );
-                        $$ = DeclarationNode::newEnum( $6->name, $9, true, $3 ) -> addQualifiers( $5 ) -> addQualifiers( $7 );
+                        $$ = DeclarationNode::newEnum( $6->name, $9, true, $3 )->addQualifiers( $5 )->addQualifiers( $7 );
                 }
         | enum_type_nobody