Changeset ffec1bf for src/Parser/parser.yy

Timestamp:

Jul 25, 2022, 2:23:28 PM (3 years ago)

Author:

Fangren Yu <f37yu@…>

Branches:

ADT, ast-experimental, master, pthread-emulation, qualifiedEnum

Children:

4c48be0, 5cf1228, def751f

Parents:

9e23b446 (diff), 1f950c3b (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of plg.uwaterloo.ca:software/cfa/cfa-cc

File:

• src/Parser/parser.yy (modified) (8 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 May 14 09:16:22 2022
-// Update Count     : 5401
+// Last Modified On : Fri Jul  1 15:35:08 2022
+// Update Count     : 5405
 //
 
@@ -56 +56 @@
 
 #include "SynTree/Attribute.h"     // for Attribute
+
+// lex uses __null in a boolean context, it's fine.
+#pragma GCC diagnostic ignored "-Wparentheses-equality"
 
 extern DeclarationNode * parseTree;
@@ -1240 +1243 @@
                 {
                         $$ = new StatementNode( build_while( new CondCtl( nullptr, new ExpressionNode( build_constantInteger( *new string( "1" ) ) ) ), maybe_build_compound( $4 ) ) );
-                        SemanticWarning( yylloc, Warning::SuperfluousElse );
+                        SemanticWarning( yylloc, Warning::SuperfluousElse, "" );
                 }
         | WHILE '(' conditional_declaration ')' statement       %prec THEN
@@ -1251 +1254 @@
                 {
                         $$ = new StatementNode( build_do_while( new ExpressionNode( build_constantInteger( *new string( "1" ) ) ), maybe_build_compound( $2 ) ) );
-                        SemanticWarning( yylloc, Warning::SuperfluousElse );
+                        SemanticWarning( yylloc, Warning::SuperfluousElse, "" );
                 }
         | DO statement WHILE '(' comma_expression ')' ';'
@@ -1262 +1265 @@
                 {
                         $$ = 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
@@ -2394 +2397 @@
         | ENUM '(' cfa_abstract_parameter_declaration ')' attribute_list_opt '{' enumerator_list comma_opt '}'
                 {
-                        if ( $3->storageClasses.val != 0 || $3->type->qualifiers.val != 0 ) 
+                        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." ); }
 
@@ -2438 +2441 @@
         // empty
                 { $$ = nullptr; }
-        // | '=' constant_expression
-        //      { $$ = $2; }
-        | simple_assignment_operator initializer
-                { $$ = $1 == OperKinds::Assign ? $2 : $2->set_maybeConstructed( false ); }
+        | '=' constant_expression                                       { $$ = new InitializerNode( $2 ); }
+        | '=' '{' initializer_list_opt comma_opt '}' { $$ = new InitializerNode( $3, true ); }
+        // | simple_assignment_operator initializer
+        //      { $$ = $1 == OperKinds::Assign ? $2 : $2->set_maybeConstructed( false ); }
         ;
 
@@ -2841 +2844 @@
                         linkage = LinkageSpec::update( yylloc, linkage, $2 );
                 }
-          up external_definition down 
+          up external_definition down
                 {
                         linkage = linkageStack.top();