Changeset 3bd1eb4 for src

Timestamp:

May 15, 2017, 3:27:47 PM (9 years ago)

Author:

Thierry Delisle <tdelisle@…>

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, resolv-new, with_gc

Children:

db0fa7c

Parents:

dbfb35d (diff), 9ff8310 (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

Location:

src

Files:

• CodeGen/CodeGenerator.cc (modified) (9 diffs)
• CodeGen/CodeGenerator.h (modified) (7 diffs)
• CodeGen/GenType.cc (modified) (8 diffs)
• CodeGen/GenType.h (modified) (1 diff)
• CodeGen/Generate.cc (modified) (3 diffs)
• CodeGen/Generate.h (modified) (1 diff)
• CodeGen/LineStream.cc (deleted)
• CodeGen/LineStream.h (deleted)
• Common/utility.h (modified) (4 diffs)
• GenPoly/Box.cc (modified) (11 diffs)
• InitTweak/FixInit.cc (modified) (6 diffs)
• InitTweak/GenInit.cc (modified) (1 diff)
• libcfa/Makefile.am (modified) (2 diffs)
• libcfa/Makefile.in (modified) (2 diffs)
• libcfa/gmp (added)
• libcfa/iostream.c (modified) (2 diffs)
• libcfa/rational (modified) (2 diffs)
• libcfa/rational.c (modified) (12 diffs)
• libcfa/stdlib (modified) (3 diffs)
• libcfa/stdlib.c (modified) (10 diffs)
• main.cc (modified) (7 diffs)
• prelude/Makefile.am (modified) (1 diff)
• prelude/Makefile.in (modified) (1 diff)
• tests/.expect/32/KRfunctions.txt (modified) (1 diff)
• tests/.expect/32/attributes.txt (modified) (7 diffs)
• tests/.expect/32/declarationSpecifier.txt (modified) (24 diffs)
• tests/.expect/32/extension.txt (modified) (2 diffs)
• tests/.expect/32/gccExtensions.txt (modified) (4 diffs)
• tests/.expect/64/KRfunctions.txt (modified) (1 diff)
• tests/.expect/64/attributes.txt (modified) (7 diffs)
• tests/.expect/64/declarationSpecifier.txt (modified) (24 diffs)
• tests/.expect/64/extension.txt (modified) (2 diffs)
• tests/.expect/64/gccExtensions.txt (modified) (4 diffs)
• tests/.expect/concurrent/sched-int-wait.txt (modified) (1 diff)
• tests/.expect/genericUnion.txt (added)
• tests/.expect/gmp.txt (added)
• tests/.expect/memberCtors-ERR1.txt (modified) (1 diff)
• tests/.expect/memberCtors.txt (modified) (4 diffs)
• tests/.expect/rational.txt (modified) (1 diff)
• tests/Makefile.am (modified) (3 diffs)
• tests/Makefile.in (modified) (3 diffs)
• tests/genericUnion.c (added)
• tests/gmp.c (added)
• tests/memberCtors.c (modified) (1 diff)
• tests/rational.c (modified) (3 diffs)
• tests/sched-int-wait.c (modified) (2 diffs)
• tests/test.py (modified) (7 diffs)

src/CodeGen/CodeGenerator.cc

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Andrew Beach
-// Last Modified On : Tus May  9 16:50:00 2017
+// Last Modified On : Wed May 10 14:45:00 2017
 // Update Count     : 484
 //
@@ -41 +41 @@
 namespace CodeGen {
         int CodeGenerator::tabsize = 4;
-
-        // Pseudo Function: output << lineDirective(currentNode);
-    struct lineDirective {
-        CodeLocation const & loc;
-                lineDirective(CodeLocation const & location) : loc(location) {}
-                lineDirective(BaseSyntaxNode const * node) : loc(node->location) {}
-        };
-        std::ostream & operator<<(std::ostream & out, lineDirective const & ld) {
-                if (ld.loc.isSet())
-                        return out << "\n# " << ld.loc.linenumber << " \""
-                                << ld.loc.filename << "\"\n";
-                return out << "\n// Unset Location\n";
-        }
 
         // the kinds of statements that would ideally be followed by whitespace
@@ -102 +89 @@
         }
 
-        CodeGenerator::CodeGenerator( std::ostream & os, bool pretty, bool genC ) : indent( *this), cur_indent( 0 ), insideFunction( false ), output( os ), printLabels( *this ), pretty( pretty ), genC( genC ) {}
+        CodeGenerator::LineMarker::LineMarker(
+                        CodeLocation const & loc, bool toPrint) :
+                loc(loc), toPrint(toPrint)
+        {}
+
+        CodeGenerator::LineMarker CodeGenerator::lineDirective(
+                        BaseSyntaxNode const * node) {
+                return LineMarker(node->location, lineMarks);
+        }
+
+        std::ostream & operator<<(std::ostream & out,
+                        CodeGenerator::LineMarker const & marker) {
+                if (marker.toPrint && marker.loc.isSet()) {
+                        return out << "\n# " << marker.loc.linenumber << " \""
+                                << marker.loc.filename << "\"\n";
+                } else if (marker.toPrint) {
+                        return out << "\n/* Missing CodeLocation */\n";
+                } else {
+                return out;
+                }
+        }
+
+        CodeGenerator::CodeGenerator( std::ostream & os, bool pretty, bool genC, bool lineMarks ) : indent( *this), cur_indent( 0 ), insideFunction( false ), output( os ), printLabels( *this ), pretty( pretty ), genC( genC ), lineMarks( lineMarks ) {}
 
         CodeGenerator::CodeGenerator( std::ostream & os, std::string init, int indentation, bool infunp )
@@ -143 +152 @@
         // *** Declarations
         void CodeGenerator::visit( FunctionDecl * functionDecl ) {
-                output << lineDirective( functionDecl );
-
                 extension( functionDecl );
                 genAttributes( functionDecl->get_attributes() );
@@ -168 +175 @@
                 }
 
-                output << lineDirective( objectDecl );
-
                 extension( objectDecl );
                 genAttributes( objectDecl->get_attributes() );
@@ -221 +226 @@
 
         void CodeGenerator::visit( StructDecl * structDecl ) {
-                output << lineDirective( structDecl );
-
                 extension( structDecl );
                 handleAggregate( structDecl, "struct " );
@@ -228 +231 @@
 
         void CodeGenerator::visit( UnionDecl * unionDecl ) {
-                output << lineDirective( unionDecl );
-
                 extension( unionDecl );
                 handleAggregate( unionDecl, "union " );
@@ -708 +709 @@
         void CodeGenerator::visit( UntypedTupleExpr * tupleExpr ) {
                 assertf( ! genC, "UntypedTupleExpr should not reach code generation." );
+                extension( tupleExpr );
                 output << "[";
                 genCommaList( tupleExpr->get_exprs().begin(), tupleExpr->get_exprs().end() );
@@ -715 +717 @@
         void CodeGenerator::visit( TupleExpr * tupleExpr ) {
                 assertf( ! genC, "TupleExpr should not reach code generation." );
+                extension( tupleExpr );
                 output << "[";
                 genCommaList( tupleExpr->get_exprs().begin(), tupleExpr->get_exprs().end() );
                 output << "]";
+        }
+
+        void CodeGenerator::visit( TupleIndexExpr * tupleExpr ) {
+                assertf( ! genC, "TupleIndexExpr should not reach code generation." );
+                extension( tupleExpr );
+                tupleExpr->get_tuple()->accept( *this );
+                output << "." << tupleExpr->get_index();
         }
 

src/CodeGen/CodeGenerator.h

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Mar  1 16:20:04 2017
-// Update Count     : 50
+// Last Modified By : Andrew Beach
+// Last Modified On : Wed May 10 10:57:00 2017
+// Update Count     : 51
 //
 
@@ -25 +25 @@
 #include "SymTab/Indexer.h"
 
+#include "Common/utility.h"
+
 namespace CodeGen {
         class CodeGenerator : public Visitor {
@@ -30 +32 @@
                 static int tabsize;
 
-                CodeGenerator( std::ostream &os, bool pretty = false, bool genC = false );
+                CodeGenerator( std::ostream &os, bool pretty = false, bool genC = false, bool lineMarks = false );
                 CodeGenerator( std::ostream &os, std::string, int indent = 0, bool infun = false );
                 CodeGenerator( std::ostream &os, char *, int indent = 0, bool infun = false );
@@ -74 +76 @@
                 virtual void visit( UntypedTupleExpr *tupleExpr );
                 virtual void visit( TupleExpr *tupleExpr );
+                virtual void visit( TupleIndexExpr * tupleExpr );
                 virtual void visit( TypeExpr *typeExpr );
                 virtual void visit( AsmExpr * );
@@ -110 +113 @@
                 };
 
+                struct LineMarker {
+                        CodeLocation const & loc;
+                        bool toPrint;
+
+                        LineMarker(CodeLocation const & loc, bool toPrint);
+                };
+
+                LineMarker lineDirective(BaseSyntaxNode const * node);
+
                 void asmName( DeclarationWithType *decl );
 
@@ -122 +134 @@
                 bool pretty = false;  // pretty print
                 bool genC = false;    // true if output has to be C code
+                bool lineMarks = false;
 
                 void printDesignators( std::list< Expression * > & );
@@ -149 +162 @@
         /// returns C-compatible name of declaration
         std::string genName( DeclarationWithType * decl );
+
+        std::ostream & operator<<(std::ostream &,
+                CodeGenerator::LineMarker const &);
 } // namespace CodeGen
 

src/CodeGen/GenType.cc

@@ -28 +28 @@
         class GenType : public Visitor {
           public:
-                GenType( const std::string &typeString, bool pretty = false, bool genC = false );
+                GenType( const std::string &typeString, bool pretty = false, bool genC = false, bool lineMarks = false );
                 std::string get_typeString() const { return typeString; }
                 void set_typeString( const std::string &newValue ) { typeString = newValue; }
@@ -54 +54 @@
                 bool pretty = false; // pretty print
                 bool genC = false;   // generating C code?
+                bool lineMarks = false;
         };
 
-        std::string genType( Type *type, const std::string &baseString, bool pretty, bool genC ) {
-                GenType gt( baseString, pretty, genC );
+        std::string genType( Type *type, const std::string &baseString, bool pretty, bool genC , bool lineMarks ) {
+                GenType gt( baseString, pretty, genC, lineMarks );
                 std::ostringstream os;
 
                 if ( ! type->get_attributes().empty() ) {
-                        CodeGenerator cg( os, pretty, genC );
+                        CodeGenerator cg( os, pretty, genC, lineMarks );
                         cg.genAttributes( type->get_attributes() );
                 } // if
@@ -73 +74 @@
   }
 
-        GenType::GenType( const std::string &typeString, bool pretty, bool genC ) : typeString( typeString ), pretty( pretty ), genC( genC ) {}
+        GenType::GenType( const std::string &typeString, bool pretty, bool genC, bool lineMarks ) : typeString( typeString ), pretty( pretty ), genC( genC ), lineMarks( lineMarks ) {}
 
         void GenType::visit( VoidType *voidType ) {
@@ -114 +115 @@
                 } // if
                 if ( dimension != 0 ) {
-                        CodeGenerator cg( os, pretty, genC );
+                        CodeGenerator cg( os, pretty, genC, lineMarks );
                         dimension->accept( cg );
                 } else if ( isVarLen ) {
@@ -168 +169 @@
                         } // if
                 } else {
-                        CodeGenerator cg( os, pretty, genC );
+                        CodeGenerator cg( os, pretty, genC, lineMarks );
                         os << "(" ;
 
@@ -191 +192 @@
                         // assertf( ! genC, "Aggregate type parameters should not reach code generation." );
                         std::ostringstream os;
-                        CodeGenerator cg( os, pretty, genC );
+                        CodeGenerator cg( os, pretty, genC, lineMarks );
                         os << "forall(";
                         cg.genCommaList( funcType->get_forall().begin(), funcType->get_forall().end() );
@@ -202 +203 @@
                 if ( ! refType->get_parameters().empty() ) {
                         std::ostringstream os;
-                        CodeGenerator cg( os, pretty, genC );
+                        CodeGenerator cg( os, pretty, genC, lineMarks );
                         os << "(";
                         cg.genCommaList( refType->get_parameters().begin(), refType->get_parameters().end() );
@@ -242 +243 @@
                 for ( Type * t : *tupleType ) {
                         i++;
-                        os << genType( t, "", pretty, genC ) << (i == tupleType->size() ? "" : ", ");
+                        os << genType( t, "", pretty, genC, lineMarks ) << (i == tupleType->size() ? "" : ", ");
                 }
                 os << "]";

src/CodeGen/GenType.h

@@ -21 +21 @@
 
 namespace CodeGen {
-        std::string genType( Type *type, const std::string &baseString, bool pretty = false, bool genC = false );
+        std::string genType( Type *type, const std::string &baseString, bool pretty = false, bool genC = false, bool lineMarks = false );
   std::string genPrettyType( Type * type, const std::string & baseString );
 } // namespace CodeGen

src/CodeGen/Generate.cc

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Jun  4 14:04:25 2015
-// Update Count     : 5
+// Last Modified By : Andrew Beach
+// Last Modified On : Wed May 19 13:05:00 2017
+// Update Count     : 6
 //
 
@@ -31 +31 @@
 
 namespace CodeGen {
-        void generate( std::list< Declaration* > translationUnit, std::ostream &os, bool doIntrinsics, bool pretty, bool generateC ) {
-                CodeGen::CodeGenerator cgv( os, pretty, generateC );
+        void generate( std::list< Declaration* > translationUnit, std::ostream &os, bool doIntrinsics, bool pretty, bool generateC, bool lineMarks ) {
+                CodeGen::CodeGenerator cgv( os, pretty, generateC, lineMarks );
                 for ( auto & dcl : translationUnit ) {
                         if ( LinkageSpec::isGeneratable( dcl->get_linkage() ) && (doIntrinsics || ! LinkageSpec::isBuiltin( dcl->get_linkage() ) ) ) {
+                                os << cgv.lineDirective(dcl);
                                 dcl->accept(cgv);
                                 if ( doSemicolon( dcl ) ) {
@@ -48 +49 @@
                         os << CodeGen::genPrettyType( type, "" );
                 } else {
-                        CodeGen::CodeGenerator cgv( os, true, false );
+                        CodeGen::CodeGenerator cgv( os, true, false, false );
                         node->accept( cgv );
                 }

src/CodeGen/Generate.h

@@ -24 +24 @@
 namespace CodeGen {
         /// Generates code. doIntrinsics determines if intrinsic functions are printed, pretty formats output nicely (e.g., uses unmangled names, etc.), generateC is true when the output must consist only of C code (allows some assertions, etc.)
-        void generate( std::list< Declaration* > translationUnit, std::ostream &os, bool doIntrinsics, bool pretty, bool generateC = false );
+        void generate( std::list< Declaration* > translationUnit, std::ostream &os, bool doIntrinsics, bool pretty, bool generateC = false , bool lineMarks = false );
 
         /// Generate code for a single node -- helpful for debugging in gdb

src/Common/utility.h

@@ -322 +322 @@
         std::string filename;
 
-    /// Create a new unset CodeLocation.
+        /// Create a new unset CodeLocation.
         CodeLocation()
                 : linenumber( -1 )
@@ -328 +328 @@
         {}
 
-    /// Create a new CodeLocation with the given values.
+        /// Create a new CodeLocation with the given values.
         CodeLocation( const char* filename, int lineno )
                 : linenumber( lineno )
@@ -334 +334 @@
         {}
 
-    bool isSet () const {
-        return -1 != linenumber;
-    }
-
-    bool isUnset () const {
-        return !isSet();
-    }
+        bool isSet () const {
+                return -1 != linenumber;
+        }
+
+        bool isUnset () const {
+                return !isSet();
+        }
 
         void unset () {
@@ -353 +353 @@
         return location.isSet() ? location.filename + ":" + std::to_string(location.linenumber) + " " : "";
 }
+
 #endif // _UTILITY_H
 

src/GenPoly/Box.cc

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Mar 17 09:06:37 2017
-// Update Count     : 339
+// Last Modified On : Sat May 13 09:26:38 2017
+// Update Count     : 341
 //
 
@@ -706 +706 @@
                                 Type *concrete = env->lookup( typeInst->get_name() );
                                 if ( concrete == 0 ) {
+                                        return typeInst;
                                         // xxx - should this be an assertion?
-                                        std::string x = env ? toString( *env ) : "missing env";
-                                        throw SemanticError( x + "\n" + "Unbound type variable " + typeInst->get_name() + " in ", appExpr );
+//                                      std::string x = env ? toString( *env ) : "missing env";
+//                                      throw SemanticError( x + "\n" + "Unbound type variable " + typeInst->get_name() + " in ", appExpr );
                                 } // if
                                 return concrete;
@@ -764 +765 @@
                                         } else {
                                                 arg = new AddressExpr( arg );
+                                        }
+                                        if ( ! ResolvExpr::typesCompatible( param, arg->get_result(), SymTab::Indexer() ) ) {
+                                                // silence warnings by casting boxed parameters when the actual type does not match up with the formal type.
+                                                arg = new CastExpr( arg, param->clone() );
                                         }
                                 } else {
@@ -902 +907 @@
                                 } // if
                                 UntypedExpr *assign = new UntypedExpr( new NameExpr( "?=?" ) );
-                                UntypedExpr *deref = new UntypedExpr( new NameExpr( "*?" ) );
-                                deref->get_args().push_back( new CastExpr( new VariableExpr( *param++ ), new PointerType( Type::Qualifiers(), realType->get_returnVals().front()->get_type()->clone() ) ) );
+                                UntypedExpr *deref = UntypedExpr::createDeref( new CastExpr( new VariableExpr( *param++ ), new PointerType( Type::Qualifiers(), realType->get_returnVals().front()->get_type()->clone() ) ) );
                                 assign->get_args().push_back( deref );
                                 addAdapterParams( adapteeApp, arg, param, adapterType->get_parameters().end(), realParam, tyVars );
@@ -1217 +1221 @@
 
                 Statement * Pass1::mutate( ReturnStmt *returnStmt ) {
-                        // maybe need access to the env when mutating the expr
-                        if ( Expression * expr = returnStmt->get_expr() ) {
-                                if ( expr->get_env() ) {
-                                        env = expr->get_env();
-                                }
-                        }
-
                         if ( retval && returnStmt->get_expr() ) {
                                 assert( returnStmt->get_expr()->has_result() && ! returnStmt->get_expr()->get_result()->isVoid() );
@@ -1302 +1299 @@
                         FunctionType * ftype = functionDecl->get_functionType();
                         if ( ! ftype->get_returnVals().empty() && functionDecl->get_statements() ) {
-                                if ( functionDecl->get_name() != "?=?" && ! isPrefix( functionDecl->get_name(), "_thunk" ) && ! isPrefix( functionDecl->get_name(), "_adapter" ) ) { // xxx - remove check for ?=? once reference types are in; remove check for prefix once thunks properly use ctor/dtors
+                                if ( ! isPrefix( functionDecl->get_name(), "_thunk" ) && ! isPrefix( functionDecl->get_name(), "_adapter" ) ) { // xxx - remove check for prefix once thunks properly use ctor/dtors
                                         assert( ftype->get_returnVals().size() == 1 );
                                         DeclarationWithType * retval = ftype->get_returnVals().front();
@@ -1539 +1536 @@
                                         Type *declType = objectDecl->get_type();
                                         std::string bufName = bufNamer.newName();
-                                        ObjectDecl *newBuf = new ObjectDecl( bufName, Type::StorageClasses(), LinkageSpec::C, 0, 
-                                                new ArrayType( Type::Qualifiers(), new BasicType( Type::Qualifiers(), BasicType::Kind::Char), new NameExpr( sizeofName( mangleType(declType) ) ), 
+                                        ObjectDecl *newBuf = new ObjectDecl( bufName, Type::StorageClasses(), LinkageSpec::C, 0,
+                                                new ArrayType( Type::Qualifiers(), new BasicType( Type::Qualifiers(), BasicType::Kind::Char), new NameExpr( sizeofName( mangleType(declType) ) ),
                                                 true, false, std::list<Attribute*>{ new Attribute( std::string{"aligned"}, std::list<Expression*>{ new ConstantExpr( Constant::from_int(8) ) } ) } ), 0 );
                                         stmtsToAdd.push_back( new DeclStmt( noLabels, newBuf ) );
@@ -1578 +1575 @@
                 }
 
-                /// Returns an expression dereferenced n times
-                Expression *makeDerefdVar( Expression *derefdVar, long n ) {
-                        for ( int i = 1; i < n; ++i ) {
-                                UntypedExpr *derefExpr = new UntypedExpr( new NameExpr( "*?" ) );
-                                derefExpr->get_args().push_back( derefdVar );
-                                // xxx - should set results on derefExpr
-                                derefdVar = derefExpr;
-                        }
-                        return derefdVar;
-                }
-
                 Expression *PolyGenericCalculator::mutate( MemberExpr *memberExpr ) {
                         // mutate, exiting early if no longer MemberExpr
@@ -1595 +1581 @@
                         if ( ! memberExpr ) return expr;
 
-                        // get declaration for base struct, exiting early if not found
-                        int varDepth;
-                        VariableExpr *varExpr = getBaseVar( memberExpr->get_aggregate(), &varDepth );
-                        if ( ! varExpr ) return memberExpr;
-                        ObjectDecl *objectDecl = dynamic_cast< ObjectDecl* >( varExpr->get_var() );
-                        if ( ! objectDecl ) return memberExpr;
-
                         // only mutate member expressions for polymorphic types
                         int tyDepth;
-                        Type *objectType = hasPolyBase( objectDecl->get_type(), scopeTyVars, &tyDepth );
+                        Type *objectType = hasPolyBase( memberExpr->get_aggregate()->get_result(), scopeTyVars, &tyDepth );
                         if ( ! objectType ) return memberExpr;
                         findGeneric( objectType ); // ensure layout for this type is available
@@ -1622 +1601 @@
                                 fieldLoc->get_args().push_back( aggr );
                                 fieldLoc->get_args().push_back( makeOffsetIndex( objectType, i ) );
+                                fieldLoc->set_result( memberExpr->get_result()->clone() );
                                 newMemberExpr = fieldLoc;
                         } else if ( dynamic_cast< UnionInstType* >( objectType ) ) {
-                                // union members are all at offset zero, so build appropriately-dereferenced variable
-                                newMemberExpr = makeDerefdVar( varExpr->clone(), varDepth );
+                                // union members are all at offset zero, so just use the aggregate expr
+                                Expression * aggr = memberExpr->get_aggregate()->clone();
+                                delete aggr->get_env(); // xxx - there's a problem with keeping the env for some reason, so for now just get rid of it
+                                aggr->set_env( nullptr );
+                                newMemberExpr = aggr;
+                                newMemberExpr->set_result( memberExpr->get_result()->clone() );
                         } else return memberExpr;
                         assert( newMemberExpr );
@@ -1633 +1617 @@
                                 // Not all members of a polymorphic type are themselves of polymorphic type; in this case the member expression should be wrapped and dereferenced to form an lvalue
                                 CastExpr *ptrCastExpr = new CastExpr( newMemberExpr, new PointerType( Type::Qualifiers(), memberType->clone() ) );
-                                UntypedExpr *derefExpr = new UntypedExpr( new NameExpr( "*?" ) );
-                                derefExpr->get_args().push_back( ptrCastExpr );
+                                UntypedExpr *derefExpr = UntypedExpr::createDeref( ptrCastExpr );
                                 newMemberExpr = derefExpr;
                         }

src/InitTweak/FixInit.cc

@@ -361 +361 @@
                                         FunctionType * ftype = dynamic_cast< FunctionType * >( GenPoly::getFunctionType( funcDecl->get_type() ) );
                                         assert( ftype );
-                                        if ( (isConstructor( funcDecl->get_name() ) || funcDecl->get_name() == "?=?") && ftype->get_parameters().size() == 2 ) {
+                                        if ( isConstructor( funcDecl->get_name() ) && ftype->get_parameters().size() == 2 ) {
                                                 Type * t1 = ftype->get_parameters().front()->get_type();
                                                 Type * t2 = ftype->get_parameters().back()->get_type();
@@ -367 +367 @@
 
                                                 if ( ResolvExpr::typesCompatible( ptrType->get_base(), t2, SymTab::Indexer() ) ) {
-                                                        // optimization: don't need to copy construct in order to call a copy constructor or
-                                                        // assignment operator
+                                                        // optimization: don't need to copy construct in order to call a copy constructor
                                                         return appExpr;
                                                 } // if
@@ -636 +635 @@
                                 assert( ! stmtExpr->get_returnDecls().empty() );
                                 body->get_kids().push_back( new ExprStmt( noLabels, new VariableExpr( stmtExpr->get_returnDecls().front() ) ) );
-                        }
-                        stmtExpr->get_returnDecls().clear();
-                        stmtExpr->get_dtors().clear();
+                                stmtExpr->get_returnDecls().clear();
+                                stmtExpr->get_dtors().clear();
+                        }
+                        assert( stmtExpr->get_returnDecls().empty() );
+                        assert( stmtExpr->get_dtors().empty() );
                         return stmtExpr;
                 }
@@ -655 +656 @@
                                 unqExpr->set_result( maybeClone( unqExpr->get_expr()->get_result() ) );
                                 if ( unqCount[ unqExpr->get_id() ] == 0 ) {  // insert destructor after the last use of the unique expression
-                                        stmtsToAdd.splice( stmtsToAddAfter.end(), dtors[ unqExpr->get_id() ] );
+                                        stmtsToAddAfter.splice( stmtsToAddAfter.end(), dtors[ unqExpr->get_id() ] );
                                 }
                                 if ( addDeref.count( unqExpr->get_id() ) ) {
@@ -667 +668 @@
                         stmtsToAdd.splice( stmtsToAdd.end(), fixer.stmtsToAdd );
                         unqMap[unqExpr->get_id()] = unqExpr;
+                        if ( unqCount[ unqExpr->get_id() ] == 0 ) {  // insert destructor after the last use of the unique expression
+                                stmtsToAddAfter.splice( stmtsToAddAfter.end(), dtors[ unqExpr->get_id() ] );
+                        } else { // remember dtors for last instance of unique expr
+                                dtors[ unqExpr->get_id() ] = fixer.stmtsToAddAfter;
+                        }
                         if ( UntypedExpr * deref = dynamic_cast< UntypedExpr * >( unqExpr->get_expr() ) ) {
                                 // unique expression is now a dereference, because the inner expression is an lvalue returning function call.
@@ -675 +681 @@
                                 getCallArg( deref, 0 ) = unqExpr;
                                 addDeref.insert( unqExpr->get_id() );
-                                if ( unqCount[ unqExpr->get_id() ] == 0 ) {  // insert destructor after the last use of the unique expression
-                                        stmtsToAdd.splice( stmtsToAddAfter.end(), dtors[ unqExpr->get_id() ] );
-                                } else { // remember dtors for last instance of unique expr
-                                        dtors[ unqExpr->get_id() ] = fixer.stmtsToAddAfter;
-                                }
                                 return deref;
                         }

src/InitTweak/GenInit.cc

@@ -142 +142 @@
                 // hands off if the function returns an lvalue - we don't want to allocate a temporary if a variable's address
                 // is being returned
-                // Note: under the assumption that assignments return *this, checking for ?=? here is an optimization, since it shouldn't be necessary to copy construct `this`. This is a temporary optimization until reference types are added, at which point this should be removed, along with the analogous optimization in copy constructor generation.
-                if ( returnStmt->get_expr() && returnVals.size() == 1 && funcName != "?=?" && ! returnVals.front()->get_type()->get_lvalue() ) {
+                if ( returnStmt->get_expr() && returnVals.size() == 1 && ! returnVals.front()->get_type()->get_lvalue() ) {
                         // explicitly construct the return value using the return expression and the retVal object
                         assertf( returnVals.front()->get_name() != "", "Function %s has unnamed return value\n", funcName.c_str() );

src/libcfa/Makefile.am

@@ -11 +11 @@
 ## Created On       : Sun May 31 08:54:01 2015
 ## Last Modified By : Peter A. Buhr
-## Last Modified On : Sat Mar 25 18:00:10 2017
-## Update Count     : 212
+## Last Modified On : Sun May 14 21:04:21 2017
+## Update Count     : 214
 ###############################################################################
 
@@ -76 +76 @@
 
 cfa_includedir = $(CFA_INCDIR)
-nobase_cfa_include_HEADERS = ${headers} ${stdhdr} concurrency/invoke.h
+nobase_cfa_include_HEADERS = ${headers} ${stdhdr} gmp concurrency/invoke.h
 
 CLEANFILES = libcfa-prelude.c

src/libcfa/Makefile.in

@@ -183 +183 @@
         containers/vector concurrency/coroutine concurrency/thread \
         concurrency/kernel concurrency/monitor ${shell echo stdhdr/*} \
-        concurrency/invoke.h
+        gmp concurrency/invoke.h
 HEADERS = $(nobase_cfa_include_HEADERS)
 ETAGS = etags
@@ -324 +324 @@
 stdhdr = ${shell echo stdhdr/*}
 cfa_includedir = $(CFA_INCDIR)
-nobase_cfa_include_HEADERS = ${headers} ${stdhdr} concurrency/invoke.h
+nobase_cfa_include_HEADERS = ${headers} ${stdhdr} gmp concurrency/invoke.h
 CLEANFILES = libcfa-prelude.c
 all: all-am

src/libcfa/iostream.c

@@ -10 +10 @@
 // Created On       : Wed May 27 17:56:53 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Mar 23 08:20:40 2017
-// Update Count     : 367
+// Last Modified On : Mon May  8 18:24:23 2017
+// Update Count     : 369
 //
 
@@ -160 +160 @@
                 [(unsigned char)'¡'] : Open, [(unsigned char)'¿'] : Open, [(unsigned char)'«'] : Open,
                 // closing delimiters, no space before
-                [','] : Close, ['.'] : Close, [':'] : Close, [';'] : Close, ['!'] : Close, ['?'] : Close,
+                [','] : Close, ['.'] : Close, [';'] : Close, ['!'] : Close, ['?'] : Close,
                 ['%'] : Close, [(unsigned char)'¢'] : Close, [(unsigned char)'»'] : Close,
                 [')'] : Close, [']'] : Close, ['}'] : Close,
                 // opening-closing delimiters, no space before or after
-                ['\''] : OpenClose, ['`'] : OpenClose, ['"'] : OpenClose,
+                ['\''] : OpenClose, ['`'] : OpenClose, ['"'] : OpenClose, [':'] : OpenClose,
                 [' '] : OpenClose, ['\f'] : OpenClose, ['\n'] : OpenClose, ['\r'] : OpenClose, ['\t'] : OpenClose, ['\v'] : OpenClose, // isspace
         }; // mask

src/libcfa/rational

@@ -12 +12 @@
 // Created On       : Wed Apr  6 17:56:25 2016
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Mon May  1 08:25:06 2017
-// Update Count     : 33
+// Last Modified On : Sun May 14 16:49:13 2017
+// Update Count     : 78
 //
 
@@ -21 +21 @@
 #include "iostream"
 
+trait scalar( otype T ) {
+};
+
+trait arithmetic( otype T | scalar( T ) ) {
+        int !?( T );
+        int ?==?( T, T );
+        int ?!=?( T, T );
+        int ?<?( T, T );
+        int ?<=?( T, T );
+        int ?>?( T, T );
+        int ?>=?( T, T );
+        void ?{}( T *, zero_t );
+        void ?{}( T *, one_t );
+        T +?( T );
+        T -?( T );
+        T ?+?( T, T );
+        T ?-?( T, T );
+        T ?*?( T, T );
+        T ?/?( T, T );
+        T ?%?( T, T );
+        T ?/=?( T *, T );
+        T abs( T );
+};
+
 // implementation
-typedef long int RationalImpl;
+
+forall ( otype RationalImpl | arithmetic( RationalImpl ) )
 struct Rational {
-        RationalImpl numerator, denominator;                                    // invariant: denominator > 0
+        RationalImpl numerator, denominator;                            // invariant: denominator > 0
 }; // Rational
 
-// constants
-extern struct Rational 0;
-extern struct Rational 1;
+// constructors
 
-// constructors
-void ?{}( Rational * r );
-void ?{}( Rational * r, RationalImpl n );
-void ?{}( Rational * r, RationalImpl n, RationalImpl d );
+forall ( otype RationalImpl | arithmetic( RationalImpl ) )
+void ?{}( Rational(RationalImpl) * r );
+
+forall ( otype RationalImpl | arithmetic( RationalImpl ) )
+void ?{}( Rational(RationalImpl) * r, RationalImpl n );
+
+forall ( otype RationalImpl | arithmetic( RationalImpl ) )
+void ?{}( Rational(RationalImpl) * r, RationalImpl n, RationalImpl d );
+
+forall ( otype RationalImpl | arithmetic( RationalImpl ) )
+void ?{}( Rational(RationalImpl) * r, zero_t );
+
+forall ( otype RationalImpl | arithmetic( RationalImpl ) )
+void ?{}( Rational(RationalImpl) * r, one_t );
 
 // getter for numerator/denominator
-RationalImpl numerator( Rational r );
-RationalImpl denominator( Rational r );
-[ RationalImpl, RationalImpl ] ?=?( * [ RationalImpl, RationalImpl ] dest, Rational src );
+
+forall ( otype RationalImpl | arithmetic( RationalImpl ) )
+RationalImpl numerator( Rational(RationalImpl) r );
+
+forall ( otype RationalImpl | arithmetic( RationalImpl ) )
+RationalImpl denominator( Rational(RationalImpl) r );
+forall ( otype RationalImpl | arithmetic( RationalImpl ) )
+[ RationalImpl, RationalImpl ] ?=?( * [ RationalImpl, RationalImpl ] dest, Rational(RationalImpl) src );
+
 // setter for numerator/denominator
-RationalImpl numerator( Rational r, RationalImpl n );
-RationalImpl denominator( Rational r, RationalImpl d );
+
+forall ( otype RationalImpl | arithmetic( RationalImpl ) )
+RationalImpl numerator( Rational(RationalImpl) r, RationalImpl n );
+
+forall ( otype RationalImpl | arithmetic( RationalImpl ) )
+RationalImpl denominator( Rational(RationalImpl) r, RationalImpl d );
 
 // comparison
-int ?==?( Rational l, Rational r );
-int ?!=?( Rational l, Rational r );
-int ?<?( Rational l, Rational r );
-int ?<=?( Rational l, Rational r );
-int ?>?( Rational l, Rational r );
-int ?>=?( Rational l, Rational r );
+
+forall ( otype RationalImpl | arithmetic( RationalImpl ) )
+int ?==?( Rational(RationalImpl) l, Rational(RationalImpl) r );
+
+forall ( otype RationalImpl | arithmetic( RationalImpl ) )
+int ?!=?( Rational(RationalImpl) l, Rational(RationalImpl) r );
+
+forall ( otype RationalImpl | arithmetic( RationalImpl ) )
+int ?<?( Rational(RationalImpl) l, Rational(RationalImpl) r );
+
+forall ( otype RationalImpl | arithmetic( RationalImpl ) )
+int ?<=?( Rational(RationalImpl) l, Rational(RationalImpl) r );
+
+forall ( otype RationalImpl | arithmetic( RationalImpl ) )
+int ?>?( Rational(RationalImpl) l, Rational(RationalImpl) r );
+
+forall ( otype RationalImpl | arithmetic( RationalImpl ) )
+int ?>=?( Rational(RationalImpl) l, Rational(RationalImpl) r );
 
 // arithmetic
-Rational -?( Rational r );
-Rational ?+?( Rational l, Rational r );
-Rational ?-?( Rational l, Rational r );
-Rational ?*?( Rational l, Rational r );
-Rational ?/?( Rational l, Rational r );
+
+forall ( otype RationalImpl | arithmetic( RationalImpl ) )
+Rational(RationalImpl) +?( Rational(RationalImpl) r );
+
+forall ( otype RationalImpl | arithmetic( RationalImpl ) )
+Rational(RationalImpl) -?( Rational(RationalImpl) r );
+
+forall ( otype RationalImpl | arithmetic( RationalImpl ) )
+Rational(RationalImpl) ?+?( Rational(RationalImpl) l, Rational(RationalImpl) r );
+
+forall ( otype RationalImpl | arithmetic( RationalImpl ) )
+Rational(RationalImpl) ?-?( Rational(RationalImpl) l, Rational(RationalImpl) r );
+
+forall ( otype RationalImpl | arithmetic( RationalImpl ) )
+Rational(RationalImpl) ?*?( Rational(RationalImpl) l, Rational(RationalImpl) r );
+
+forall ( otype RationalImpl | arithmetic( RationalImpl ) )
+Rational(RationalImpl) ?/?( Rational(RationalImpl) l, Rational(RationalImpl) r );
 
 // conversion
-double widen( Rational r );
-Rational narrow( double f, RationalImpl md );
+// forall ( otype RationalImpl | arithmetic( RationalImpl ) )
+// double widen( Rational(RationalImpl) r );
+// forall ( otype RationalImpl | arithmetic( RationalImpl ) )
+// Rational(RationalImpl) narrow( double f, RationalImpl md );
 
 // I/O
-forall( dtype istype | istream( istype ) ) istype * ?|?( istype *, Rational * );
-forall( dtype ostype | ostream( ostype ) ) ostype * ?|?( ostype *, Rational );
+forall ( otype RationalImpl | arithmetic( RationalImpl ) )
+forall( dtype istype | istream( istype ) | { istype * ?|?( istype *, RationalImpl * ); } )
+istype * ?|?( istype *, Rational(RationalImpl) * );
+
+forall ( otype RationalImpl | arithmetic( RationalImpl ) )
+forall( dtype ostype | ostream( ostype ) | { ostype * ?|?( ostype *, RationalImpl ); } )
+ostype * ?|?( ostype *, Rational(RationalImpl ) );
 
 #endif // RATIONAL_H

src/libcfa/rational.c

@@ -10 +10 @@
 // Created On       : Wed Apr  6 17:54:28 2016
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Apr 27 17:05:06 2017
-// Update Count     : 51
+// Last Modified On : Sun May 14 17:25:19 2017
+// Update Count     : 131
 // 
 
@@ -17 +17 @@
 #include "fstream"
 #include "stdlib"
-#include "math"                                                                                 // floor
-
-
-// constants
-
-struct Rational 0 = {0, 1};
-struct Rational 1 = {1, 1};
-
 
 // helper routines
@@ -30 +22 @@
 // Calculate greatest common denominator of two numbers, the first of which may be negative. Used to reduce rationals.
 // alternative: https://en.wikipedia.org/wiki/Binary_GCD_algorithm
+forall ( otype RationalImpl | arithmetic( RationalImpl ) )
 static RationalImpl gcd( RationalImpl a, RationalImpl b ) {
         for ( ;; ) {                                                                            // Euclid's algorithm
                 RationalImpl r = a % b;
-          if ( r == 0 ) break;
+          if ( r == (RationalImpl){0} ) break;
                 a = b;
                 b = r;
@@ -40 +33 @@
 } // gcd
 
-static RationalImpl simplify( RationalImpl *n, RationalImpl *d ) {
-        if ( *d == 0 ) {
+forall ( otype RationalImpl | arithmetic( RationalImpl ) )
+static RationalImpl simplify( RationalImpl * n, RationalImpl * d ) {
+        if ( *d == (RationalImpl){0} ) {
                 serr | "Invalid rational number construction: denominator cannot be equal to 0." | endl;
                 exit( EXIT_FAILURE );
         } // exit
-        if ( *d < 0 ) { *d = -*d; *n = -*n; }                           // move sign to numerator
+        if ( *d < (RationalImpl){0} ) { *d = -*d; *n = -*n; } // move sign to numerator
         return gcd( abs( *n ), *d );                                            // simplify
 } // Rationalnumber::simplify
@@ -52 +46 @@
 // constructors
 
-void ?{}( Rational * r ) {
-        r{ 0, 1 };
+forall ( otype RationalImpl | arithmetic( RationalImpl ) )
+void ?{}( Rational(RationalImpl) * r ) {
+        r{ (RationalImpl){0}, (RationalImpl){1} };
 } // rational
 
-void ?{}( Rational * r, RationalImpl n ) {
-        r{ n, 1 };
+forall ( otype RationalImpl | arithmetic( RationalImpl ) )
+void ?{}( Rational(RationalImpl) * r, RationalImpl n ) {
+        r{ n, (RationalImpl){1} };
 } // rational
 
-void ?{}( Rational * r, RationalImpl n, RationalImpl d ) {
+forall ( otype RationalImpl | arithmetic( RationalImpl ) )
+void ?{}( Rational(RationalImpl) * r, RationalImpl n, RationalImpl d ) {
         RationalImpl t = simplify( &n, &d );                            // simplify
         r->numerator = n / t;
@@ -69 +66 @@
 // getter for numerator/denominator
 
-RationalImpl numerator( Rational r ) {
+forall ( otype RationalImpl | arithmetic( RationalImpl ) )
+RationalImpl numerator( Rational(RationalImpl) r ) {
         return r.numerator;
 } // numerator
 
-RationalImpl denominator( Rational r ) {
+forall ( otype RationalImpl | arithmetic( RationalImpl ) )
+RationalImpl denominator( Rational(RationalImpl) r ) {
         return r.denominator;
 } // denominator
 
-[ RationalImpl, RationalImpl ] ?=?( * [ RationalImpl, RationalImpl ] dest, Rational src ) {
+forall ( otype RationalImpl | arithmetic( RationalImpl ) )
+[ RationalImpl, RationalImpl ] ?=?( * [ RationalImpl, RationalImpl ] dest, Rational(RationalImpl) src ) {
         return *dest = src.[ numerator, denominator ];
 }
@@ -83 +83 @@
 // setter for numerator/denominator
 
-RationalImpl numerator( Rational r, RationalImpl n ) {
+forall ( otype RationalImpl | arithmetic( RationalImpl ) )
+RationalImpl numerator( Rational(RationalImpl) r, RationalImpl n ) {
         RationalImpl prev = r.numerator;
         RationalImpl t = gcd( abs( n ), r.denominator );                // simplify
@@ -91 +92 @@
 } // numerator
 
-RationalImpl denominator( Rational r, RationalImpl d ) {
+forall ( otype RationalImpl | arithmetic( RationalImpl ) )
+RationalImpl denominator( Rational(RationalImpl) r, RationalImpl d ) {
         RationalImpl prev = r.denominator;
         RationalImpl t = simplify( &r.numerator, &d );                  // simplify
@@ -102 +104 @@
 // comparison
 
-int ?==?( Rational l, Rational r ) {
+forall ( otype RationalImpl | arithmetic( RationalImpl ) )
+int ?==?( Rational(RationalImpl) l, Rational(RationalImpl) r ) {
         return l.numerator * r.denominator == l.denominator * r.numerator;
 } // ?==?
 
-int ?!=?( Rational l, Rational r ) {
+forall ( otype RationalImpl | arithmetic( RationalImpl ) )
+int ?!=?( Rational(RationalImpl) l, Rational(RationalImpl) r ) {
         return ! ( l == r );
 } // ?!=?
 
-int ?<?( Rational l, Rational r ) {
+forall ( otype RationalImpl | arithmetic( RationalImpl ) )
+int ?<?( Rational(RationalImpl) l, Rational(RationalImpl) r ) {
         return l.numerator * r.denominator < l.denominator * r.numerator;
 } // ?<?
 
-int ?<=?( Rational l, Rational r ) {
-        return l < r || l == r;
+forall ( otype RationalImpl | arithmetic( RationalImpl ) )
+int ?<=?( Rational(RationalImpl) l, Rational(RationalImpl) r ) {
+        return l.numerator * r.denominator <= l.denominator * r.numerator;
 } // ?<=?
 
-int ?>?( Rational l, Rational r ) {
+forall ( otype RationalImpl | arithmetic( RationalImpl ) )
+int ?>?( Rational(RationalImpl) l, Rational(RationalImpl) r ) {
         return ! ( l <= r );
 } // ?>?
 
-int ?>=?( Rational l, Rational r ) {
+forall ( otype RationalImpl | arithmetic( RationalImpl ) )
+int ?>=?( Rational(RationalImpl) l, Rational(RationalImpl) r ) {
         return ! ( l < r );
 } // ?>=?
@@ -129 +137 @@
 // arithmetic
 
-Rational -?( Rational r ) {
-        Rational t = { -r.numerator, r.denominator };
+forall ( otype RationalImpl | arithmetic( RationalImpl ) )
+Rational(RationalImpl) +?( Rational(RationalImpl) r ) {
+        Rational(RationalImpl) t = { r.numerator, r.denominator };
+        return t;
+} // +?
+
+forall ( otype RationalImpl | arithmetic( RationalImpl ) )
+Rational(RationalImpl) -?( Rational(RationalImpl) r ) {
+        Rational(RationalImpl) t = { -r.numerator, r.denominator };
         return t;
 } // -?
 
-Rational ?+?( Rational l, Rational r ) {
+forall ( otype RationalImpl | arithmetic( RationalImpl ) )
+Rational(RationalImpl) ?+?( Rational(RationalImpl) l, Rational(RationalImpl) r ) {
         if ( l.denominator == r.denominator ) {                         // special case
-                Rational t = { l.numerator + r.numerator, l.denominator };
+                Rational(RationalImpl) t = { l.numerator + r.numerator, l.denominator };
                 return t;
         } else {
-                Rational t = { l.numerator * r.denominator + l.denominator * r.numerator, l.denominator * r.denominator };
+                Rational(RationalImpl) t = { l.numerator * r.denominator + l.denominator * r.numerator, l.denominator * r.denominator };
                 return t;
         } // if
 } // ?+?
 
-Rational ?-?( Rational l, Rational r ) {
+forall ( otype RationalImpl | arithmetic( RationalImpl ) )
+Rational(RationalImpl) ?-?( Rational(RationalImpl) l, Rational(RationalImpl) r ) {
         if ( l.denominator == r.denominator ) {                         // special case
-                Rational t = { l.numerator - r.numerator, l.denominator };
+                Rational(RationalImpl) t = { l.numerator - r.numerator, l.denominator };
                 return t;
         } else {
-                Rational t = { l.numerator * r.denominator - l.denominator * r.numerator, l.denominator * r.denominator };
+                Rational(RationalImpl) t = { l.numerator * r.denominator - l.denominator * r.numerator, l.denominator * r.denominator };
                 return t;
         } // if
 } // ?-?
 
-Rational ?*?( Rational l, Rational r ) {
-        Rational t = { l.numerator * r.numerator, l.denominator * r.denominator };
+forall ( otype RationalImpl | arithmetic( RationalImpl ) )
+Rational(RationalImpl) ?*?( Rational(RationalImpl) l, Rational(RationalImpl) r ) {
+        Rational(RationalImpl) t = { l.numerator * r.numerator, l.denominator * r.denominator };
         return t;
 } // ?*?
 
-Rational ?/?( Rational l, Rational r ) {
-        if ( r.numerator < 0 ) {
+forall ( otype RationalImpl | arithmetic( RationalImpl ) )
+Rational(RationalImpl) ?/?( Rational(RationalImpl) l, Rational(RationalImpl) r ) {
+        if ( r.numerator < (RationalImpl){0} ) {
                 r.numerator = -r.numerator;
                 r.denominator = -r.denominator;
         } // if
-        Rational t = { l.numerator * r.denominator, l.denominator * r.numerator };
+        Rational(RationalImpl) t = { l.numerator * r.denominator, l.denominator * r.numerator };
         return t;
 } // ?/?
@@ -171 +190 @@
 // conversion
 
-double widen( Rational r ) {
-        return (double)r.numerator / (double)r.denominator;
-} // widen
-
-// http://www.ics.uci.edu/~eppstein/numth/frap.c
-Rational narrow( double f, RationalImpl md ) {
-        if ( md <= 1 ) {                                                                        // maximum fractional digits too small?
-                return (Rational){ f, 1};                                               // truncate fraction
-        } // if
-
-        // continued fraction coefficients
-        RationalImpl m00 = 1, m11 = 1, m01 = 0, m10 = 0;
-        RationalImpl ai, t;
-
-        // find terms until denom gets too big
-        for ( ;; ) {
-                ai = (RationalImpl)f;
-          if ( ! (m10 * ai + m11 <= md) ) break;
-                t = m00 * ai + m01;
-                m01 = m00;
-                m00 = t;
-                t = m10 * ai + m11;
-                m11 = m10;
-                m10 = t;
-                t = (double)ai;
-          if ( f == t ) break;                                                          // prevent division by zero
-                f = 1 / (f - t);
-          if ( f > (double)0x7FFFFFFF ) break;                          // representation failure
-        } 
-        return (Rational){ m00, m10 };
-} // narrow
+// forall ( otype RationalImpl | arithmetic( RationalImpl ) )
+// double widen( Rational(RationalImpl) r ) {
+//      return (double)r.numerator / (double)r.denominator;
+// } // widen
+
+// // http://www.ics.uci.edu/~eppstein/numth/frap.c
+// forall ( otype RationalImpl | arithmetic( RationalImpl ) )
+// Rational(RationalImpl) narrow( double f, RationalImpl md ) {
+//      if ( md <= 1 ) {                                                                        // maximum fractional digits too small?
+//              return (Rational(RationalImpl)){ f, 1};                 // truncate fraction
+//      } // if
+
+//      // continued fraction coefficients
+//      RationalImpl m00 = 1, m11 = 1, m01 = 0, m10 = 0;
+//      RationalImpl ai, t;
+
+//      // find terms until denom gets too big
+//      for ( ;; ) {
+//              ai = (RationalImpl)f;
+//        if ( ! (m10 * ai + m11 <= md) ) break;
+//              t = m00 * ai + m01;
+//              m01 = m00;
+//              m00 = t;
+//              t = m10 * ai + m11;
+//              m11 = m10;
+//              m10 = t;
+//              t = (double)ai;
+//        if ( f == t ) break;                                                          // prevent division by zero
+//        f = 1 / (f - (double)t);
+//        if ( f > (double)0x7FFFFFFF ) break;                          // representation failure
+//      } 
+//      return (Rational(RationalImpl)){ m00, m10 };
+// } // narrow
 
 
 // I/O
 
-forall( dtype istype | istream( istype ) )
-istype * ?|?( istype *is, Rational *r ) {
+forall ( otype RationalImpl | arithmetic( RationalImpl ) )
+forall( dtype istype | istream( istype ) | { istype * ?|?( istype *, RationalImpl * ); } )
+istype * ?|?( istype * is, Rational(RationalImpl) * r ) {
         RationalImpl t;
         is | &(r->numerator) | &(r->denominator);
@@ -216 +238 @@
 } // ?|?
 
-forall( dtype ostype | ostream( ostype ) )
-ostype * ?|?( ostype *os, Rational r ) {
+forall ( otype RationalImpl | arithmetic( RationalImpl ) )
+forall( dtype ostype | ostream( ostype ) | { ostype * ?|?( ostype *, RationalImpl ); } )
+ostype * ?|?( ostype * os, Rational(RationalImpl ) r ) {
         return os | r.numerator | '/' | r.denominator;
 } // ?|?

src/libcfa/stdlib

@@ -10 +10 @@
 // Created On       : Thu Jan 28 17:12:35 2016
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sat Apr  1 17:35:24 2017
-// Update Count     : 104
+// Last Modified On : Tue May  9 08:42:44 2017
+// Update Count     : 107
 //
 
@@ -84 +84 @@
 forall( otype T | { int ?<?( T, T ); } )
 T * bsearch( T key, const T * arr, size_t dimension );
+
 forall( otype T | { int ?<?( T, T ); } )
 unsigned int bsearch( T key, const T * arr, size_t dimension );
+
 
 forall( otype T | { int ?<?( T, T ); } )
@@ -107 +109 @@
 double abs( double _Complex );
 long double abs( long double _Complex );
+forall ( otype T | { void ?{}( T *, zero_t ); int ?<?( T, T ); T -?( T ); } )
+T abs( T );
 
 //---------------------------------------

src/libcfa/stdlib.c

@@ -10 +10 @@
 // Created On       : Thu Jan 28 17:10:29 2016
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sun Apr 16 10:41:05 2017
-// Update Count     : 189
+// Last Modified On : Tue May  9 08:43:00 2017
+// Update Count     : 191
 //
 
@@ -27 +27 @@
 } // extern "C"
 
-forall( dtype T | sized(T) ) T * malloc( void ) {
-        //printf( "malloc1\n" );
-    return (T *)(void*)malloc( (size_t)sizeof(T) );
+forall( dtype T | sized(T) ) T * malloc( void ) {               // type-safe
+    return (T *)(void *)malloc( (size_t)sizeof(T) );
 } // malloc
-forall( dtype T | sized(T) ) T * malloc( char fill ) {
-        //printf( "malloc3\n" );
-        T * ptr = (T *)(void*)malloc( (size_t)sizeof(T) );
+
+forall( dtype T | sized(T) ) T * malloc( char fill ) {  // initial with fill value (like calloc)
+        T * ptr = (T *)(void *)malloc( (size_t)sizeof(T) );
     return memset( ptr, (int)fill, sizeof(T) );
 } // malloc
 
-forall( dtype T | sized(T) ) T * calloc( size_t nmemb ) {
-        //printf( "calloc\n" );
+forall( dtype T | sized(T) ) T * malloc( T * ptr, size_t size ) { // alternative realloc
+    return (T *)realloc( ptr, size );
+} // malloc
+
+forall( dtype T | sized(T) ) T * malloc( T * ptr, size_t size, unsigned char fill ) { // alternative realloc with fill value
+    return (T *)realloc( ptr, size, fill );
+} // malloc
+
+
+forall( dtype T | sized(T) ) T * calloc( size_t nmemb ) { // type-safe array initialization with fill 0
     return (T *)calloc( nmemb, sizeof(T) );
 } // calloc
 
-forall( dtype T | sized(T) ) T * realloc( T * ptr, size_t size ) {
-        //printf( "realloc1\n" );
+
+forall( dtype T | sized(T) ) T * realloc( T * ptr, size_t size ) { // type-safe
     return (T *)(void *)realloc( (void *)ptr, size );
 } // realloc
-forall( dtype T | sized(T) ) T * realloc( T * ptr, size_t size, unsigned char fill ) {
-        //printf( "realloc2\n" );
+
+forall( dtype T | sized(T) ) T * realloc( T * ptr, size_t size, unsigned char fill ) { // alternative realloc with fill value
     char * nptr = (T *)(void *)realloc( (void *)ptr, size );
     size_t unused = malloc_usable_size( nptr );
@@ -54 +61 @@
 } // realloc
 
-forall( dtype T | sized(T) ) T * malloc( T * ptr, size_t size ) {
-        //printf( "malloc4\n" );
-    return (T *)realloc( ptr, size );
-} // malloc
-forall( dtype T | sized(T) ) T * malloc( T * ptr, size_t size, unsigned char fill ) {
-        //printf( "malloc5\n" );
-    return (T *)realloc( ptr, size, fill );
-} // malloc
-
-forall( dtype T | sized(T) ) T * aligned_alloc( size_t alignment ) {
-        //printf( "aligned_alloc\n" );
+
+forall( dtype T | sized(T) ) T * aligned_alloc( size_t alignment ) { // aligned allocation
     return (T *)memalign( alignment, sizeof(T) );
 } // aligned_alloc
 
 forall( dtype T | sized(T) ) T * memalign( size_t alignment ) {
-        //printf( "memalign\n" );
     return (T *)memalign( alignment, sizeof(T) );
 } // memalign
 
 forall( dtype T | sized(T) ) int posix_memalign( T ** ptr, size_t alignment ) {
-        //printf( "posix_memalign\n" );
     return posix_memalign( (void **)ptr, alignment, sizeof(T) );
 } // posix_memalign
 
-forall( dtype T, ttype Params | sized(T) | { void ?{}( T *, Params ); } )
+
+forall( dtype T, ttype Params | sized(T) | { void ?{}( T *, Params ); } ) //  new
 T * new( Params p ) {
         return ((T *)malloc()){ p };
-}
-
-forall( dtype T | { void ^?{}(T *); } )
+} // new
+
+forall( dtype T | { void ^?{}(T *); } )                                 // delete
 void delete( T * ptr ) {
-  if ( ptr ) {
-    ^ptr{};
-    free( ptr );
-  }
-}
+        if ( ptr ) {
+                ^ptr{};
+                free( ptr );
+        }
+} // delete
 
 forall( dtype T, ttype Params | { void ^?{}(T *); void delete(Params); } )
@@ -98 +95 @@
         }
         delete( rest );
-}
+} // delete
 
 //---------------------------------------
@@ -106 +103 @@
         if ( sscanf( ptr, "%d", &i ) == EOF ) {}
         return i;
-}
+} // ato
+
 unsigned int ato( const char * ptr ) {
         unsigned int ui;
         if ( sscanf( ptr, "%u", &ui ) == EOF ) {}
         return ui;
-}
+} // ato
+
 long int ato( const char * ptr ) {
         long int li;
         if ( sscanf( ptr, "%ld", &li ) == EOF ) {}
         return li;
-}
+} // ato
+
 unsigned long int ato( const char * ptr ) {
         unsigned long int uli;
         if ( sscanf( ptr, "%lu", &uli ) == EOF ) {}
         return uli;
-}
+} // ato
+
 long long int ato( const char * ptr ) {
         long long int lli;
         if ( sscanf( ptr, "%lld", &lli ) == EOF ) {}
         return lli;
-}
+} // ato
+
 unsigned long long int ato( const char * ptr ) {
         unsigned long long int ulli;
         if ( sscanf( ptr, "%llu", &ulli ) == EOF ) {}
         return ulli;
-}
+} // ato
+
 
 float ato( const char * ptr ) {
@@ -137 +140 @@
         if ( sscanf( ptr, "%f", &f ) == EOF ) {}
         return f;
-}
+} // ato
+
 double ato( const char * ptr ) {
         double d;
         if ( sscanf( ptr, "%lf", &d ) == EOF ) {}
         return d;
-}
+} // ato
+
 long double ato( const char * ptr ) {
         long double ld;
         if ( sscanf( ptr, "%Lf", &ld ) == EOF ) {}
         return ld;
-}
+} // ato
+
 
 float _Complex ato( const char * ptr ) {
@@ -153 +159 @@
         if ( sscanf( ptr, "%g%gi", &re, &im ) == EOF ) {}
         return re + im * _Complex_I;
-}
+} // ato
+
 double _Complex ato( const char * ptr ) {
         double re, im;
         if ( sscanf( ptr, "%lf%lfi", &re, &im ) == EOF ) {}
         return re + im * _Complex_I;
-}
+} // ato
+
 long double _Complex ato( const char * ptr ) {
         long double re, im;
         if ( sscanf( ptr, "%Lf%Lfi", &re, &im ) == EOF ) {}
         return re + im * _Complex_I;
-}
+} // ato
+
 
 int strto( const char * sptr, char ** eptr, int base ) {
         return (int)strtol( sptr, eptr, base );
-}
+} // strto
+
 unsigned int strto( const char * sptr, char ** eptr, int base ) {
         return (unsigned int)strtoul( sptr, eptr, base );
-}
+} // strto
+
 long int strto( const char * sptr, char ** eptr, int base ) {
         return strtol( sptr, eptr, base );
-}
+} // strto
+
 unsigned long int strto( const char * sptr, char ** eptr, int base ) {
         return strtoul( sptr, eptr, base );
-}
+} // strto
+
 long long int strto( const char * sptr, char ** eptr, int base ) {
         return strtoll( sptr, eptr, base );
-}
+} // strto
+
 unsigned long long int strto( const char * sptr, char ** eptr, int base ) {
         return strtoull( sptr, eptr, base );
-}
+} // strto
+
 
 float strto( const char * sptr, char ** eptr ) {
         return strtof( sptr, eptr );
-}
+} // strto
+
 double strto( const char * sptr, char ** eptr ) {
         return strtod( sptr, eptr );
-}
+} // strto
+
 long double strto( const char * sptr, char ** eptr ) {
         return strtold( sptr, eptr );
-}
+} // strto
+
 
 float _Complex strto( const char * sptr, char ** eptr ) {
@@ -201 +219 @@
         if ( sptr == *eptr ) return 0.0;
         return re + im * _Complex_I;
-}
+} // strto
+
 double _Complex strto( const char * sptr, char ** eptr ) {
         double re, im;
@@ -209 +228 @@
         if ( sptr == *eptr ) return 0.0;
         return re + im * _Complex_I;
-}
+} // strto
+
 long double _Complex strto( const char * sptr, char ** eptr ) {
         long double re, im;
@@ -217 +237 @@
         if ( sptr == *eptr ) return 0.0;
         return re + im * _Complex_I;
-}
+} // strto
 
 //---------------------------------------

src/main.cc

@@ +1 @@
+
 //
 // Cforall Version 1.0.0 Copyright (C) 2015 University of Waterloo
@@ -9 +10 @@
 // Author           : Richard C. Bilson
 // Created On       : Fri May 15 23:12:02 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Dec 14 14:35:54 2016
-// Update Count     : 436
+// Last Modified By : Andrew Beach
+// Last Modified On : Wed May 10 14:45:00 2017
+// Update Count     : 437
 //
 
@@ -79 +80 @@
         errorp = false,
         codegenp = false,
-        prettycodegenp = false;
+        prettycodegenp = false,
+        nolinemarks = false;
 
 static void parse_cmdline( int argc, char *argv[], const char *& filename );
@@ -310 +312 @@
 
                 CodeTools::fillLocations( translationUnit );
-                CodeGen::generate( translationUnit, *output, ! noprotop, prettycodegenp, true );
+                CodeGen::generate( translationUnit, *output, ! noprotop, prettycodegenp, true, ! nolinemarks );
 
                 CodeGen::FixMain::fix( *output, treep ? "../prelude/bootloader.c" : CFA_LIBDIR "/bootloader.c" );
@@ -336 +338 @@
         } catch ( CompilerError &e ) {
                 cerr << "Compiler Error: " << e.get_what() << endl;
-                cerr << "(please report bugs to " << endl;
+                cerr << "(please report bugs to [REDACTED])" << endl;
                 if ( output != &cout ) {
                         delete output;
@@ -375 +377 @@
 
         int c;
-        while ( (c = getopt_long( argc, argv, "abBcdefglmnpqrstTvyzZD:F:", long_opts, &long_index )) != -1 ) {
+        while ( (c = getopt_long( argc, argv, "abBcdefglLmnpqrstTvyzZD:F:", long_opts, &long_index )) != -1 ) {
                 switch ( c ) {
                   case Ast:
@@ -411 +413 @@
                   case 'l':                                                                             // generate libcfa.c
                         libcfap = true;
+                        break;
+                  case 'L':                                                                             // surpress lines marks
+                        nolinemarks = true;
                         break;
                   case Nopreamble:

src/prelude/Makefile.am

@@ -42 +42 @@
 
 bootloader.c : bootloader.cf prelude.cf extras.cf builtins.cf ${abs_top_srcdir}/src/driver/cfa-cpp
-        ${AM_V_GEN}${abs_top_srcdir}/src/driver/cfa-cpp -tpm bootloader.cf $@  # use src/cfa-cpp as not in lib until after install
+        ${AM_V_GEN}${abs_top_srcdir}/src/driver/cfa-cpp -tpmL bootloader.cf $@  # use src/cfa-cpp as not in lib until after install
 
 MAINTAINERCLEANFILES = builtins.c builtins.cf extras.cf bootloader.c ${addprefix ${libdir}/,${cfalib_DATA}} ${addprefix ${libdir}/,${lib_LIBRARIES}}

src/prelude/Makefile.in

@@ -439 +439 @@
 
 bootloader.c : bootloader.cf prelude.cf extras.cf builtins.cf ${abs_top_srcdir}/src/driver/cfa-cpp
-        ${AM_V_GEN}${abs_top_srcdir}/src/driver/cfa-cpp -tpm bootloader.cf $@  # use src/cfa-cpp as not in lib until after install
+        ${AM_V_GEN}${abs_top_srcdir}/src/driver/cfa-cpp -tpmL bootloader.cf $@  # use src/cfa-cpp as not in lib until after install
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.

src/tests/.expect/32/KRfunctions.txt

@@ -31 +31 @@
 }
 static inline struct S ___operator_assign__F2sS_P2sS2sS_autogen___1(struct S *___dst__P2sS_1, struct S ___src__2sS_1){
+    struct S ___ret__2sS_1;
     ((void)((*___dst__P2sS_1).__i__i_1=___src__2sS_1.__i__i_1));
-    return ((struct S )___src__2sS_1);
+    ((void)___constructor__F_P2sS2sS_autogen___1((&___ret__2sS_1), ___src__2sS_1));
+    return ((struct S )___ret__2sS_1);
 }
 static inline void ___constructor__F_P2sSi_autogen___1(struct S *___dst__P2sS_1, int __i__i_1){

src/tests/.expect/32/attributes.txt

@@ -22 +22 @@
 }
 static inline struct __anonymous0 ___operator_assign__F13s__anonymous0_P13s__anonymous013s__anonymous0_autogen___1(struct __anonymous0 *___dst__P13s__anonymous0_1, struct __anonymous0 ___src__13s__anonymous0_1){
-    return ((struct __anonymous0 )___src__13s__anonymous0_1);
+    struct __anonymous0 ___ret__13s__anonymous0_1;
+    ((void)___constructor__F_P13s__anonymous013s__anonymous0_autogen___1((&___ret__13s__anonymous0_1), ___src__13s__anonymous0_1));
+    return ((struct __anonymous0 )___ret__13s__anonymous0_1);
 }
 __attribute__ ((unused)) struct Agn1;
@@ -38 +40 @@
 }
 static inline struct Agn2 ___operator_assign__F5sAgn2_P5sAgn25sAgn2_autogen___1(struct Agn2 *___dst__P5sAgn2_1, struct Agn2 ___src__5sAgn2_1){
-    return ((struct Agn2 )___src__5sAgn2_1);
+    struct Agn2 ___ret__5sAgn2_1;
+    ((void)___constructor__F_P5sAgn25sAgn2_autogen___1((&___ret__5sAgn2_1), ___src__5sAgn2_1));
+    return ((struct Agn2 )___ret__5sAgn2_1);
 }
 enum __attribute__ ((unused)) __anonymous1 {
@@ -99 +103 @@
 }
 static inline struct Fdl ___operator_assign__F4sFdl_P4sFdl4sFdl_autogen___1(struct Fdl *___dst__P4sFdl_1, struct Fdl ___src__4sFdl_1){
+    struct Fdl ___ret__4sFdl_1;
     ((void)((*___dst__P4sFdl_1).__f1__i_1=___src__4sFdl_1.__f1__i_1));
     ((void)((*___dst__P4sFdl_1).__f2__i_1=___src__4sFdl_1.__f2__i_1));
@@ -108 +113 @@
     ((void)((*___dst__P4sFdl_1).__f8__i_1=___src__4sFdl_1.__f8__i_1));
     ((void)((*___dst__P4sFdl_1).__f9__Pi_1=___src__4sFdl_1.__f9__Pi_1));
-    return ((struct Fdl )___src__4sFdl_1);
+    ((void)___constructor__F_P4sFdl4sFdl_autogen___1((&___ret__4sFdl_1), ___src__4sFdl_1));
+    return ((struct Fdl )___ret__4sFdl_1);
 }
 static inline void ___constructor__F_P4sFdli_autogen___1(struct Fdl *___dst__P4sFdl_1, int __f1__i_1){
@@ -292 +298 @@
     }
     inline struct __anonymous4 ___operator_assign__F13s__anonymous4_P13s__anonymous413s__anonymous4_autogen___2(struct __anonymous4 *___dst__P13s__anonymous4_2, struct __anonymous4 ___src__13s__anonymous4_2){
+        struct __anonymous4 ___ret__13s__anonymous4_2;
         ((void)((*___dst__P13s__anonymous4_2).__i__i_2=___src__13s__anonymous4_2.__i__i_2));
-        return ((struct __anonymous4 )___src__13s__anonymous4_2);
+        ((void)___constructor__F_P13s__anonymous413s__anonymous4_autogen___2((&___ret__13s__anonymous4_2), ___src__13s__anonymous4_2));
+        return ((struct __anonymous4 )___ret__13s__anonymous4_2);
     }
     inline void ___constructor__F_P13s__anonymous4i_autogen___2(struct __anonymous4 *___dst__P13s__anonymous4_2, int __i__i_2){
@@ -310 +318 @@
     }
     inline enum __anonymous5 ___operator_assign__F13e__anonymous5_P13e__anonymous513e__anonymous5_intrinsic___2(enum __anonymous5 *___dst__P13e__anonymous5_2, enum __anonymous5 ___src__13e__anonymous5_2){
-        return ((enum __anonymous5 )((*___dst__P13e__anonymous5_2)=___src__13e__anonymous5_2));
+        enum __anonymous5 ___ret__13e__anonymous5_2;
+        ((void)(___ret__13e__anonymous5_2=((*___dst__P13e__anonymous5_2)=___src__13e__anonymous5_2)) /* ?{} */);
+        return ((enum __anonymous5 )___ret__13e__anonymous5_2);
     }
     ((void)sizeof(enum __anonymous5 ));
@@ -338 +348 @@
 }
 static inline struct Vad ___operator_assign__F4sVad_P4sVad4sVad_autogen___1(struct Vad *___dst__P4sVad_1, struct Vad ___src__4sVad_1){
-    return ((struct Vad )___src__4sVad_1);
-}
+    struct Vad ___ret__4sVad_1;
+    ((void)___constructor__F_P4sVad4sVad_autogen___1((&___ret__4sVad_1), ___src__4sVad_1));
+    return ((struct Vad )___ret__4sVad_1);
+}

src/tests/.expect/32/declarationSpecifier.txt

@@ -30 +30 @@
 }
 static inline struct __anonymous0 ___operator_assign__F13s__anonymous0_P13s__anonymous013s__anonymous0_autogen___1(struct __anonymous0 *___dst__P13s__anonymous0_1, struct __anonymous0 ___src__13s__anonymous0_1){
+    struct __anonymous0 ___ret__13s__anonymous0_1;
     ((void)((*___dst__P13s__anonymous0_1).__i__i_1=___src__13s__anonymous0_1.__i__i_1));
-    return ((struct __anonymous0 )___src__13s__anonymous0_1);
+    ((void)___constructor__F_P13s__anonymous013s__anonymous0_autogen___1((&___ret__13s__anonymous0_1), ___src__13s__anonymous0_1));
+    return ((struct __anonymous0 )___ret__13s__anonymous0_1);
 }
 static inline void ___constructor__F_P13s__anonymous0i_autogen___1(struct __anonymous0 *___dst__P13s__anonymous0_1, int __i__i_1){
@@ -54 +56 @@
 }
 static inline struct __anonymous1 ___operator_assign__F13s__anonymous1_P13s__anonymous113s__anonymous1_autogen___1(struct __anonymous1 *___dst__P13s__anonymous1_1, struct __anonymous1 ___src__13s__anonymous1_1){
+    struct __anonymous1 ___ret__13s__anonymous1_1;
     ((void)((*___dst__P13s__anonymous1_1).__i__i_1=___src__13s__anonymous1_1.__i__i_1));
-    return ((struct __anonymous1 )___src__13s__anonymous1_1);
+    ((void)___constructor__F_P13s__anonymous113s__anonymous1_autogen___1((&___ret__13s__anonymous1_1), ___src__13s__anonymous1_1));
+    return ((struct __anonymous1 )___ret__13s__anonymous1_1);
 }
 static inline void ___constructor__F_P13s__anonymous1i_autogen___1(struct __anonymous1 *___dst__P13s__anonymous1_1, int __i__i_1){
@@ -78 +82 @@
 }
 static inline struct __anonymous2 ___operator_assign__F13s__anonymous2_P13s__anonymous213s__anonymous2_autogen___1(struct __anonymous2 *___dst__P13s__anonymous2_1, struct __anonymous2 ___src__13s__anonymous2_1){
+    struct __anonymous2 ___ret__13s__anonymous2_1;
     ((void)((*___dst__P13s__anonymous2_1).__i__i_1=___src__13s__anonymous2_1.__i__i_1));
-    return ((struct __anonymous2 )___src__13s__anonymous2_1);
+    ((void)___constructor__F_P13s__anonymous213s__anonymous2_autogen___1((&___ret__13s__anonymous2_1), ___src__13s__anonymous2_1));
+    return ((struct __anonymous2 )___ret__13s__anonymous2_1);
 }
 static inline void ___constructor__F_P13s__anonymous2i_autogen___1(struct __anonymous2 *___dst__P13s__anonymous2_1, int __i__i_1){
@@ -102 +108 @@
 }
 static inline struct __anonymous3 ___operator_assign__F13s__anonymous3_P13s__anonymous313s__anonymous3_autogen___1(struct __anonymous3 *___dst__P13s__anonymous3_1, struct __anonymous3 ___src__13s__anonymous3_1){
+    struct __anonymous3 ___ret__13s__anonymous3_1;
     ((void)((*___dst__P13s__anonymous3_1).__i__i_1=___src__13s__anonymous3_1.__i__i_1));
-    return ((struct __anonymous3 )___src__13s__anonymous3_1);
+    ((void)___constructor__F_P13s__anonymous313s__anonymous3_autogen___1((&___ret__13s__anonymous3_1), ___src__13s__anonymous3_1));
+    return ((struct __anonymous3 )___ret__13s__anonymous3_1);
 }
 static inline void ___constructor__F_P13s__anonymous3i_autogen___1(struct __anonymous3 *___dst__P13s__anonymous3_1, int __i__i_1){
@@ -126 +134 @@
 }
 static inline struct __anonymous4 ___operator_assign__F13s__anonymous4_P13s__anonymous413s__anonymous4_autogen___1(struct __anonymous4 *___dst__P13s__anonymous4_1, struct __anonymous4 ___src__13s__anonymous4_1){
+    struct __anonymous4 ___ret__13s__anonymous4_1;
     ((void)((*___dst__P13s__anonymous4_1).__i__i_1=___src__13s__anonymous4_1.__i__i_1));
-    return ((struct __anonymous4 )___src__13s__anonymous4_1);
+    ((void)___constructor__F_P13s__anonymous413s__anonymous4_autogen___1((&___ret__13s__anonymous4_1), ___src__13s__anonymous4_1));
+    return ((struct __anonymous4 )___ret__13s__anonymous4_1);
 }
 static inline void ___constructor__F_P13s__anonymous4i_autogen___1(struct __anonymous4 *___dst__P13s__anonymous4_1, int __i__i_1){
@@ -150 +160 @@
 }
 static inline struct __anonymous5 ___operator_assign__F13s__anonymous5_P13s__anonymous513s__anonymous5_autogen___1(struct __anonymous5 *___dst__P13s__anonymous5_1, struct __anonymous5 ___src__13s__anonymous5_1){
+    struct __anonymous5 ___ret__13s__anonymous5_1;
     ((void)((*___dst__P13s__anonymous5_1).__i__i_1=___src__13s__anonymous5_1.__i__i_1));
-    return ((struct __anonymous5 )___src__13s__anonymous5_1);
+    ((void)___constructor__F_P13s__anonymous513s__anonymous5_autogen___1((&___ret__13s__anonymous5_1), ___src__13s__anonymous5_1));
+    return ((struct __anonymous5 )___ret__13s__anonymous5_1);
 }
 static inline void ___constructor__F_P13s__anonymous5i_autogen___1(struct __anonymous5 *___dst__P13s__anonymous5_1, int __i__i_1){
@@ -174 +186 @@
 }
 static inline struct __anonymous6 ___operator_assign__F13s__anonymous6_P13s__anonymous613s__anonymous6_autogen___1(struct __anonymous6 *___dst__P13s__anonymous6_1, struct __anonymous6 ___src__13s__anonymous6_1){
+    struct __anonymous6 ___ret__13s__anonymous6_1;
     ((void)((*___dst__P13s__anonymous6_1).__i__i_1=___src__13s__anonymous6_1.__i__i_1));
-    return ((struct __anonymous6 )___src__13s__anonymous6_1);
+    ((void)___constructor__F_P13s__anonymous613s__anonymous6_autogen___1((&___ret__13s__anonymous6_1), ___src__13s__anonymous6_1));
+    return ((struct __anonymous6 )___ret__13s__anonymous6_1);
 }
 static inline void ___constructor__F_P13s__anonymous6i_autogen___1(struct __anonymous6 *___dst__P13s__anonymous6_1, int __i__i_1){
@@ -198 +212 @@
 }
 static inline struct __anonymous7 ___operator_assign__F13s__anonymous7_P13s__anonymous713s__anonymous7_autogen___1(struct __anonymous7 *___dst__P13s__anonymous7_1, struct __anonymous7 ___src__13s__anonymous7_1){
+    struct __anonymous7 ___ret__13s__anonymous7_1;
     ((void)((*___dst__P13s__anonymous7_1).__i__i_1=___src__13s__anonymous7_1.__i__i_1));
-    return ((struct __anonymous7 )___src__13s__anonymous7_1);
+    ((void)___constructor__F_P13s__anonymous713s__anonymous7_autogen___1((&___ret__13s__anonymous7_1), ___src__13s__anonymous7_1));
+    return ((struct __anonymous7 )___ret__13s__anonymous7_1);
 }
 static inline void ___constructor__F_P13s__anonymous7i_autogen___1(struct __anonymous7 *___dst__P13s__anonymous7_1, int __i__i_1){
@@ -230 +246 @@
 }
 static inline struct __anonymous8 ___operator_assign__F13s__anonymous8_P13s__anonymous813s__anonymous8_autogen___1(struct __anonymous8 *___dst__P13s__anonymous8_1, struct __anonymous8 ___src__13s__anonymous8_1){
+    struct __anonymous8 ___ret__13s__anonymous8_1;
     ((void)((*___dst__P13s__anonymous8_1).__i__s_1=___src__13s__anonymous8_1.__i__s_1));
-    return ((struct __anonymous8 )___src__13s__anonymous8_1);
+    ((void)___constructor__F_P13s__anonymous813s__anonymous8_autogen___1((&___ret__13s__anonymous8_1), ___src__13s__anonymous8_1));
+    return ((struct __anonymous8 )___ret__13s__anonymous8_1);
 }
 static inline void ___constructor__F_P13s__anonymous8s_autogen___1(struct __anonymous8 *___dst__P13s__anonymous8_1, short __i__s_1){
@@ -254 +272 @@
 }
 static inline struct __anonymous9 ___operator_assign__F13s__anonymous9_P13s__anonymous913s__anonymous9_autogen___1(struct __anonymous9 *___dst__P13s__anonymous9_1, struct __anonymous9 ___src__13s__anonymous9_1){
+    struct __anonymous9 ___ret__13s__anonymous9_1;
     ((void)((*___dst__P13s__anonymous9_1).__i__s_1=___src__13s__anonymous9_1.__i__s_1));
-    return ((struct __anonymous9 )___src__13s__anonymous9_1);
+    ((void)___constructor__F_P13s__anonymous913s__anonymous9_autogen___1((&___ret__13s__anonymous9_1), ___src__13s__anonymous9_1));
+    return ((struct __anonymous9 )___ret__13s__anonymous9_1);
 }
 static inline void ___constructor__F_P13s__anonymous9s_autogen___1(struct __anonymous9 *___dst__P13s__anonymous9_1, short __i__s_1){
@@ -278 +298 @@
 }
 static inline struct __anonymous10 ___operator_assign__F14s__anonymous10_P14s__anonymous1014s__anonymous10_autogen___1(struct __anonymous10 *___dst__P14s__anonymous10_1, struct __anonymous10 ___src__14s__anonymous10_1){
+    struct __anonymous10 ___ret__14s__anonymous10_1;
     ((void)((*___dst__P14s__anonymous10_1).__i__s_1=___src__14s__anonymous10_1.__i__s_1));
-    return ((struct __anonymous10 )___src__14s__anonymous10_1);
+    ((void)___constructor__F_P14s__anonymous1014s__anonymous10_autogen___1((&___ret__14s__anonymous10_1), ___src__14s__anonymous10_1));
+    return ((struct __anonymous10 )___ret__14s__anonymous10_1);
 }
 static inline void ___constructor__F_P14s__anonymous10s_autogen___1(struct __anonymous10 *___dst__P14s__anonymous10_1, short __i__s_1){
@@ -302 +324 @@
 }
 static inline struct __anonymous11 ___operator_assign__F14s__anonymous11_P14s__anonymous1114s__anonymous11_autogen___1(struct __anonymous11 *___dst__P14s__anonymous11_1, struct __anonymous11 ___src__14s__anonymous11_1){
+    struct __anonymous11 ___ret__14s__anonymous11_1;
     ((void)((*___dst__P14s__anonymous11_1).__i__s_1=___src__14s__anonymous11_1.__i__s_1));
-    return ((struct __anonymous11 )___src__14s__anonymous11_1);
+    ((void)___constructor__F_P14s__anonymous1114s__anonymous11_autogen___1((&___ret__14s__anonymous11_1), ___src__14s__anonymous11_1));
+    return ((struct __anonymous11 )___ret__14s__anonymous11_1);
 }
 static inline void ___constructor__F_P14s__anonymous11s_autogen___1(struct __anonymous11 *___dst__P14s__anonymous11_1, short __i__s_1){
@@ -326 +350 @@
 }
 static inline struct __anonymous12 ___operator_assign__F14s__anonymous12_P14s__anonymous1214s__anonymous12_autogen___1(struct __anonymous12 *___dst__P14s__anonymous12_1, struct __anonymous12 ___src__14s__anonymous12_1){
+    struct __anonymous12 ___ret__14s__anonymous12_1;
     ((void)((*___dst__P14s__anonymous12_1).__i__s_1=___src__14s__anonymous12_1.__i__s_1));
-    return ((struct __anonymous12 )___src__14s__anonymous12_1);
+    ((void)___constructor__F_P14s__anonymous1214s__anonymous12_autogen___1((&___ret__14s__anonymous12_1), ___src__14s__anonymous12_1));
+    return ((struct __anonymous12 )___ret__14s__anonymous12_1);
 }
 static inline void ___constructor__F_P14s__anonymous12s_autogen___1(struct __anonymous12 *___dst__P14s__anonymous12_1, short __i__s_1){
@@ -350 +376 @@
 }
 static inline struct __anonymous13 ___operator_assign__F14s__anonymous13_P14s__anonymous1314s__anonymous13_autogen___1(struct __anonymous13 *___dst__P14s__anonymous13_1, struct __anonymous13 ___src__14s__anonymous13_1){
+    struct __anonymous13 ___ret__14s__anonymous13_1;
     ((void)((*___dst__P14s__anonymous13_1).__i__s_1=___src__14s__anonymous13_1.__i__s_1));
-    return ((struct __anonymous13 )___src__14s__anonymous13_1);
+    ((void)___constructor__F_P14s__anonymous1314s__anonymous13_autogen___1((&___ret__14s__anonymous13_1), ___src__14s__anonymous13_1));
+    return ((struct __anonymous13 )___ret__14s__anonymous13_1);
 }
 static inline void ___constructor__F_P14s__anonymous13s_autogen___1(struct __anonymous13 *___dst__P14s__anonymous13_1, short __i__s_1){
@@ -374 +402 @@
 }
 static inline struct __anonymous14 ___operator_assign__F14s__anonymous14_P14s__anonymous1414s__anonymous14_autogen___1(struct __anonymous14 *___dst__P14s__anonymous14_1, struct __anonymous14 ___src__14s__anonymous14_1){
+    struct __anonymous14 ___ret__14s__anonymous14_1;
     ((void)((*___dst__P14s__anonymous14_1).__i__s_1=___src__14s__anonymous14_1.__i__s_1));
-    return ((struct __anonymous14 )___src__14s__anonymous14_1);
+    ((void)___constructor__F_P14s__anonymous1414s__anonymous14_autogen___1((&___ret__14s__anonymous14_1), ___src__14s__anonymous14_1));
+    return ((struct __anonymous14 )___ret__14s__anonymous14_1);
 }
 static inline void ___constructor__F_P14s__anonymous14s_autogen___1(struct __anonymous14 *___dst__P14s__anonymous14_1, short __i__s_1){
@@ -398 +428 @@
 }
 static inline struct __anonymous15 ___operator_assign__F14s__anonymous15_P14s__anonymous1514s__anonymous15_autogen___1(struct __anonymous15 *___dst__P14s__anonymous15_1, struct __anonymous15 ___src__14s__anonymous15_1){
+    struct __anonymous15 ___ret__14s__anonymous15_1;
     ((void)((*___dst__P14s__anonymous15_1).__i__s_1=___src__14s__anonymous15_1.__i__s_1));
-    return ((struct __anonymous15 )___src__14s__anonymous15_1);
+    ((void)___constructor__F_P14s__anonymous1514s__anonymous15_autogen___1((&___ret__14s__anonymous15_1), ___src__14s__anonymous15_1));
+    return ((struct __anonymous15 )___ret__14s__anonymous15_1);
 }
 static inline void ___constructor__F_P14s__anonymous15s_autogen___1(struct __anonymous15 *___dst__P14s__anonymous15_1, short __i__s_1){
@@ -438 +470 @@
 }
 static inline struct __anonymous16 ___operator_assign__F14s__anonymous16_P14s__anonymous1614s__anonymous16_autogen___1(struct __anonymous16 *___dst__P14s__anonymous16_1, struct __anonymous16 ___src__14s__anonymous16_1){
+    struct __anonymous16 ___ret__14s__anonymous16_1;
     ((void)((*___dst__P14s__anonymous16_1).__i__i_1=___src__14s__anonymous16_1.__i__i_1));
-    return ((struct __anonymous16 )___src__14s__anonymous16_1);
+    ((void)___constructor__F_P14s__anonymous1614s__anonymous16_autogen___1((&___ret__14s__anonymous16_1), ___src__14s__anonymous16_1));
+    return ((struct __anonymous16 )___ret__14s__anonymous16_1);
 }
 static inline void ___constructor__F_P14s__anonymous16i_autogen___1(struct __anonymous16 *___dst__P14s__anonymous16_1, int __i__i_1){
@@ -462 +496 @@
 }
 static inline struct __anonymous17 ___operator_assign__F14s__anonymous17_P14s__anonymous1714s__anonymous17_autogen___1(struct __anonymous17 *___dst__P14s__anonymous17_1, struct __anonymous17 ___src__14s__anonymous17_1){
+    struct __anonymous17 ___ret__14s__anonymous17_1;
     ((void)((*___dst__P14s__anonymous17_1).__i__i_1=___src__14s__anonymous17_1.__i__i_1));
-    return ((struct __anonymous17 )___src__14s__anonymous17_1);
+    ((void)___constructor__F_P14s__anonymous1714s__anonymous17_autogen___1((&___ret__14s__anonymous17_1), ___src__14s__anonymous17_1));
+    return ((struct __anonymous17 )___ret__14s__anonymous17_1);
 }
 static inline void ___constructor__F_P14s__anonymous17i_autogen___1(struct __anonymous17 *___dst__P14s__anonymous17_1, int __i__i_1){
@@ -486 +522 @@
 }
 static inline struct __anonymous18 ___operator_assign__F14s__anonymous18_P14s__anonymous1814s__anonymous18_autogen___1(struct __anonymous18 *___dst__P14s__anonymous18_1, struct __anonymous18 ___src__14s__anonymous18_1){
+    struct __anonymous18 ___ret__14s__anonymous18_1;
     ((void)((*___dst__P14s__anonymous18_1).__i__i_1=___src__14s__anonymous18_1.__i__i_1));
-    return ((struct __anonymous18 )___src__14s__anonymous18_1);
+    ((void)___constructor__F_P14s__anonymous1814s__anonymous18_autogen___1((&___ret__14s__anonymous18_1), ___src__14s__anonymous18_1));
+    return ((struct __anonymous18 )___ret__14s__anonymous18_1);
 }
 static inline void ___constructor__F_P14s__anonymous18i_autogen___1(struct __anonymous18 *___dst__P14s__anonymous18_1, int __i__i_1){
@@ -510 +548 @@
 }
 static inline struct __anonymous19 ___operator_assign__F14s__anonymous19_P14s__anonymous1914s__anonymous19_autogen___1(struct __anonymous19 *___dst__P14s__anonymous19_1, struct __anonymous19 ___src__14s__anonymous19_1){
+    struct __anonymous19 ___ret__14s__anonymous19_1;
     ((void)((*___dst__P14s__anonymous19_1).__i__i_1=___src__14s__anonymous19_1.__i__i_1));
-    return ((struct __anonymous19 )___src__14s__anonymous19_1);
+    ((void)___constructor__F_P14s__anonymous1914s__anonymous19_autogen___1((&___ret__14s__anonymous19_1), ___src__14s__anonymous19_1));
+    return ((struct __anonymous19 )___ret__14s__anonymous19_1);
 }
 static inline void ___constructor__F_P14s__anonymous19i_autogen___1(struct __anonymous19 *___dst__P14s__anonymous19_1, int __i__i_1){
@@ -534 +574 @@
 }
 static inline struct __anonymous20 ___operator_assign__F14s__anonymous20_P14s__anonymous2014s__anonymous20_autogen___1(struct __anonymous20 *___dst__P14s__anonymous20_1, struct __anonymous20 ___src__14s__anonymous20_1){
+    struct __anonymous20 ___ret__14s__anonymous20_1;
     ((void)((*___dst__P14s__anonymous20_1).__i__i_1=___src__14s__anonymous20_1.__i__i_1));
-    return ((struct __anonymous20 )___src__14s__anonymous20_1);
+    ((void)___constructor__F_P14s__anonymous2014s__anonymous20_autogen___1((&___ret__14s__anonymous20_1), ___src__14s__anonymous20_1));
+    return ((struct __anonymous20 )___ret__14s__anonymous20_1);
 }
 static inline void ___constructor__F_P14s__anonymous20i_autogen___1(struct __anonymous20 *___dst__P14s__anonymous20_1, int __i__i_1){
@@ -558 +600 @@
 }
 static inline struct __anonymous21 ___operator_assign__F14s__anonymous21_P14s__anonymous2114s__anonymous21_autogen___1(struct __anonymous21 *___dst__P14s__anonymous21_1, struct __anonymous21 ___src__14s__anonymous21_1){
+    struct __anonymous21 ___ret__14s__anonymous21_1;
     ((void)((*___dst__P14s__anonymous21_1).__i__i_1=___src__14s__anonymous21_1.__i__i_1));
-    return ((struct __anonymous21 )___src__14s__anonymous21_1);
+    ((void)___constructor__F_P14s__anonymous2114s__anonymous21_autogen___1((&___ret__14s__anonymous21_1), ___src__14s__anonymous21_1));
+    return ((struct __anonymous21 )___ret__14s__anonymous21_1);
 }
 static inline void ___constructor__F_P14s__anonymous21i_autogen___1(struct __anonymous21 *___dst__P14s__anonymous21_1, int __i__i_1){
@@ -582 +626 @@
 }
 static inline struct __anonymous22 ___operator_assign__F14s__anonymous22_P14s__anonymous2214s__anonymous22_autogen___1(struct __anonymous22 *___dst__P14s__anonymous22_1, struct __anonymous22 ___src__14s__anonymous22_1){
+    struct __anonymous22 ___ret__14s__anonymous22_1;
     ((void)((*___dst__P14s__anonymous22_1).__i__i_1=___src__14s__anonymous22_1.__i__i_1));
-    return ((struct __anonymous22 )___src__14s__anonymous22_1);
+    ((void)___constructor__F_P14s__anonymous2214s__anonymous22_autogen___1((&___ret__14s__anonymous22_1), ___src__14s__anonymous22_1));
+    return ((struct __anonymous22 )___ret__14s__anonymous22_1);
 }
 static inline void ___constructor__F_P14s__anonymous22i_autogen___1(struct __anonymous22 *___dst__P14s__anonymous22_1, int __i__i_1){
@@ -606 +652 @@
 }
 static inline struct __anonymous23 ___operator_assign__F14s__anonymous23_P14s__anonymous2314s__anonymous23_autogen___1(struct __anonymous23 *___dst__P14s__anonymous23_1, struct __anonymous23 ___src__14s__anonymous23_1){
+    struct __anonymous23 ___ret__14s__anonymous23_1;
     ((void)((*___dst__P14s__anonymous23_1).__i__i_1=___src__14s__anonymous23_1.__i__i_1));
-    return ((struct __anonymous23 )___src__14s__anonymous23_1);
+    ((void)___constructor__F_P14s__anonymous2314s__anonymous23_autogen___1((&___ret__14s__anonymous23_1), ___src__14s__anonymous23_1));
+    return ((struct __anonymous23 )___ret__14s__anonymous23_1);
 }
 static inline void ___constructor__F_P14s__anonymous23i_autogen___1(struct __anonymous23 *___dst__P14s__anonymous23_1, int __i__i_1){

src/tests/.expect/32/extension.txt

@@ -33 +33 @@
 }
 static inline struct S ___operator_assign__F2sS_P2sS2sS_autogen___1(struct S *___dst__P2sS_1, struct S ___src__2sS_1){
+    struct S ___ret__2sS_1;
     ((void)((*___dst__P2sS_1).__a__i_1=___src__2sS_1.__a__i_1));
     ((void)((*___dst__P2sS_1).__b__i_1=___src__2sS_1.__b__i_1));
     ((void)((*___dst__P2sS_1).__c__i_1=___src__2sS_1.__c__i_1));
-    return ((struct S )___src__2sS_1);
+    ((void)___constructor__F_P2sS2sS_autogen___1((&___ret__2sS_1), ___src__2sS_1));
+    return ((struct S )___ret__2sS_1);
 }
 static inline void ___constructor__F_P2sSi_autogen___1(struct S *___dst__P2sS_1, int __a__i_1){
@@ -66 +68 @@
 }
 static inline union U ___operator_assign__F2uU_P2uU2uU_autogen___1(union U *___dst__P2uU_1, union U ___src__2uU_1){
+    union U ___ret__2uU_1;
     ((void)__builtin_memcpy(((void *)___dst__P2uU_1), ((const void *)(&___src__2uU_1)), sizeof(union U )));
-    return ((union U )___src__2uU_1);
+    ((void)___constructor__F_P2uU2uU_autogen___1((&___ret__2uU_1), ___src__2uU_1));
+    return ((union U )___ret__2uU_1);
 }
 static inline void ___constructor__F_P2uUi_autogen___1(union U *___dst__P2uU_1, int __src__i_1){

src/tests/.expect/32/gccExtensions.txt

@@ -59 +59 @@
     }
     inline struct S ___operator_assign__F2sS_P2sS2sS_autogen___2(struct S *___dst__P2sS_2, struct S ___src__2sS_2){
+        struct S ___ret__2sS_2;
         ((void)((*___dst__P2sS_2).__a__i_2=___src__2sS_2.__a__i_2));
         ((void)((*___dst__P2sS_2).__b__i_2=___src__2sS_2.__b__i_2));
         ((void)((*___dst__P2sS_2).__c__i_2=___src__2sS_2.__c__i_2));
-        return ((struct S )___src__2sS_2);
+        ((void)___constructor__F_P2sS2sS_autogen___2((&___ret__2sS_2), ___src__2sS_2));
+        return ((struct S )___ret__2sS_2);
     }
     inline void ___constructor__F_P2sSi_autogen___2(struct S *___dst__P2sS_2, int __a__i_2){
@@ -109 +111 @@
     }
     inline struct s2 ___operator_assign__F3ss2_P3ss23ss2_autogen___2(struct s2 *___dst__P3ss2_2, struct s2 ___src__3ss2_2){
+        struct s2 ___ret__3ss2_2;
         ((void)((*___dst__P3ss2_2).__i__i_2=___src__3ss2_2.__i__i_2));
-        return ((struct s2 )___src__3ss2_2);
+        ((void)___constructor__F_P3ss23ss2_autogen___2((&___ret__3ss2_2), ___src__3ss2_2));
+        return ((struct s2 )___ret__3ss2_2);
     }
     inline void ___constructor__F_P3ss2i_autogen___2(struct s2 *___dst__P3ss2_2, int __i__i_2){
@@ -128 +132 @@
     }
     inline struct s3 ___operator_assign__F3ss3_P3ss33ss3_autogen___2(struct s3 *___dst__P3ss3_2, struct s3 ___src__3ss3_2){
+        struct s3 ___ret__3ss3_2;
         ((void)((*___dst__P3ss3_2).__i__i_2=___src__3ss3_2.__i__i_2));
-        return ((struct s3 )___src__3ss3_2);
+        ((void)___constructor__F_P3ss33ss3_autogen___2((&___ret__3ss3_2), ___src__3ss3_2));
+        return ((struct s3 )___ret__3ss3_2);
     }
     inline void ___constructor__F_P3ss3i_autogen___2(struct s3 *___dst__P3ss3_2, int __i__i_2){
@@ -149 +155 @@
     }
     inline struct s4 ___operator_assign__F3ss4_P3ss43ss4_autogen___2(struct s4 *___dst__P3ss4_2, struct s4 ___src__3ss4_2){
+        struct s4 ___ret__3ss4_2;
         ((void)((*___dst__P3ss4_2).__i__i_2=___src__3ss4_2.__i__i_2));
-        return ((struct s4 )___src__3ss4_2);
+        ((void)___constructor__F_P3ss43ss4_autogen___2((&___ret__3ss4_2), ___src__3ss4_2));
+        return ((struct s4 )___ret__3ss4_2);
     }
     inline void ___constructor__F_P3ss4i_autogen___2(struct s4 *___dst__P3ss4_2, int __i__i_2){

src/tests/.expect/64/KRfunctions.txt

@@ -31 +31 @@
 }
 static inline struct S ___operator_assign__F2sS_P2sS2sS_autogen___1(struct S *___dst__P2sS_1, struct S ___src__2sS_1){
+    struct S ___ret__2sS_1;
     ((void)((*___dst__P2sS_1).__i__i_1=___src__2sS_1.__i__i_1));
-    return ((struct S )___src__2sS_1);
+    ((void)___constructor__F_P2sS2sS_autogen___1((&___ret__2sS_1), ___src__2sS_1));
+    return ((struct S )___ret__2sS_1);
 }
 static inline void ___constructor__F_P2sSi_autogen___1(struct S *___dst__P2sS_1, int __i__i_1){

src/tests/.expect/64/attributes.txt

@@ -22 +22 @@
 }
 static inline struct __anonymous0 ___operator_assign__F13s__anonymous0_P13s__anonymous013s__anonymous0_autogen___1(struct __anonymous0 *___dst__P13s__anonymous0_1, struct __anonymous0 ___src__13s__anonymous0_1){
-    return ((struct __anonymous0 )___src__13s__anonymous0_1);
+    struct __anonymous0 ___ret__13s__anonymous0_1;
+    ((void)___constructor__F_P13s__anonymous013s__anonymous0_autogen___1((&___ret__13s__anonymous0_1), ___src__13s__anonymous0_1));
+    return ((struct __anonymous0 )___ret__13s__anonymous0_1);
 }
 __attribute__ ((unused)) struct Agn1;
@@ -38 +40 @@
 }
 static inline struct Agn2 ___operator_assign__F5sAgn2_P5sAgn25sAgn2_autogen___1(struct Agn2 *___dst__P5sAgn2_1, struct Agn2 ___src__5sAgn2_1){
-    return ((struct Agn2 )___src__5sAgn2_1);
+    struct Agn2 ___ret__5sAgn2_1;
+    ((void)___constructor__F_P5sAgn25sAgn2_autogen___1((&___ret__5sAgn2_1), ___src__5sAgn2_1));
+    return ((struct Agn2 )___ret__5sAgn2_1);
 }
 enum __attribute__ ((unused)) __anonymous1 {
@@ -99 +103 @@
 }
 static inline struct Fdl ___operator_assign__F4sFdl_P4sFdl4sFdl_autogen___1(struct Fdl *___dst__P4sFdl_1, struct Fdl ___src__4sFdl_1){
+    struct Fdl ___ret__4sFdl_1;
     ((void)((*___dst__P4sFdl_1).__f1__i_1=___src__4sFdl_1.__f1__i_1));
     ((void)((*___dst__P4sFdl_1).__f2__i_1=___src__4sFdl_1.__f2__i_1));
@@ -108 +113 @@
     ((void)((*___dst__P4sFdl_1).__f8__i_1=___src__4sFdl_1.__f8__i_1));
     ((void)((*___dst__P4sFdl_1).__f9__Pi_1=___src__4sFdl_1.__f9__Pi_1));
-    return ((struct Fdl )___src__4sFdl_1);
+    ((void)___constructor__F_P4sFdl4sFdl_autogen___1((&___ret__4sFdl_1), ___src__4sFdl_1));
+    return ((struct Fdl )___ret__4sFdl_1);
 }
 static inline void ___constructor__F_P4sFdli_autogen___1(struct Fdl *___dst__P4sFdl_1, int __f1__i_1){
@@ -292 +298 @@
     }
     inline struct __anonymous4 ___operator_assign__F13s__anonymous4_P13s__anonymous413s__anonymous4_autogen___2(struct __anonymous4 *___dst__P13s__anonymous4_2, struct __anonymous4 ___src__13s__anonymous4_2){
+        struct __anonymous4 ___ret__13s__anonymous4_2;
         ((void)((*___dst__P13s__anonymous4_2).__i__i_2=___src__13s__anonymous4_2.__i__i_2));
-        return ((struct __anonymous4 )___src__13s__anonymous4_2);
+        ((void)___constructor__F_P13s__anonymous413s__anonymous4_autogen___2((&___ret__13s__anonymous4_2), ___src__13s__anonymous4_2));
+        return ((struct __anonymous4 )___ret__13s__anonymous4_2);
     }
     inline void ___constructor__F_P13s__anonymous4i_autogen___2(struct __anonymous4 *___dst__P13s__anonymous4_2, int __i__i_2){
@@ -310 +318 @@
     }
     inline enum __anonymous5 ___operator_assign__F13e__anonymous5_P13e__anonymous513e__anonymous5_intrinsic___2(enum __anonymous5 *___dst__P13e__anonymous5_2, enum __anonymous5 ___src__13e__anonymous5_2){
-        return ((enum __anonymous5 )((*___dst__P13e__anonymous5_2)=___src__13e__anonymous5_2));
+        enum __anonymous5 ___ret__13e__anonymous5_2;
+        ((void)(___ret__13e__anonymous5_2=((*___dst__P13e__anonymous5_2)=___src__13e__anonymous5_2)) /* ?{} */);
+        return ((enum __anonymous5 )___ret__13e__anonymous5_2);
     }
     ((void)sizeof(enum __anonymous5 ));
@@ -338 +348 @@
 }
 static inline struct Vad ___operator_assign__F4sVad_P4sVad4sVad_autogen___1(struct Vad *___dst__P4sVad_1, struct Vad ___src__4sVad_1){
-    return ((struct Vad )___src__4sVad_1);
-}
+    struct Vad ___ret__4sVad_1;
+    ((void)___constructor__F_P4sVad4sVad_autogen___1((&___ret__4sVad_1), ___src__4sVad_1));
+    return ((struct Vad )___ret__4sVad_1);
+}

src/tests/.expect/64/declarationSpecifier.txt

@@ -30 +30 @@
 }
 static inline struct __anonymous0 ___operator_assign__F13s__anonymous0_P13s__anonymous013s__anonymous0_autogen___1(struct __anonymous0 *___dst__P13s__anonymous0_1, struct __anonymous0 ___src__13s__anonymous0_1){
+    struct __anonymous0 ___ret__13s__anonymous0_1;
     ((void)((*___dst__P13s__anonymous0_1).__i__i_1=___src__13s__anonymous0_1.__i__i_1));
-    return ((struct __anonymous0 )___src__13s__anonymous0_1);
+    ((void)___constructor__F_P13s__anonymous013s__anonymous0_autogen___1((&___ret__13s__anonymous0_1), ___src__13s__anonymous0_1));
+    return ((struct __anonymous0 )___ret__13s__anonymous0_1);
 }
 static inline void ___constructor__F_P13s__anonymous0i_autogen___1(struct __anonymous0 *___dst__P13s__anonymous0_1, int __i__i_1){
@@ -54 +56 @@
 }
 static inline struct __anonymous1 ___operator_assign__F13s__anonymous1_P13s__anonymous113s__anonymous1_autogen___1(struct __anonymous1 *___dst__P13s__anonymous1_1, struct __anonymous1 ___src__13s__anonymous1_1){
+    struct __anonymous1 ___ret__13s__anonymous1_1;
     ((void)((*___dst__P13s__anonymous1_1).__i__i_1=___src__13s__anonymous1_1.__i__i_1));
-    return ((struct __anonymous1 )___src__13s__anonymous1_1);
+    ((void)___constructor__F_P13s__anonymous113s__anonymous1_autogen___1((&___ret__13s__anonymous1_1), ___src__13s__anonymous1_1));
+    return ((struct __anonymous1 )___ret__13s__anonymous1_1);
 }
 static inline void ___constructor__F_P13s__anonymous1i_autogen___1(struct __anonymous1 *___dst__P13s__anonymous1_1, int __i__i_1){
@@ -78 +82 @@
 }
 static inline struct __anonymous2 ___operator_assign__F13s__anonymous2_P13s__anonymous213s__anonymous2_autogen___1(struct __anonymous2 *___dst__P13s__anonymous2_1, struct __anonymous2 ___src__13s__anonymous2_1){
+    struct __anonymous2 ___ret__13s__anonymous2_1;
     ((void)((*___dst__P13s__anonymous2_1).__i__i_1=___src__13s__anonymous2_1.__i__i_1));
-    return ((struct __anonymous2 )___src__13s__anonymous2_1);
+    ((void)___constructor__F_P13s__anonymous213s__anonymous2_autogen___1((&___ret__13s__anonymous2_1), ___src__13s__anonymous2_1));
+    return ((struct __anonymous2 )___ret__13s__anonymous2_1);
 }
 static inline void ___constructor__F_P13s__anonymous2i_autogen___1(struct __anonymous2 *___dst__P13s__anonymous2_1, int __i__i_1){
@@ -102 +108 @@
 }
 static inline struct __anonymous3 ___operator_assign__F13s__anonymous3_P13s__anonymous313s__anonymous3_autogen___1(struct __anonymous3 *___dst__P13s__anonymous3_1, struct __anonymous3 ___src__13s__anonymous3_1){
+    struct __anonymous3 ___ret__13s__anonymous3_1;
     ((void)((*___dst__P13s__anonymous3_1).__i__i_1=___src__13s__anonymous3_1.__i__i_1));
-    return ((struct __anonymous3 )___src__13s__anonymous3_1);
+    ((void)___constructor__F_P13s__anonymous313s__anonymous3_autogen___1((&___ret__13s__anonymous3_1), ___src__13s__anonymous3_1));
+    return ((struct __anonymous3 )___ret__13s__anonymous3_1);
 }
 static inline void ___constructor__F_P13s__anonymous3i_autogen___1(struct __anonymous3 *___dst__P13s__anonymous3_1, int __i__i_1){
@@ -126 +134 @@
 }
 static inline struct __anonymous4 ___operator_assign__F13s__anonymous4_P13s__anonymous413s__anonymous4_autogen___1(struct __anonymous4 *___dst__P13s__anonymous4_1, struct __anonymous4 ___src__13s__anonymous4_1){
+    struct __anonymous4 ___ret__13s__anonymous4_1;
     ((void)((*___dst__P13s__anonymous4_1).__i__i_1=___src__13s__anonymous4_1.__i__i_1));
-    return ((struct __anonymous4 )___src__13s__anonymous4_1);
+    ((void)___constructor__F_P13s__anonymous413s__anonymous4_autogen___1((&___ret__13s__anonymous4_1), ___src__13s__anonymous4_1));
+    return ((struct __anonymous4 )___ret__13s__anonymous4_1);
 }
 static inline void ___constructor__F_P13s__anonymous4i_autogen___1(struct __anonymous4 *___dst__P13s__anonymous4_1, int __i__i_1){
@@ -150 +160 @@
 }
 static inline struct __anonymous5 ___operator_assign__F13s__anonymous5_P13s__anonymous513s__anonymous5_autogen___1(struct __anonymous5 *___dst__P13s__anonymous5_1, struct __anonymous5 ___src__13s__anonymous5_1){
+    struct __anonymous5 ___ret__13s__anonymous5_1;
     ((void)((*___dst__P13s__anonymous5_1).__i__i_1=___src__13s__anonymous5_1.__i__i_1));
-    return ((struct __anonymous5 )___src__13s__anonymous5_1);
+    ((void)___constructor__F_P13s__anonymous513s__anonymous5_autogen___1((&___ret__13s__anonymous5_1), ___src__13s__anonymous5_1));
+    return ((struct __anonymous5 )___ret__13s__anonymous5_1);
 }
 static inline void ___constructor__F_P13s__anonymous5i_autogen___1(struct __anonymous5 *___dst__P13s__anonymous5_1, int __i__i_1){
@@ -174 +186 @@
 }
 static inline struct __anonymous6 ___operator_assign__F13s__anonymous6_P13s__anonymous613s__anonymous6_autogen___1(struct __anonymous6 *___dst__P13s__anonymous6_1, struct __anonymous6 ___src__13s__anonymous6_1){
+    struct __anonymous6 ___ret__13s__anonymous6_1;
     ((void)((*___dst__P13s__anonymous6_1).__i__i_1=___src__13s__anonymous6_1.__i__i_1));
-    return ((struct __anonymous6 )___src__13s__anonymous6_1);
+    ((void)___constructor__F_P13s__anonymous613s__anonymous6_autogen___1((&___ret__13s__anonymous6_1), ___src__13s__anonymous6_1));
+    return ((struct __anonymous6 )___ret__13s__anonymous6_1);
 }
 static inline void ___constructor__F_P13s__anonymous6i_autogen___1(struct __anonymous6 *___dst__P13s__anonymous6_1, int __i__i_1){
@@ -198 +212 @@
 }
 static inline struct __anonymous7 ___operator_assign__F13s__anonymous7_P13s__anonymous713s__anonymous7_autogen___1(struct __anonymous7 *___dst__P13s__anonymous7_1, struct __anonymous7 ___src__13s__anonymous7_1){
+    struct __anonymous7 ___ret__13s__anonymous7_1;
     ((void)((*___dst__P13s__anonymous7_1).__i__i_1=___src__13s__anonymous7_1.__i__i_1));
-    return ((struct __anonymous7 )___src__13s__anonymous7_1);
+    ((void)___constructor__F_P13s__anonymous713s__anonymous7_autogen___1((&___ret__13s__anonymous7_1), ___src__13s__anonymous7_1));
+    return ((struct __anonymous7 )___ret__13s__anonymous7_1);
 }
 static inline void ___constructor__F_P13s__anonymous7i_autogen___1(struct __anonymous7 *___dst__P13s__anonymous7_1, int __i__i_1){
@@ -230 +246 @@
 }
 static inline struct __anonymous8 ___operator_assign__F13s__anonymous8_P13s__anonymous813s__anonymous8_autogen___1(struct __anonymous8 *___dst__P13s__anonymous8_1, struct __anonymous8 ___src__13s__anonymous8_1){
+    struct __anonymous8 ___ret__13s__anonymous8_1;
     ((void)((*___dst__P13s__anonymous8_1).__i__s_1=___src__13s__anonymous8_1.__i__s_1));
-    return ((struct __anonymous8 )___src__13s__anonymous8_1);
+    ((void)___constructor__F_P13s__anonymous813s__anonymous8_autogen___1((&___ret__13s__anonymous8_1), ___src__13s__anonymous8_1));
+    return ((struct __anonymous8 )___ret__13s__anonymous8_1);
 }
 static inline void ___constructor__F_P13s__anonymous8s_autogen___1(struct __anonymous8 *___dst__P13s__anonymous8_1, short __i__s_1){
@@ -254 +272 @@
 }
 static inline struct __anonymous9 ___operator_assign__F13s__anonymous9_P13s__anonymous913s__anonymous9_autogen___1(struct __anonymous9 *___dst__P13s__anonymous9_1, struct __anonymous9 ___src__13s__anonymous9_1){
+    struct __anonymous9 ___ret__13s__anonymous9_1;
     ((void)((*___dst__P13s__anonymous9_1).__i__s_1=___src__13s__anonymous9_1.__i__s_1));
-    return ((struct __anonymous9 )___src__13s__anonymous9_1);
+    ((void)___constructor__F_P13s__anonymous913s__anonymous9_autogen___1((&___ret__13s__anonymous9_1), ___src__13s__anonymous9_1));
+    return ((struct __anonymous9 )___ret__13s__anonymous9_1);
 }
 static inline void ___constructor__F_P13s__anonymous9s_autogen___1(struct __anonymous9 *___dst__P13s__anonymous9_1, short __i__s_1){
@@ -278 +298 @@
 }
 static inline struct __anonymous10 ___operator_assign__F14s__anonymous10_P14s__anonymous1014s__anonymous10_autogen___1(struct __anonymous10 *___dst__P14s__anonymous10_1, struct __anonymous10 ___src__14s__anonymous10_1){
+    struct __anonymous10 ___ret__14s__anonymous10_1;
     ((void)((*___dst__P14s__anonymous10_1).__i__s_1=___src__14s__anonymous10_1.__i__s_1));
-    return ((struct __anonymous10 )___src__14s__anonymous10_1);
+    ((void)___constructor__F_P14s__anonymous1014s__anonymous10_autogen___1((&___ret__14s__anonymous10_1), ___src__14s__anonymous10_1));
+    return ((struct __anonymous10 )___ret__14s__anonymous10_1);
 }
 static inline void ___constructor__F_P14s__anonymous10s_autogen___1(struct __anonymous10 *___dst__P14s__anonymous10_1, short __i__s_1){
@@ -302 +324 @@
 }
 static inline struct __anonymous11 ___operator_assign__F14s__anonymous11_P14s__anonymous1114s__anonymous11_autogen___1(struct __anonymous11 *___dst__P14s__anonymous11_1, struct __anonymous11 ___src__14s__anonymous11_1){
+    struct __anonymous11 ___ret__14s__anonymous11_1;
     ((void)((*___dst__P14s__anonymous11_1).__i__s_1=___src__14s__anonymous11_1.__i__s_1));
-    return ((struct __anonymous11 )___src__14s__anonymous11_1);
+    ((void)___constructor__F_P14s__anonymous1114s__anonymous11_autogen___1((&___ret__14s__anonymous11_1), ___src__14s__anonymous11_1));
+    return ((struct __anonymous11 )___ret__14s__anonymous11_1);
 }
 static inline void ___constructor__F_P14s__anonymous11s_autogen___1(struct __anonymous11 *___dst__P14s__anonymous11_1, short __i__s_1){
@@ -326 +350 @@
 }
 static inline struct __anonymous12 ___operator_assign__F14s__anonymous12_P14s__anonymous1214s__anonymous12_autogen___1(struct __anonymous12 *___dst__P14s__anonymous12_1, struct __anonymous12 ___src__14s__anonymous12_1){
+    struct __anonymous12 ___ret__14s__anonymous12_1;
     ((void)((*___dst__P14s__anonymous12_1).__i__s_1=___src__14s__anonymous12_1.__i__s_1));
-    return ((struct __anonymous12 )___src__14s__anonymous12_1);
+    ((void)___constructor__F_P14s__anonymous1214s__anonymous12_autogen___1((&___ret__14s__anonymous12_1), ___src__14s__anonymous12_1));
+    return ((struct __anonymous12 )___ret__14s__anonymous12_1);
 }
 static inline void ___constructor__F_P14s__anonymous12s_autogen___1(struct __anonymous12 *___dst__P14s__anonymous12_1, short __i__s_1){
@@ -350 +376 @@
 }
 static inline struct __anonymous13 ___operator_assign__F14s__anonymous13_P14s__anonymous1314s__anonymous13_autogen___1(struct __anonymous13 *___dst__P14s__anonymous13_1, struct __anonymous13 ___src__14s__anonymous13_1){
+    struct __anonymous13 ___ret__14s__anonymous13_1;
     ((void)((*___dst__P14s__anonymous13_1).__i__s_1=___src__14s__anonymous13_1.__i__s_1));
-    return ((struct __anonymous13 )___src__14s__anonymous13_1);
+    ((void)___constructor__F_P14s__anonymous1314s__anonymous13_autogen___1((&___ret__14s__anonymous13_1), ___src__14s__anonymous13_1));
+    return ((struct __anonymous13 )___ret__14s__anonymous13_1);
 }
 static inline void ___constructor__F_P14s__anonymous13s_autogen___1(struct __anonymous13 *___dst__P14s__anonymous13_1, short __i__s_1){
@@ -374 +402 @@
 }
 static inline struct __anonymous14 ___operator_assign__F14s__anonymous14_P14s__anonymous1414s__anonymous14_autogen___1(struct __anonymous14 *___dst__P14s__anonymous14_1, struct __anonymous14 ___src__14s__anonymous14_1){
+    struct __anonymous14 ___ret__14s__anonymous14_1;
     ((void)((*___dst__P14s__anonymous14_1).__i__s_1=___src__14s__anonymous14_1.__i__s_1));
-    return ((struct __anonymous14 )___src__14s__anonymous14_1);
+    ((void)___constructor__F_P14s__anonymous1414s__anonymous14_autogen___1((&___ret__14s__anonymous14_1), ___src__14s__anonymous14_1));
+    return ((struct __anonymous14 )___ret__14s__anonymous14_1);
 }
 static inline void ___constructor__F_P14s__anonymous14s_autogen___1(struct __anonymous14 *___dst__P14s__anonymous14_1, short __i__s_1){
@@ -398 +428 @@
 }
 static inline struct __anonymous15 ___operator_assign__F14s__anonymous15_P14s__anonymous1514s__anonymous15_autogen___1(struct __anonymous15 *___dst__P14s__anonymous15_1, struct __anonymous15 ___src__14s__anonymous15_1){
+    struct __anonymous15 ___ret__14s__anonymous15_1;
     ((void)((*___dst__P14s__anonymous15_1).__i__s_1=___src__14s__anonymous15_1.__i__s_1));
-    return ((struct __anonymous15 )___src__14s__anonymous15_1);
+    ((void)___constructor__F_P14s__anonymous1514s__anonymous15_autogen___1((&___ret__14s__anonymous15_1), ___src__14s__anonymous15_1));
+    return ((struct __anonymous15 )___ret__14s__anonymous15_1);
 }
 static inline void ___constructor__F_P14s__anonymous15s_autogen___1(struct __anonymous15 *___dst__P14s__anonymous15_1, short __i__s_1){
@@ -438 +470 @@
 }
 static inline struct __anonymous16 ___operator_assign__F14s__anonymous16_P14s__anonymous1614s__anonymous16_autogen___1(struct __anonymous16 *___dst__P14s__anonymous16_1, struct __anonymous16 ___src__14s__anonymous16_1){
+    struct __anonymous16 ___ret__14s__anonymous16_1;
     ((void)((*___dst__P14s__anonymous16_1).__i__i_1=___src__14s__anonymous16_1.__i__i_1));
-    return ((struct __anonymous16 )___src__14s__anonymous16_1);
+    ((void)___constructor__F_P14s__anonymous1614s__anonymous16_autogen___1((&___ret__14s__anonymous16_1), ___src__14s__anonymous16_1));
+    return ((struct __anonymous16 )___ret__14s__anonymous16_1);
 }
 static inline void ___constructor__F_P14s__anonymous16i_autogen___1(struct __anonymous16 *___dst__P14s__anonymous16_1, int __i__i_1){
@@ -462 +496 @@
 }
 static inline struct __anonymous17 ___operator_assign__F14s__anonymous17_P14s__anonymous1714s__anonymous17_autogen___1(struct __anonymous17 *___dst__P14s__anonymous17_1, struct __anonymous17 ___src__14s__anonymous17_1){
+    struct __anonymous17 ___ret__14s__anonymous17_1;
     ((void)((*___dst__P14s__anonymous17_1).__i__i_1=___src__14s__anonymous17_1.__i__i_1));
-    return ((struct __anonymous17 )___src__14s__anonymous17_1);
+    ((void)___constructor__F_P14s__anonymous1714s__anonymous17_autogen___1((&___ret__14s__anonymous17_1), ___src__14s__anonymous17_1));
+    return ((struct __anonymous17 )___ret__14s__anonymous17_1);
 }
 static inline void ___constructor__F_P14s__anonymous17i_autogen___1(struct __anonymous17 *___dst__P14s__anonymous17_1, int __i__i_1){
@@ -486 +522 @@
 }
 static inline struct __anonymous18 ___operator_assign__F14s__anonymous18_P14s__anonymous1814s__anonymous18_autogen___1(struct __anonymous18 *___dst__P14s__anonymous18_1, struct __anonymous18 ___src__14s__anonymous18_1){
+    struct __anonymous18 ___ret__14s__anonymous18_1;
     ((void)((*___dst__P14s__anonymous18_1).__i__i_1=___src__14s__anonymous18_1.__i__i_1));
-    return ((struct __anonymous18 )___src__14s__anonymous18_1);
+    ((void)___constructor__F_P14s__anonymous1814s__anonymous18_autogen___1((&___ret__14s__anonymous18_1), ___src__14s__anonymous18_1));
+    return ((struct __anonymous18 )___ret__14s__anonymous18_1);
 }
 static inline void ___constructor__F_P14s__anonymous18i_autogen___1(struct __anonymous18 *___dst__P14s__anonymous18_1, int __i__i_1){
@@ -510 +548 @@
 }
 static inline struct __anonymous19 ___operator_assign__F14s__anonymous19_P14s__anonymous1914s__anonymous19_autogen___1(struct __anonymous19 *___dst__P14s__anonymous19_1, struct __anonymous19 ___src__14s__anonymous19_1){
+    struct __anonymous19 ___ret__14s__anonymous19_1;
     ((void)((*___dst__P14s__anonymous19_1).__i__i_1=___src__14s__anonymous19_1.__i__i_1));
-    return ((struct __anonymous19 )___src__14s__anonymous19_1);
+    ((void)___constructor__F_P14s__anonymous1914s__anonymous19_autogen___1((&___ret__14s__anonymous19_1), ___src__14s__anonymous19_1));
+    return ((struct __anonymous19 )___ret__14s__anonymous19_1);
 }
 static inline void ___constructor__F_P14s__anonymous19i_autogen___1(struct __anonymous19 *___dst__P14s__anonymous19_1, int __i__i_1){
@@ -534 +574 @@
 }
 static inline struct __anonymous20 ___operator_assign__F14s__anonymous20_P14s__anonymous2014s__anonymous20_autogen___1(struct __anonymous20 *___dst__P14s__anonymous20_1, struct __anonymous20 ___src__14s__anonymous20_1){
+    struct __anonymous20 ___ret__14s__anonymous20_1;
     ((void)((*___dst__P14s__anonymous20_1).__i__i_1=___src__14s__anonymous20_1.__i__i_1));
-    return ((struct __anonymous20 )___src__14s__anonymous20_1);
+    ((void)___constructor__F_P14s__anonymous2014s__anonymous20_autogen___1((&___ret__14s__anonymous20_1), ___src__14s__anonymous20_1));
+    return ((struct __anonymous20 )___ret__14s__anonymous20_1);
 }
 static inline void ___constructor__F_P14s__anonymous20i_autogen___1(struct __anonymous20 *___dst__P14s__anonymous20_1, int __i__i_1){
@@ -558 +600 @@
 }
 static inline struct __anonymous21 ___operator_assign__F14s__anonymous21_P14s__anonymous2114s__anonymous21_autogen___1(struct __anonymous21 *___dst__P14s__anonymous21_1, struct __anonymous21 ___src__14s__anonymous21_1){
+    struct __anonymous21 ___ret__14s__anonymous21_1;
     ((void)((*___dst__P14s__anonymous21_1).__i__i_1=___src__14s__anonymous21_1.__i__i_1));
-    return ((struct __anonymous21 )___src__14s__anonymous21_1);
+    ((void)___constructor__F_P14s__anonymous2114s__anonymous21_autogen___1((&___ret__14s__anonymous21_1), ___src__14s__anonymous21_1));
+    return ((struct __anonymous21 )___ret__14s__anonymous21_1);
 }
 static inline void ___constructor__F_P14s__anonymous21i_autogen___1(struct __anonymous21 *___dst__P14s__anonymous21_1, int __i__i_1){
@@ -582 +626 @@
 }
 static inline struct __anonymous22 ___operator_assign__F14s__anonymous22_P14s__anonymous2214s__anonymous22_autogen___1(struct __anonymous22 *___dst__P14s__anonymous22_1, struct __anonymous22 ___src__14s__anonymous22_1){
+    struct __anonymous22 ___ret__14s__anonymous22_1;
     ((void)((*___dst__P14s__anonymous22_1).__i__i_1=___src__14s__anonymous22_1.__i__i_1));
-    return ((struct __anonymous22 )___src__14s__anonymous22_1);
+    ((void)___constructor__F_P14s__anonymous2214s__anonymous22_autogen___1((&___ret__14s__anonymous22_1), ___src__14s__anonymous22_1));
+    return ((struct __anonymous22 )___ret__14s__anonymous22_1);
 }
 static inline void ___constructor__F_P14s__anonymous22i_autogen___1(struct __anonymous22 *___dst__P14s__anonymous22_1, int __i__i_1){
@@ -606 +652 @@
 }
 static inline struct __anonymous23 ___operator_assign__F14s__anonymous23_P14s__anonymous2314s__anonymous23_autogen___1(struct __anonymous23 *___dst__P14s__anonymous23_1, struct __anonymous23 ___src__14s__anonymous23_1){
+    struct __anonymous23 ___ret__14s__anonymous23_1;
     ((void)((*___dst__P14s__anonymous23_1).__i__i_1=___src__14s__anonymous23_1.__i__i_1));
-    return ((struct __anonymous23 )___src__14s__anonymous23_1);
+    ((void)___constructor__F_P14s__anonymous2314s__anonymous23_autogen___1((&___ret__14s__anonymous23_1), ___src__14s__anonymous23_1));
+    return ((struct __anonymous23 )___ret__14s__anonymous23_1);
 }
 static inline void ___constructor__F_P14s__anonymous23i_autogen___1(struct __anonymous23 *___dst__P14s__anonymous23_1, int __i__i_1){

src/tests/.expect/64/extension.txt

@@ -33 +33 @@
 }
 static inline struct S ___operator_assign__F2sS_P2sS2sS_autogen___1(struct S *___dst__P2sS_1, struct S ___src__2sS_1){
+    struct S ___ret__2sS_1;
     ((void)((*___dst__P2sS_1).__a__i_1=___src__2sS_1.__a__i_1));
     ((void)((*___dst__P2sS_1).__b__i_1=___src__2sS_1.__b__i_1));
     ((void)((*___dst__P2sS_1).__c__i_1=___src__2sS_1.__c__i_1));
-    return ((struct S )___src__2sS_1);
+    ((void)___constructor__F_P2sS2sS_autogen___1((&___ret__2sS_1), ___src__2sS_1));
+    return ((struct S )___ret__2sS_1);
 }
 static inline void ___constructor__F_P2sSi_autogen___1(struct S *___dst__P2sS_1, int __a__i_1){
@@ -66 +68 @@
 }
 static inline union U ___operator_assign__F2uU_P2uU2uU_autogen___1(union U *___dst__P2uU_1, union U ___src__2uU_1){
+    union U ___ret__2uU_1;
     ((void)__builtin_memcpy(((void *)___dst__P2uU_1), ((const void *)(&___src__2uU_1)), sizeof(union U )));
-    return ((union U )___src__2uU_1);
+    ((void)___constructor__F_P2uU2uU_autogen___1((&___ret__2uU_1), ___src__2uU_1));
+    return ((union U )___ret__2uU_1);
 }
 static inline void ___constructor__F_P2uUi_autogen___1(union U *___dst__P2uU_1, int __src__i_1){

src/tests/.expect/64/gccExtensions.txt

@@ -59 +59 @@
     }
     inline struct S ___operator_assign__F2sS_P2sS2sS_autogen___2(struct S *___dst__P2sS_2, struct S ___src__2sS_2){
+        struct S ___ret__2sS_2;
         ((void)((*___dst__P2sS_2).__a__i_2=___src__2sS_2.__a__i_2));
         ((void)((*___dst__P2sS_2).__b__i_2=___src__2sS_2.__b__i_2));
         ((void)((*___dst__P2sS_2).__c__i_2=___src__2sS_2.__c__i_2));
-        return ((struct S )___src__2sS_2);
+        ((void)___constructor__F_P2sS2sS_autogen___2((&___ret__2sS_2), ___src__2sS_2));
+        return ((struct S )___ret__2sS_2);
     }
     inline void ___constructor__F_P2sSi_autogen___2(struct S *___dst__P2sS_2, int __a__i_2){
@@ -109 +111 @@
     }
     inline struct s2 ___operator_assign__F3ss2_P3ss23ss2_autogen___2(struct s2 *___dst__P3ss2_2, struct s2 ___src__3ss2_2){
+        struct s2 ___ret__3ss2_2;
         ((void)((*___dst__P3ss2_2).__i__i_2=___src__3ss2_2.__i__i_2));
-        return ((struct s2 )___src__3ss2_2);
+        ((void)___constructor__F_P3ss23ss2_autogen___2((&___ret__3ss2_2), ___src__3ss2_2));
+        return ((struct s2 )___ret__3ss2_2);
     }
     inline void ___constructor__F_P3ss2i_autogen___2(struct s2 *___dst__P3ss2_2, int __i__i_2){
@@ -128 +132 @@
     }
     inline struct s3 ___operator_assign__F3ss3_P3ss33ss3_autogen___2(struct s3 *___dst__P3ss3_2, struct s3 ___src__3ss3_2){
+        struct s3 ___ret__3ss3_2;
         ((void)((*___dst__P3ss3_2).__i__i_2=___src__3ss3_2.__i__i_2));
-        return ((struct s3 )___src__3ss3_2);
+        ((void)___constructor__F_P3ss33ss3_autogen___2((&___ret__3ss3_2), ___src__3ss3_2));
+        return ((struct s3 )___ret__3ss3_2);
     }
     inline void ___constructor__F_P3ss3i_autogen___2(struct s3 *___dst__P3ss3_2, int __i__i_2){
@@ -149 +155 @@
     }
     inline struct s4 ___operator_assign__F3ss4_P3ss43ss4_autogen___2(struct s4 *___dst__P3ss4_2, struct s4 ___src__3ss4_2){
+        struct s4 ___ret__3ss4_2;
         ((void)((*___dst__P3ss4_2).__i__i_2=___src__3ss4_2.__i__i_2));
-        return ((struct s4 )___src__3ss4_2);
+        ((void)___constructor__F_P3ss43ss4_autogen___2((&___ret__3ss4_2), ___src__3ss4_2));
+        return ((struct s4 )___ret__3ss4_2);
     }
     inline void ___constructor__F_P3ss4i_autogen___2(struct s4 *___dst__P3ss4_2, int __i__i_2){

src/tests/.expect/concurrent/sched-int-wait.txt

@@ +1 @@
+Starting
+Done

src/tests/.expect/memberCtors-ERR1.txt

@@ -1 @@
-memberCtors.c:62 error: in void ?{}(B *b), field a2 used before being constructed
+memberCtors.c:71 error: in void ?{}(B *b), field a2 used before being constructed

src/tests/.expect/memberCtors.txt

@@ -16 +16 @@
 assigning int: 0 0
 end construct A
+copy constructing int: 0
+copy constructing int: 0
+begin copy construct A
+copy construct this->x
+copy constructing int: 1001
+assign this->y
+copy constructing int: 0
+destructing int: 0
+destructing int: 0
+end copy construct A
+begin ?=? A
+copy constructing int: 1001
+destructing int: 1001
+destructing int: 1001
+copy constructing int: 0
+destructing int: 0
+destructing int: 0
+copy constructing int: 0
+destructing int: 0
+destructing int: 0
+end ?=? A
+copy constructing int: 0
+copy constructing int: 0
+begin copy construct A
+copy construct this->x
+copy constructing int: 1001
+assign this->y
+copy constructing int: 0
+destructing int: 0
+destructing int: 0
+end copy construct A
+destructing int: 0
+destructing int: 0
+destructing int: 1001
+destructing int: 0
+destructing int: 0
+destructing int: 1001
 construct b->a1
 constructing int
@@ -36 +73 @@
 copy constructing int: 1000
 assign this->y
-end copy construct A
-copy constructing int: 0
-copy constructing int: 0
-begin copy construct A
-copy construct this->x
-copy constructing int: 1001
-assign this->y
-end copy construct A
-copy constructing int: 0
-copy constructing int: 0
-begin copy construct A
-copy construct this->x
-copy constructing int: 0
-assign this->y
+copy constructing int: 0
+destructing int: 0
+destructing int: 0
+end copy construct A
+copy constructing int: 0
+copy constructing int: 0
+begin copy construct A
+copy construct this->x
+copy constructing int: 1001
+assign this->y
+copy constructing int: 0
+destructing int: 0
+destructing int: 0
+end copy construct A
+copy constructing int: 0
+copy constructing int: 0
+begin copy construct A
+copy construct this->x
+copy constructing int: 0
+assign this->y
+copy constructing int: 0
+destructing int: 0
+destructing int: 0
 end copy construct A
 End of main
@@ -60 +106 @@
 assigning int: 0 0
 end construct A
+copy constructing int: 0
+copy constructing int: 0
+begin copy construct A
+copy construct this->x
+copy constructing int: 999
+assign this->y
+copy constructing int: 0
+destructing int: 0
+destructing int: 0
+end copy construct A
+begin ?=? A
+copy constructing int: 999
+destructing int: 999
+destructing int: 999
+copy constructing int: 0
+destructing int: 0
+destructing int: 0
+copy constructing int: 0
+destructing int: 0
+destructing int: 0
+end ?=? A
+copy constructing int: 0
+copy constructing int: 0
+begin copy construct A
+copy construct this->x
+copy constructing int: 999
+assign this->y
+copy constructing int: 0
+destructing int: 0
+destructing int: 0
+end copy construct A
+destructing int: 0
+destructing int: 0
+destructing int: 999
+destructing int: 0
+destructing int: 0
+destructing int: 999
 destructing int: 0
 destructing int: 0
@@ -80 +163 @@
 assigning int: 0 0
 end construct A
+copy constructing int: 0
+copy constructing int: 0
+begin copy construct A
+copy construct this->x
+copy constructing int: 999
+assign this->y
+copy constructing int: 0
+destructing int: 0
+destructing int: 0
+end copy construct A
+begin ?=? A
+copy constructing int: 999
+destructing int: 999
+destructing int: 999
+copy constructing int: 0
+destructing int: 0
+destructing int: 0
+copy constructing int: 0
+destructing int: 0
+destructing int: 0
+end ?=? A
+copy constructing int: 0
+copy constructing int: 0
+begin copy construct A
+copy construct this->x
+copy constructing int: 999
+assign this->y
+copy constructing int: 0
+destructing int: 0
+destructing int: 0
+end copy construct A
+destructing int: 0
+destructing int: 0
+destructing int: 999
+destructing int: 0
+destructing int: 0
+destructing int: 999
 destructing int: 0
 destructing int: 0

src/tests/.expect/rational.txt

@@ -17 +17 @@
 3/1
 4/3
-conversion
-0.75
-0.142857142857143
-3.14159292035398
-3/4
-1/7
-355/113
 decompose
 more tests

src/tests/Makefile.am

@@ -11 +11 @@
 ## Created On       : Sun May 31 09:08:15 2015
 ## Last Modified By : Peter A. Buhr
-## Last Modified On : Thu Feb 16 15:27:50 2017
-## Update Count     : 41
+## Last Modified On : Sun May 14 14:43:48 2017
+## Update Count     : 42
 ###############################################################################
 
 debug=yes
 
-quick_test=vector_test avl_test operators numericConstants expression enum array typeof cast dtor-early-exit init_once
+quick_test=vector_test avl_test operators numericConstants expression enum array typeof cast dtor-early-exit init_once attributes
 
 if BUILD_CONCURRENCY
@@ -30 +30 @@
 # applies to both programs
 EXTRA_FLAGS =
-BUILD_FLAGS = -g -Wall -Wno-unused-function @CFA_FLAGS@ ${EXTRA_FLAGS}
+BUILD_FLAGS = -g -Wall -Wno-unused-function -quiet @CFA_FLAGS@ ${EXTRA_FLAGS}
 TEST_FLAGS = $(if $(test), 2> .err/${@}.log, )
 CFLAGS = ${TEST_FLAGS} ${BUILD_FLAGS}
@@ -76 +76 @@
 
 declarationSpecifier: declarationSpecifier.c
-        ${CC} ${CFLAGS} -CFA -XCFA -p ${<} -o ${@}
+        ${CC} ${CFLAGS} -CFA -XCFA -p -XCFA -L ${<} -o ${@}
 
 gccExtensions : gccExtensions.c
-        ${CC} ${CFLAGS} -CFA -XCFA -p ${<} -o ${@}
+        ${CC} ${CFLAGS} -CFA -XCFA -p -XCFA -L ${<} -o ${@}
 
 extension : extension.c
-        ${CC} ${CFLAGS} -CFA -XCFA -p ${<} -o ${@}
+        ${CC} ${CFLAGS} -CFA -XCFA -p -XCFA -L ${<} -o ${@}
 
 attributes : attributes.c
-        ${CC} ${CFLAGS} -CFA -XCFA -p ${<} -o ${@}
+        ${CC} ${CFLAGS} -CFA -XCFA -p -XCFA -L ${<} -o ${@}
 
 KRfunctions : KRfunctions.c
-        ${CC} ${CFLAGS} -CFA -XCFA -p ${<} -o ${@}
+        ${CC} ${CFLAGS} -CFA -XCFA -p -XCFA -L ${<} -o ${@}
+
+gmp : gmp.c
+        ${CC} ${CFLAGS} -lgmp ${<} -o ${@}
 
 memberCtors-ERR1: memberCtors.c

src/tests/Makefile.in

@@ -226 +226 @@
 quick_test = vector_test avl_test operators numericConstants \
         expression enum array typeof cast dtor-early-exit init_once \
-        $(am__append_1)
+        attributes $(am__append_1)
 @BUILD_CONCURRENCY_FALSE@concurrent = no
 @BUILD_CONCURRENCY_TRUE@concurrent = yes
@@ -234 +234 @@
 # applies to both programs
 EXTRA_FLAGS = 
-BUILD_FLAGS = -g -Wall -Wno-unused-function @CFA_FLAGS@ ${EXTRA_FLAGS}
+BUILD_FLAGS = -g -Wall -Wno-unused-function -quiet @CFA_FLAGS@ ${EXTRA_FLAGS}
 TEST_FLAGS = $(if $(test), 2> .err/${@}.log, )
 fstream_test_SOURCES = fstream_test.c
@@ -695 +695 @@
 
 declarationSpecifier: declarationSpecifier.c
-        ${CC} ${CFLAGS} -CFA -XCFA -p ${<} -o ${@}
+        ${CC} ${CFLAGS} -CFA -XCFA -p -XCFA -L ${<} -o ${@}
 
 gccExtensions : gccExtensions.c
-        ${CC} ${CFLAGS} -CFA -XCFA -p ${<} -o ${@}
+        ${CC} ${CFLAGS} -CFA -XCFA -p -XCFA -L ${<} -o ${@}
 
 extension : extension.c
-        ${CC} ${CFLAGS} -CFA -XCFA -p ${<} -o ${@}
+        ${CC} ${CFLAGS} -CFA -XCFA -p -XCFA -L ${<} -o ${@}
 
 attributes : attributes.c
-        ${CC} ${CFLAGS} -CFA -XCFA -p ${<} -o ${@}
+        ${CC} ${CFLAGS} -CFA -XCFA -p -XCFA -L ${<} -o ${@}
 
 KRfunctions : KRfunctions.c
-        ${CC} ${CFLAGS} -CFA -XCFA -p ${<} -o ${@}
+        ${CC} ${CFLAGS} -CFA -XCFA -p -XCFA -L ${<} -o ${@}
+
+gmp : gmp.c
+        ${CC} ${CFLAGS} -lgmp ${<} -o ${@}
 
 memberCtors-ERR1: memberCtors.c

src/tests/memberCtors.c

@@ -53 +53 @@
 } // z never constructed - will be automatically copy constructed
 
+A ?=?(A * this, A other) {
+  printf("begin ?=? A\n");
+  this->x = other.x;
+  this->y = other.y;
+  this->z = other.z;
+  printf("end ?=? A\n");
+  return *this;
+}
+
 struct B {
   A a1, a2, a3;

src/tests/rational.c

@@ -10 +10 @@
 // Created On       : Mon Mar 28 08:43:12 2016
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue May  2 22:11:05 2017
-// Update Count     : 41
+// Last Modified On : Sun May 14 18:10:28 2017
+// Update Count     : 57
 // 
 
+#include <rational>
 #include <limits>
-#include <rational>
+#include <stdlib>
 #include <fstream>
+
+// UNNECESSARY, FIX ME
+void ?{}( int * this ) { *this = 0; }
+void ?{}( int * this, zero_t ) { *this = 0; }
+void ?{}( int * this, one_t ) { *this = 1; }
 
 int main() {
         sout | "constructor" | endl;
-        Rational a = { 3 }, b = { 4 }, c;
+        Rational(int) a = { 3 }, b = { 4 }, c;
         sout | a | b | c | endl;
-        a = (Rational){ 4, 8 };
-        b = (Rational){ 5, 7 };
+
+        a = (Rational(int)){ 4, 8 };
+        b = (Rational(int)){ 5, 7 };
         sout | a | b | endl;
-        a = (Rational){ -2, -3 };
-        b = (Rational){ 3, -2 };
+        a = (Rational(int)){ -2, -3 };
+        b = (Rational(int)){ 3, -2 };
         sout | a | b | endl;
-        a = (Rational){ -2, 3 };
-        b = (Rational){ 3, 2 };
+        a = (Rational(int)){ -2, 3 };
+        b = (Rational(int)){ 3, 2 };
         sout | a | b | endl;
 
         sout | "logical" | endl;
-        a = (Rational){ -2 };
-        b = (Rational){ -3, 2 };
+        a = (Rational(int)){ -2 };
+        b = (Rational(int)){ -3, 2 };
         sout | a | b | endl;
 //      sout | a == 1 | endl; // FIX ME
@@ -50 +57 @@
         sout | a / b | endl;
 
-        sout | "conversion" | endl;
-        a = (Rational){ 3, 4 };
-        sout | widen( a ) | endl;
-        a = (Rational){ 1, 7 };
-        sout | widen( a ) | endl;
-        a = (Rational){ 355, 113 };
-        sout | widen( a ) | endl;
-        sout | narrow( 0.75, 4 ) | endl;
-        sout | narrow( 0.14285714285714, 16 ) | endl;
-        sout | narrow( 3.14159265358979, 256 ) | endl;
+//      sout | "conversion" | endl;
+//      a = (Rational(int)){ 3, 4 };
+//      sout | widen( a ) | endl;
+//      a = (Rational(int)){ 1, 7 };
+//      sout | widen( a ) | endl;
+//      a = (Rational(int)){ 355, 113 };
+//      sout | widen( a ) | endl;
+//      sout | narrow( 0.75, 4 ) | endl;
+//      sout | narrow( 0.14285714285714, 16 ) | endl;
+//      sout | narrow( 3.14159265358979, 256 ) | endl;
 
         sout | "decompose" | endl;
-        RationalImpl n, d;
+        int n, d;
 //      [n, d] = a;
 //      sout | a | n | d | endl;
 
         sout | "more tests" | endl;
-        Rational x = { 1, 2 }, y = { 2 };
+        Rational(int) x = { 1, 2 }, y = { 2 };
         sout | x - y | endl;
         sout | x > y | endl;
@@ -73 +80 @@
         sout | y | denominator( y, -2 ) | y | endl;
 
-        Rational z = { 0, 5 };
+        Rational(int) z = { 0, 5 };
         sout | z | endl;
 
         sout | x | numerator( x, 0 ) | x | endl;
 
-        x = (Rational){ 1, MAX } + (Rational){ 1, MAX };
+        x = (Rational(int)){ 1, MAX } + (Rational(int)){ 1, MAX };
         sout | x | endl;
-        x = (Rational){ 3, MAX } + (Rational){ 2, MAX };
+        x = (Rational(int)){ 3, MAX } + (Rational(int)){ 2, MAX };
         sout | x | endl;
 

src/tests/sched-int-wait.c

@@ -113 +113 @@
         waiter_left = 4;
         processor p;
+        sout | "Starting" | endl;
         {
                 Signaler  e;
@@ -122 +123 @@
                 }
         }
+        sout | "Done" | endl;
 }

src/tests/test.py

@@ -24 +24 @@
         self.name, self.path = name, path
 
+class TestResult:
+        SUCCESS = 0
+        FAILURE = 1
+        TIMEOUT = 124
+
 # parses the Makefile to find the machine type (32-bit / 64-bit)
 def getMachineType():
         sh('echo "void ?{}(int*a,int b){}int main(){return 0;}" > .dummy.c')
         ret, out = sh("make .dummy -s", print2stdout=True)
-        
+
         if ret != 0:
                 print("Failed to identify architecture:")
@@ -161 +166 @@
 
         # build, skipping to next test on error
-        make_ret, _ = sh("""%s test=yes EXTRA_FLAGS="-quiet %s" %s 2> %s 1> /dev/null""" % (make_cmd, options, test.name, out_file), dry_run)
+        make_ret, _ = sh("""%s test=yes EXTRA_FLAGS="%s" %s 2> %s 1> /dev/null""" % (make_cmd, options, test.name, out_file), dry_run)
+
+        retcode = 0
+        error = None
 
         # if the make command succeds continue otherwise skip to diff
@@ -170 +178 @@
                 if fileIsExecutable(test.name) :
                         # run test
-                        sh("./%s %s > %s 2>&1" % (test.name, stdinput, out_file), dry_run)
+                        retcode, _ = sh("timeout 60 ./%s %s > %s 2>&1" % (test.name, stdinput, out_file), dry_run)
                 else :
                         # simply cat the result into the output
@@ -179 +187 @@
                 sh("mv %s %s" % (err_file, out_file), dry_run)
 
-        retcode = 0
-        error = None
-
-        if generate :
-                # if we are ounly generating the output we still need to check that the test actually exists
-                if not dry_run and fileContainsOnly(out_file, "make: *** No rule to make target `%s'.  Stop." % test.name) :
-                        retcode = 1;
-                        error = "\t\tNo make target for test %s!" % test.name
-                        sh("rm %s" % out_file, False)
-
-        else :
-                # fetch return code and error from the diff command
-                retcode, error = diff(".expect/%s.txt" % test.path, ".out/%s.log" % test.name, dry_run)
-        
+        if retcode == 0:
+                if generate :
+                        # if we are ounly generating the output we still need to check that the test actually exists
+                        if not dry_run and fileContainsOnly(out_file, "make: *** No rule to make target `%s'.  Stop." % test.name) :
+                                retcode = 1;
+                                error = "\t\tNo make target for test %s!" % test.name
+                                sh("rm %s" % out_file, False)
+                else :
+                        # fetch return code and error from the diff command
+                        retcode, error = diff(".expect/%s.txt" % test.path, ".out/%s.log" % test.name, dry_run)
         # clean the executable
         sh("rm -f %s > /dev/null 2>&1" % test.name, dry_run)
@@ -205 +209 @@
         name_txt = "%20s  " % t.name
 
-        #run the test instance and collect the result
-        test_failed, error = run_single_test(t, generate, dry_run, debug)
+        retcode, error = run_single_test(t, generate, dry_run, debug)
 
         # update output based on current action
         if generate :
-                failed_txt = "ERROR"
-                success_txt = "Done"
-        else :
-                failed_txt = "FAILED"
-                success_txt = "PASSED"
+                if   retcode == TestResult.SUCCESS:     result_txt = "Done"
+                elif retcode == TestResult.TIMEOUT:     result_txt = "TIMEOUT"
+                else :                                          result_txt = "ERROR"
+        else :
+                if   retcode == TestResult.SUCCESS:     result_txt = "PASSED"
+                elif retcode == TestResult.TIMEOUT:     result_txt = "TIMEOUT"
+                else :                                          result_txt = "FAILED"
 
         #print result with error if needed
-        text = name_txt + (failed_txt if test_failed else success_txt)
+        text = name_txt + result_txt
         out = sys.stdout
         if error :
@@ -223 +228 @@
                 out = sys.stderr
 
-        print(text, file = out);
+        print(text, file = out)
         sys.stdout.flush()
         sys.stderr.flush()
         signal.signal(signal.SIGINT, signal.SIG_IGN)
 
-        return test_failed
+        return retcode != TestResult.SUCCESS
 
 # run the given list of tests with the given parameters
@@ -269 +274 @@
 if __name__ == "__main__":
         #always run from same folder
-        chdir() 
-        
+        chdir()
+
         # parse the command line arguments
         options = getOptions()