Changes in src/Parser/parser.yy [3d937e2:0bcd707]

File:

• src/Parser/parser.yy (modified) (17 diffs)

src/Parser/parser.yy

@@ -10 +10 @@
 // Created On       : Sat Sep  1 20:22:55 2001
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sat Feb 25 13:23:16 2023
-// Update Count     : 5989
+// Last Modified On : Mon Feb 20 11:31:26 2023
+// Update Count     : 5896
 //
 
@@ -1173 +1173 @@
         comma_expression_opt ';'
                 { $$ = new StatementNode( build_expr( $1 ) ); }
+        | MUTEX '(' ')' comma_expression ';'
+                { $$ = new StatementNode( build_mutex( nullptr, new StatementNode( build_expr( $4 ) ) ) ); }
         ;
 
@@ -1280 +1282 @@
                 {
                         $$ = new StatementNode( build_while( new CondCtl( nullptr, NEW_ONE ), maybe_build_compound( $4 ) ) );
-                        SemanticWarning( yylloc, Warning::SuperfluousElse );
+                        SemanticWarning( yylloc, Warning::SuperfluousElse, "" );
                 }
         | WHILE '(' conditional_declaration ')' statement       %prec THEN
@@ -1291 +1293 @@
                 {
                         $$ = new StatementNode( build_do_while( NEW_ONE, maybe_build_compound( $2 ) ) );
-                        SemanticWarning( yylloc, Warning::SuperfluousElse );
+                        SemanticWarning( yylloc, Warning::SuperfluousElse, "" );
                 }
         | DO statement WHILE '(' comma_expression ')' ';'
@@ -1302 +1304 @@
                 {
                         $$ = new StatementNode( build_for( new ForCtrl( (ExpressionNode * )nullptr, (ExpressionNode * )nullptr, (ExpressionNode * )nullptr ), maybe_build_compound( $4 ) ) );
-                        SemanticWarning( yylloc, Warning::SuperfluousElse );
+                        SemanticWarning( yylloc, Warning::SuperfluousElse, "" );
                 }
         | FOR '(' for_control_expression_list ')' statement     %prec THEN
@@ -1582 +1584 @@
         ;
 
-// If MUTEX becomes a general qualifier, there are shift/reduce conflicts, so possibly change syntax to "with mutex".
+// If MUTEX becomes a general qualifier, there are shift/reduce conflicts, so change syntax to "with mutex".
 mutex_statement:
-        MUTEX '(' argument_expression_list_opt ')' statement
-                {
-                        if ( ! $3 ) { SemanticError( yylloc, "mutex argument list cannot be empty." ); $$ = nullptr; }
-                        $$ = new StatementNode( build_mutex( $3, $5 ) );
-                }
+        MUTEX '(' argument_expression_list ')' statement
+                { $$ = new StatementNode( build_mutex( $3, $5 ) ); }
         ;
 
@@ -1942 +1941 @@
                         // if type_specifier is an anon aggregate => name 
                         typedefTable.addToEnclosingScope( *$3->name, TYPEDEFname, "4" );
-                        $$ = $3->addType( $2 )->addTypedef();           // watchout frees $2 and $3
+                        $$ = $3->addType( $2 )->addTypedef();
                 }
         | typedef_declaration pop ',' push declarator
