Changeset 25404c7 for src/Parser

Timestamp:

Jul 5, 2022, 9:36:59 AM (3 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

d4b37ab

Parents:

06bdba4 (diff), 9c6443e (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) (2 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
 //
 
@@ -2441 +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 ); }
         ;