Changes in src/InitTweak/FixInit.cc [64ac636:68fe077a]

File:

• src/InitTweak/FixInit.cc (modified) (7 diffs)

src/InitTweak/FixInit.cc

@@ -232 +232 @@
                         void handleFirstParam( Expression * firstParam );
                         template< typename... Params >
-                        void emit( CodeLocation, const Params &... params );
+                        void emit( const Params &... params );
 
                         FunctionDecl * function = 0;
-                        std::set< DeclarationWithType * > unhandled;
-                        std::map< DeclarationWithType *, CodeLocation > usedUninit;
+                        std::set< DeclarationWithType * > unhandled, usedUninit;
                         ObjectDecl * thisParam = 0;
                         bool isCtor = false; // true if current function is a constructor
@@ -337 +336 @@
                         GenStructMemberCalls warner;
                         acceptAll( translationUnit, warner );
+
+                        // visitor doesn't throw so that it can collect all errors
+                        if ( ! warner.errors.isEmpty() ) {
+                                throw warner.errors;
+                        }
                 }
 
@@ -936 +940 @@
                         ValueGuard< FunctionDecl * > oldFunction( funcDecl );
                         ValueGuard< std::set< DeclarationWithType * > > oldUnhandled( unhandled );
-                        ValueGuard< std::map< DeclarationWithType *, CodeLocation > > oldUsedUninit( usedUninit );
+                        ValueGuard< std::set< DeclarationWithType * > > oldUsedUninit( usedUninit );
                         ValueGuard< ObjectDecl * > oldThisParam( thisParam );
                         ValueGuard< bool > oldIsCtor( isCtor );
                         ValueGuard< StructDecl * > oldStructDecl( structDecl );
-                        errors = SemanticError();  // clear previous errors
 
                         // need to start with fresh sets
@@ -969 +972 @@
                         // remove the unhandled objects from usedUninit, because a call is inserted
                         // to handle them - only objects that are later constructed are used uninitialized.
-                        std::map< DeclarationWithType *, CodeLocation > diff;
-                        // need the comparator since usedUninit and unhandled have different types
-                        struct comp_t {
-                                typedef decltype(usedUninit)::value_type usedUninit_t;
-                                typedef decltype(unhandled)::value_type unhandled_t;
-                                bool operator()(usedUninit_t x, unhandled_t y) { return x.first < y; }
-                                bool operator()(unhandled_t x, usedUninit_t y) { return x < y.first; }
-                        } comp;
-                        std::set_difference( usedUninit.begin(), usedUninit.end(), unhandled.begin(), unhandled.end(), std::inserter( diff, diff.begin() ), comp );
-                        for ( auto p : diff ) {
-                                DeclarationWithType * member = p.first;
-                                CodeLocation loc = p.second;
-                                // xxx - make error message better by also tracking the location that the object is constructed at?
-                                emit( loc, "in ", CodeGen::genPrettyType( function->get_functionType(), function->get_name() ), ", field ", member->get_name(), " used before being constructed" );
+                        std::set< DeclarationWithType * > diff;
+                        std::set_difference( usedUninit.begin(), usedUninit.end(), unhandled.begin(), unhandled.end(), std::inserter( diff, diff.begin() ) );
+                        for ( DeclarationWithType * member : diff ) {
+                                emit( "in ", CodeGen::genPrettyType( function->get_functionType(), function->get_name() ), ", field ", member->get_name(), " used before being constructed" );
                         }
 
@@ -1027 +1020 @@
                                                         }
                                                 } catch ( SemanticError & error ) {
-                                                        emit( funcDecl->location, "in ", CodeGen::genPrettyType( function->get_functionType(), function->get_name() ), ", field ", field->get_name(), " not explicitly ", isCtor ? "constructed" : "destructed",  " and no ", isCtor ? "default constructor" : "destructor", " found" );
+                                                        emit( "in ", CodeGen::genPrettyType( function->get_functionType(), function->get_name() ), ", field ", field->get_name(), " not explicitly ", isCtor ? "constructed" : "destructed",  " and no ", isCtor ? "default constructor" : "destructor", " found" );
                                                 }
                                         }
                                 }
                                 leaveScope();
-                        }
-                        if (! errors.isEmpty()) {
-                                throw errors;
                         }
                 }
@@ -1089 +1079 @@
                                                         if ( unhandled.count( memberExpr->get_member() ) ) {
                                                                 // emit a warning because a member was used before it was constructed
-                                                                usedUninit.insert( { memberExpr->get_member(), memberExpr->location } );
+                                                                usedUninit.insert( memberExpr->get_member() );
                                                         }
                                                 }
@@ -1099 +1089 @@
 
                 template< typename Visitor, typename... Params >
-                void error( Visitor & v, CodeLocation loc, const Params &... params ) {
-                        SemanticError err( toString( params... ) );
-                        err.set_location( loc );
-                        v.errors.append( err );
+                void error( Visitor & v, const Params &... params ) {
+                        v.errors.append( toString( params... ) );
                 }
 
                 template< typename... Params >
-                void GenStructMemberCalls::emit( CodeLocation loc, const Params &... params ) {
+                void GenStructMemberCalls::emit( const Params &... params ) {
                         // toggle warnings vs. errors here.
                         // warn( params... );
-                        error( *this, loc, params... );
+                        error( *this, params... );
                 }