Changeset 4d8fbf4 for src

Timestamp:

Sep 16, 2021, 2:22:01 PM (3 years ago)

Author:

caparsons <caparson@…>

Branches:

ADT, ast-experimental, enum, forall-pointer-decay, master, pthread-emulation, qualifiedEnum

Children:

432bffe, 7e7a076

Parents:

a8367eb (diff), 140eb16 (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) (3 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 : Sun Aug  8 09:14:44 2021
-// Update Count     : 5038
+// Last Modified On : Sat Sep 11 08:20:44 2021
+// Update Count     : 5040
 //
 
@@ -2446 +2446 @@
         | simple_assignment_operator initializer        { $$ = $1 == OperKinds::Assign ? $2 : $2->set_maybeConstructed( false ); }
         | '=' VOID                                                                      { $$ = new InitializerNode( true ); }
+        | '{' initializer_list_opt comma_opt '}'        { $$ = new InitializerNode( $2, true ); }
         ;
 
@@ -2459 +2460 @@
         | designation initializer                                       { $$ = $2->set_designators( $1 ); }
         | initializer_list_opt ',' initializer          { $$ = (InitializerNode *)( $1->set_last( $3 ) ); }
-        | initializer_list_opt ',' designation initializer
-                { $$ = (InitializerNode *)($1->set_last( $4->set_designators( $3 ) )); }
+        | initializer_list_opt ',' designation initializer { $$ = (InitializerNode *)($1->set_last( $4->set_designators( $3 ) )); }
         ;