Changeset 3906301

Timestamp:

Aug 29, 2016, 5:58:17 PM (9 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

Location:

src

Files:

• Common/SemanticError.cc (modified) (2 diffs)
• Common/SemanticError.h (modified) (3 diffs)
• InitTweak/FixInit.cc (modified) (5 diffs)
• SynTree/Declaration.cc (modified) (1 diff)
• SynTree/Declaration.h (modified) (1 diff)
• SynTree/Expression.cc (modified) (1 diff)
• SynTree/Expression.h (modified) (1 diff)
• SynTree/Statement.cc (modified) (1 diff)
• SynTree/Statement.h (modified) (1 diff)
• SynTree/Type.cc (modified) (1 diff)
• SynTree/Type.h (modified) (1 diff)
• tests/.expect/ctorWarnings.txt (modified) (1 diff)
• tests/Makefile.am (modified) (1 diff)
• tests/Makefile.in (modified) (1 diff)

src/Common/SemanticError.cc

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// SemanticError.cc -- 
+// SemanticError.cc --
 //
 // Author           : Richard C. Bilson
@@ -26 +26 @@
 
 SemanticError::SemanticError( std::string error ) {
-        errors.push_back( std::string( "Error: " ) + error );
+  append( error );
 }
 
 void SemanticError::append( SemanticError &other ) {
-        errors.splice( errors.end(), other.errors );
+  errors.splice( errors.end(), other.errors );
+}
+
+void SemanticError::append( const std::string & msg ) {
+  errors.push_back( std::string( "Error: ") + msg );
 }
 

src/Common/SemanticError.h

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// SemanticError.h -- 
+// SemanticError.h --
 //
 // Author           : Richard C. Bilson
@@ -31 +31 @@
 
         void append( SemanticError &other );
+        void append( const std::string & );
         bool isEmpty() const;
         void print( std::ostream &os );
@@ -42 +43 @@
 template< typename T >
 SemanticError::SemanticError( const std::string &error, const T *obj ) {
-        std::ostringstream os;
-        os << "Error: " << error;
-        obj->print( os );
-        errors.push_back( os.str() );
+        append( toString( error, obj ) );
 }
+
 
 #endif // SEMANTICERROR_H

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

src/SynTree/Declaration.cc

@@ -56 +56 @@
 }
 
-std::ostream & operator<<( std::ostream & out, Declaration * decl ) {
+std::ostream & operator<<( std::ostream & out, const Declaration * decl ) {
         decl->print( out );
         return out;

src/SynTree/Declaration.h

@@ -279 +279 @@
 };
 
-std::ostream & operator<<( std::ostream & out, Declaration * decl );
+std::ostream & operator<<( std::ostream & out, const Declaration * decl );
 
 #endif // DECLARATION_H

src/SynTree/Expression.cc

@@ -541 +541 @@
 }
 
-std::ostream & operator<<( std::ostream & out, Expression * expr ) {
+std::ostream & operator<<( std::ostream & out, const Expression * expr ) {
         expr->print( out );
         return out;

src/SynTree/Expression.h

@@ -653 +653 @@
 };
 
-std::ostream & operator<<( std::ostream & out, Expression * expr );
+std::ostream & operator<<( std::ostream & out, const Expression * expr );
 
 #endif // EXPRESSION_H

src/SynTree/Statement.cc

@@ -387 +387 @@
 }
 
-std::ostream & operator<<( std::ostream & out, Statement * statement ) {
+std::ostream & operator<<( std::ostream & out, const Statement * statement ) {
         statement->print( out );
         return out;

src/SynTree/Statement.h

@@ -395 +395 @@
 
 
-std::ostream & operator<<( std::ostream & out, Statement * statement );
+std::ostream & operator<<( std::ostream & out, const Statement * statement );
 
 #endif // STATEMENT_H

src/SynTree/Type.cc

@@ -84 +84 @@
 }
 
-std::ostream & operator<<( std::ostream & out, Type * type ) {
+std::ostream & operator<<( std::ostream & out, const Type * type ) {
         type->print( out );
         return out;

src/SynTree/Type.h

@@ -480 +480 @@
 }
 
-std::ostream & operator<<( std::ostream & out, Type * type );
+std::ostream & operator<<( std::ostream & out, const Type * type );
 
 #endif // TYPE_H

src/tests/.expect/ctorWarnings.txt

@@ -1 +1 @@
 CFA Version 1.0.0 (debug)
-Warning: in void ?{}(struct A *a, int x), member z may not have been constructed
-Warning: in void ?{}(struct B *b), member a2 used before being constructed
-Warning: in void ?{}(struct B *b), member a2 may not have been constructed
-Warning: in void ?{}(struct B *b), member a3 may not have been constructed
-Warning: in void ^?{}(struct B *b), member a2 may not have been destructed
-Warning: in void ^?{}(struct B *b), member a3 may not have been destructed
+Error: in void ?{}(struct A *a, int x), member z may not have been constructed
+Error: in void ?{}(struct B *b), member a2 used before being constructed
+Error: in void ?{}(struct B *b), member a2 may not have been constructed
+Error: in void ?{}(struct B *b), member a3 may not have been constructed
+Error: in void ^?{}(struct B *b), member a2 may not have been destructed
+Error: in void ^?{}(struct B *b), member a3 may not have been destructed
+make: *** [ctorWarnings] Error 1

src/tests/Makefile.am

@@ -63 +63 @@
 
 ctorWarnings: ctorWarnings.c
-        ${CC} ${CFALGS} -CFA -XCFA -p ${<} -o /dev/null 2> ${@}
+        ${CC} ${CFALGS} -CFA -XCFA -p ${<} -o ${@}
 

src/tests/Makefile.in

@@ -671 +671 @@
 
 ctorWarnings: ctorWarnings.c
-        ${CC} ${CFALGS} -CFA -XCFA -p ${<} -o /dev/null 2> ${@}
+        ${CC} ${CFALGS} -CFA -XCFA -p ${<} -o ${@}
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.