Changes in / [90e2334:bda58ad]

Location:

src

Files:

• Common/SemanticError.cc (modified) (2 diffs)
• Common/SemanticError.h (modified) (3 diffs)
• InitTweak/FixInit.cc (modified) (5 diffs)
• 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 ) {
-  append( error );
+        errors.push_back( std::string( "Error: " ) + error );
 }
 
 void SemanticError::append( SemanticError &other ) {
-  errors.splice( errors.end(), other.errors );
-}
-
-void SemanticError::append( const std::string & msg ) {
-  errors.push_back( std::string( "Error: ") + msg );
+        errors.splice( errors.end(), other.errors );
 }
 

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 );
@@ -43 +42 @@
 template< typename T >
 SemanticError::SemanticError( const std::string &error, const T *obj ) {
-        append( toString( error, obj ) );
+        std::ostringstream os;
+        os << "Error: " << error;
+        obj->print( os );
+        errors.push_back( os.str() );
 }
-
 
 #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;
@@ -261 +258 @@
                                 WarnStructMembers warner;
                                 acceptAll( translationUnit, warner );
-
-                                // visitor doesn't throw so that it can collect all errors
-                                if ( ! warner.errors.isEmpty() ) {
-                                        throw warner.errors;
-                                }
                         }
                 }
@@ -743 +735 @@
                         for ( DeclarationWithType * member : unhandled ) {
                                 // emit a warning for each unhandled member
-                                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" );
+                                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" );
                         }
 
-                        // need to steal the errors before they're lost
-                        old.errors.append( errors );
                         *this = old;
                 }
@@ -807 +797 @@
                                                         if ( unhandled.count( memberExpr->get_member() ) ) {
                                                                 // emit a warning because a member was used before it was constructed
-                                                                emit( "in ", CodeGen::genType( function->get_functionType(), function->get_name(), false ), ", member ", memberExpr->get_member()->get_name(), " used before being constructed" );
+                                                                warn( "in ", CodeGen::genType( function->get_functionType(), function->get_name(), false ), ", member ", memberExpr->get_member()->get_name(), " used before being constructed" );
                                                         }
                                                 }
@@ -815 +805 @@
                         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/tests/.expect/ctorWarnings.txt

@@ -1 +1 @@
 CFA Version 1.0.0 (debug)
-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
+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

src/tests/Makefile.am

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

src/tests/Makefile.in

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