Changes in src/Tuples/TupleExpansion.cc [64ac636:94a8123]

File:

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

src/Tuples/TupleExpansion.cc

@@ -194 +194 @@
                         }
                         BasicType * boolType = new BasicType( Type::Qualifiers(), BasicType::Bool );
-                        ObjectDecl * finished = new ObjectDecl( toString( "_unq_expr_finished_", id ), Type::StorageClasses(), LinkageSpec::Cforall, nullptr, new BasicType( Type::Qualifiers(), BasicType::Bool ), new SingleInit( new ConstantExpr( Constant( boolType->clone(), "0" ) ), noDesignators ) );
+                        ObjectDecl * finished = new ObjectDecl( toString( "_unq", id, "_finished_" ), Type::StorageClasses(), LinkageSpec::Cforall, nullptr, new BasicType( Type::Qualifiers(), BasicType::Bool ), new SingleInit( new ConstantExpr( Constant( boolType->clone(), "0" ) ), noDesignators ) );
                         addDeclaration( finished );
                         // (finished ? _unq_expr_N : (_unq_expr_N = <unqExpr->get_expr()>, finished = 1, _unq_expr_N))
@@ -225 +225 @@
                 if ( ! typeMap.count( tupleSize ) ) {
                         // generate struct type to replace tuple type based on the number of components in the tuple
-                        StructDecl * decl = new StructDecl( toString( "_tuple_type_", tupleSize  ) );
+                        StructDecl * decl = new StructDecl( toString( "_tuple", tupleSize, "_" ) );
                         decl->set_body( true );
                         for ( size_t i = 0; i < tupleSize; ++i ) {