Changeset 56e49b0

Timestamp:

Aug 7, 2017, 12:35:05 PM (8 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:

acd7c5dd

Parents:

92c0f81

Message:

Fixed some assertf related warnings

Location:

src

Files:

• ResolvExpr/CurrentObject.cc (modified) (3 diffs)
• SymTab/Validate.cc (modified) (1 diff)

src/ResolvExpr/CurrentObject.cc

@@ -36 +36 @@
                                 return constExpr->get_constant()->get_ival();
                         } else {
-                                assertf( false, "Non-integer constant expression in getConstValue", toString( constExpr ).c_str() ); // xxx - might be semantic error
+                                assertf( false, "Non-integer constant expression in getConstValue %s", toString( constExpr ).c_str() ); // xxx - might be semantic error
                         }
                 } else if ( dynamic_cast< OneType * >( constExpr->get_result() ) ) {
@@ -176 +176 @@
                                 setPosition( castExpr->get_arg() );
                         } else if ( VariableExpr * varExpr = dynamic_cast< VariableExpr * >( expr ) ) {
-                                assertf( dynamic_cast<EnumInstType *> ( varExpr->get_result() ), "ArrayIterator given variable that isn't an enum constant", toString( expr ).c_str() );
+                                assertf( dynamic_cast<EnumInstType *> ( varExpr->get_result() ), "ArrayIterator given variable that isn't an enum constant : %s", toString( expr ).c_str() );
                                 index = 0; // xxx - get actual value of enum constant
                         } else if ( dynamic_cast< SizeofExpr * >( expr ) || dynamic_cast< AlignofExpr * >( expr ) ) {
@@ -518 +518 @@
                         curTypes = newTypes;
                         newTypes.clear();
-                        assertf( desigAlts.size() == curTypes.size(), "Designator alternatives (%d) and current types (%d) out of sync", desigAlts.size(), curTypes.size() );
+                        assertf( desigAlts.size() == curTypes.size(), "Designator alternatives (%zu) and current types (%zu) out of sync", desigAlts.size(), curTypes.size() );
                 } // for
                 if ( desigAlts.size() > 1 ) {

src/SymTab/Validate.cc

@@ -903 +903 @@
                 FunctionType * ftype = functionDecl->get_functionType();
                 std::list< DeclarationWithType * > & retVals = ftype->get_returnVals();
-                assertf( retVals.size() == 0 || retVals.size() == 1, "Function %s has too many return values: %d", functionDecl->get_name().c_str(), retVals.size() );
+                assertf( retVals.size() == 0 || retVals.size() == 1, "Function %s has too many return values: %zu", functionDecl->get_name().c_str(), retVals.size() );
                 if ( retVals.size() == 1 ) {
                         // ensure all function return values have a name - use the name of the function to disambiguate (this also provides a nice bit of help for debugging).