Changeset 3906301 for src/InitTweak/FixInit.cc

Timestamp:

Aug 29, 2016, 5:58:17 PM (8 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, ctor, 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:

fa463f1

Parents:

486341f

git-author:

Rob Schluntz <rschlunt@…> (08/25/16 11:09:18)

git-committer:

Rob Schluntz <rschlunt@…> (08/29/16 17:58:17)

Message:

change constructor warnings into errors and update the test output

File:

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

src/InitTweak/FixInit.cc

@@ -188 +188 @@
                         virtual void visit( ApplicationExpr * appExpr );
 
+                        SemanticError errors;
                   private:
                         void handleFirstParam( Expression * firstParam );
+                        template< typename... Params >
+                        void emit( const Params &... params );
 
                         FunctionDecl * function = 0;
@@ -258 +261 @@
                                 WarnStructMembers warner;
                                 acceptAll( translationUnit, warner );
+
+                                // visitor doesn't throw so that it can collect all errors
+                                if ( ! warner.errors.isEmpty() ) {
+                                        throw warner.errors;
+                                }
                         }
                 }
@@ -735 +743 @@
                         for ( DeclarationWithType * member : unhandled ) {
                                 // emit a warning for each unhandled member
-                                warn( "in ", CodeGen::genType( function->get_functionType(), function->get_name(), false ), ", member ", member->get_name(), " may not have been ", isConstructor( funcDecl->get_name() ) ? "constructed" : "destructed" );
+                                emit( "in ", CodeGen::genType( function->get_functionType(), function->get_name(), false ), ", member ", member->get_name(), " may not have been ", isConstructor( funcDecl->get_name() ) ? "constructed" : "destructed" );
                         }
 
+                        // need to steal the errors before they're lost
+                        old.errors.append( errors );
                         *this = old;
                 }
@@ -797 +807 @@
                                                         if ( unhandled.count( memberExpr->get_member() ) ) {
                                                                 // emit a warning because a member was used before it was constructed
-                                                                warn( "in ", CodeGen::genType( function->get_functionType(), function->get_name(), false ), ", member ", memberExpr->get_member()->get_name(), " used before being constructed" );
+                                                                emit( "in ", CodeGen::genType( function->get_functionType(), function->get_name(), false ), ", member ", memberExpr->get_member()->get_name(), " used before being constructed" );
                                                         }
                                                 }
@@ -805 +815 @@
                         Parent::visit( memberExpr );
                 }
+
+                template< typename Visitor, typename... Params >
+                void error( Visitor & v, const Params &... params ) {
+                        v.errors.append( toString( params... ) );
+                }
+
+                template< typename... Params >
+                void WarnStructMembers::emit( const Params &... params ) {
+                        // toggle warnings vs. errors here.
+                        // warn( params... );
+                        error( *this, params... );
+                }
         } // namespace
 } // namespace InitTweak