@@ -1986 +1985 @@
                 {
                         assert( $1->type );
-                        if ( $1->type->qualifiers.any() ) {                     // CV qualifiers ?
-                                SemanticError( yylloc, "Useless type qualifier(s) in empty declaration." ); $$ = nullptr;
-                        }
-                        // enums are never empty declarations because there must have at least one enumeration.
-                        if ( $1->type->kind == TypeData::AggregateInst && $1->storageClasses.any() ) { // storage class ?
-                                SemanticError( yylloc, "Useless storage qualifier(s) in empty aggregate declaration." ); $$ = nullptr;
+                        if ( $1->type->qualifiers.val != 0 ) {
+                                SemanticError( yylloc, "Useless type qualifier in empty declaration." ); $$ = nullptr;
                         }
                 }
@@ -2011 +2006 @@
         | sue_declaration_specifier invalid_types
                 {
-                        SemanticError( yylloc, ::toString( "Missing ';' after end of ",
-                                $1->type->enumeration.name ? "enum" : AggregateDecl::aggrString( $1->type->aggregate.kind ),
-                                " declaration" ) );
+                        SemanticError( yylloc,
+                                                  ::toString( "Missing ';' after end of ",
+                                                                          $1->type->enumeration.name ? "enum" : AggregateDecl::aggrString( $1->type->aggregate.kind ),
+                                                                          " declaration" ) );
                         $$ = nullptr;
                 }
@@ -2592 +2588 @@
         | ENUM '(' cfa_abstract_parameter_declaration ')' attribute_list_opt '{' enumerator_list comma_opt '}'
                 {
-                        if ( $3->storageClasses.val != 0 || $3->type->qualifiers.any() )
+                        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." ); }
 
@@ -2603 +2599 @@
         | ENUM '(' cfa_abstract_parameter_declaration ')' attribute_list_opt identifier attribute_list_opt
                 {
-                        if ( $3->storageClasses.any() || $3->type->qualifiers.val != 0 ) { SemanticError( yylloc, "storage-class and CV qualifiers are not meaningful for enumeration constants, which are const." ); }
+                        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 );
                 }
@@ -2990 +2986 @@
         TRAIT identifier_or_type_name '(' type_parameter_list ')' '{' '}'
                 {
-                        SemanticWarning( yylloc, Warning::DeprecTraitSyntax );
+                        SemanticWarning( yylloc, Warning::DeprecTraitSyntax, "" );
                         $$ = DeclarationNode::newTrait( $2, $4, nullptr );
                 }
@@ -2997 +2993 @@
         | TRAIT identifier_or_type_name '(' type_parameter_list ')' '{' push trait_declaration_list pop '}'
                 {
-                        SemanticWarning( yylloc, Warning::DeprecTraitSyntax );
+                        SemanticWarning( yylloc, Warning::DeprecTraitSyntax, "" );
                         $$ = DeclarationNode::newTrait( $2, $4, $8 );
                 }
@@ -3062 +3058 @@
                 { $$ = DeclarationNode::newDirectiveStmt( new StatementNode( build_directive( $1 ) ) ); }
         | declaration
-                {
-                        // Variable declarations of anonymous types requires creating a unique type-name across multiple translation
-                        // unit, which is a dubious task, especially because C uses name rather than structural typing; hence it is
-                        // disallowed at the moment.
-                        if ( $1->linkage == LinkageSpec::Cforall && ! $1->storageClasses.is_static && $1->type && $1->type->kind == TypeData::AggregateInst ) {
-                                if ( $1->type->aggInst.aggregate->kind == TypeData::Enum && $1->type->aggInst.aggregate->enumeration.anon ) {
-                                        SemanticError( yylloc, "extern anonymous enumeration is currently unimplemented." ); $$ = nullptr;
-                                } else if ( $1->type->aggInst.aggregate->aggregate.anon ) { // handles struct or union
-                                        SemanticError( yylloc, "extern anonymous struct/union is currently unimplemented." ); $$ = nullptr;
-                                }
-                        }
-                }
         | IDENTIFIER IDENTIFIER
                 { IdentifierBeforeIdentifier( *$1.str, *$2.str, " declaration" ); $$ = nullptr; }
@@ -3119 +3103 @@
         | type_qualifier_list
                 {
-                        if ( $1->type->qualifiers.any() ) { SemanticError( yylloc, "CV qualifiers cannot be distributed; only storage-class and forall qualifiers." ); }
+                        if ( $1->type->qualifiers.val ) { SemanticError( yylloc, "CV qualifiers cannot be distributed; only storage-class and forall qualifiers." ); }
                         if ( $1->type->forall ) forall = true;          // remember generic type
                 }
@@ -3130 +3114 @@
         | declaration_qualifier_list
                 {
-                        if ( $1->type && $1->type->qualifiers.any() ) { SemanticError( yylloc, "CV qualifiers cannot be distributed; only storage-class and forall qualifiers." ); }
+                        if ( $1->type && $1->type->qualifiers.val ) { SemanticError( yylloc, "CV qualifiers cannot be distributed; only storage-class and forall qualifiers." ); }
                         if ( $1->type && $1->type->forall ) forall = true; // remember generic type
                 }
@@ -3141 +3125 @@
         | declaration_qualifier_list type_qualifier_list
                 {
-                        if ( ($1->type && $1->type->qualifiers.any()) || ($2->type && $2->type->qualifiers.any()) ) { SemanticError( yylloc, "CV qualifiers cannot be distributed; only storage-class and forall qualifiers." ); }
+                        if ( ($1->type && $1->type->qualifiers.val) || ($2->type && $2->type->qualifiers.val) ) { SemanticError( yylloc, "CV qualifiers cannot be distributed; only storage-class and forall qualifiers." ); }
                         if ( ($1->type && $1->type->forall) || ($2->type && $2->type->forall) ) forall = true; // remember generic type
                 }