Changeset 94b1022a for src/Parser/parser.yy

Timestamp:

May 30, 2018, 9:28:18 PM (6 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, with_gc

Children:

bd946e4

Parents:

35718a9 (diff), ae32d96 (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 plg2:software/cfa/cfa-cc

File:

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

src/Parser/parser.yy

@@ -175 +175 @@
         bool flag;
         CatchStmt::Kind catch_kind;
+        GenericExpr * genexpr;
 }
 
@@ -259 +260 @@
 %type<flag> asm_volatile_opt
 %type<en> handler_predicate_opt
+%type<genexpr> generic_association generic_assoc_list
 
 // statements
@@ -501 +503 @@
                 { SemanticError( yylloc, "Qualified name is currently unimplemented." ); $$ = nullptr; }
         | GENERIC '(' assignment_expression ',' generic_assoc_list ')' // C11
-                { SemanticError( yylloc, "_Generic is currently unimplemented." ); $$ = nullptr; }
+                {
+                        // add the missing control expression to the GenericExpr and return it
+                        $5->control = maybeMoveBuild<Expression>( $3 );
+                        $$ = new ExpressionNode( $5 );
+                }
         ;
 
 generic_assoc_list:                                                                             // C11
-        | generic_association
+        generic_association
         | generic_assoc_list ',' generic_association
+                {
+                        // steal the association node from the singleton and delete the wrapper
+                        $1->associations.splice($1->associations.end(), $3->associations);
+                        delete $3;
+                        $$ = $1;
+                }
         ;
 
 generic_association:                                                                    // C11
         type_no_function ':' assignment_expression
+                {
+                        // create a GenericExpr wrapper with one association pair
+                        $$ = new GenericExpr( nullptr, { { maybeMoveBuildType($1), maybeMoveBuild<Expression>($3) } } );
+                }
         | DEFAULT ':' assignment_expression
+                { $$ = new GenericExpr( nullptr, { { maybeMoveBuild<Expression>($3) } } ); }
         ;
 
@@ -2081 +2098 @@
                 { $$ = $2; }
         | '=' VOID
-                { $$ = nullptr; }
+                { $$ = new InitializerNode( true ); }
         | ATassign initializer
                 { $$ = $2->set_maybeConstructed( false ); }