Changes in src/Tuples/TupleExpansion.cc [d5556a3:4c8621ac]

File:

• src/Tuples/TupleExpansion.cc (modified) (3 diffs)

src/Tuples/TupleExpansion.cc

@@ -144 +144 @@
 
         Expression * MemberTupleExpander::mutate( UntypedMemberExpr * memberExpr ) {
-                if ( TupleExpr * tupleExpr = dynamic_cast< TupleExpr * > ( memberExpr->get_member() ) ) {
+                if ( UntypedTupleExpr * tupleExpr = dynamic_cast< UntypedTupleExpr * > ( memberExpr->get_member() ) ) {
                         Expression * aggr = memberExpr->get_aggregate()->clone()->acceptMutator( *this );
                         // aggregate expressions which might be impure must be wrapped in unique expressions
@@ -225 +225 @@
                                 decl->get_parameters().push_back( tyParam );
                         }
+                        if ( tupleType->size() == 0 ) {
+                                // empty structs are not standard C. Add a dummy field to empty tuples to silence warnings when a compound literal Tuple0 is created.
+                                decl->get_members().push_back( new ObjectDecl( "dummy", DeclarationNode::NoStorageClass, LinkageSpec::C, nullptr, new BasicType( Type::Qualifiers(), BasicType::SignedInt ), nullptr ) );
+                        }
                         typeMap[mangleName] = decl;
                         addDeclaration( decl );
@@ -315 +319 @@
                         qualifiers &= type->get_qualifiers();
                 } // for
+                if ( exprs.empty() ) qualifiers = Type::Qualifiers();
                 return tupleType;
+        }
+
+        TypeInstType * isTtype( Type * type ) {
+                if ( TypeInstType * inst = dynamic_cast< TypeInstType * >( type ) ) {
+                        if ( inst->get_baseType()->get_kind() == TypeDecl::Ttype ) {
+                                return inst;
+                        }
+                }
+                return nullptr;
         }