Changeset 2103a51

Timestamp:

Mar 1, 2018, 2:42:45 PM (7 years ago)

Author:

Rob Schluntz <rschlunt@…>

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:

babeeda

Parents:

6bc76537

Message:

Fix SemanticWarningImpl?

Location:

src/Common

Files:

• SemanticError.cc (modified) (1 diff)
• SemanticError.h (modified) (1 diff)

src/Common/SemanticError.cc ¶

@@ -50 +50 @@
 }
 
-void SemanticWarningImpl( CodeLocation location, std::string msg ) {
+namespace {
+        // convert format string and arguments into a single string
+        std::string fmtToString(const char * fmt, va_list ap) {
+                int size = 128;
+                while ( true ) {
+                        char buf[size];
+                        va_list args;
+                        va_copy( args, ap );
+                        int n = vsnprintf(&buf[0], size, fmt, args);
+                        va_end( args );
+                        if ( n < size && n >= 0 ) return buf;
+                        size *= 2;
+                }
+                assert( false );
+        }
+}
+
+void SemanticWarningImpl( CodeLocation location, Warning, const char * const fmt, ... ) {
+        va_list args;
+        va_start(args, fmt);
+        std::string msg = fmtToString( fmt, args );
+        va_end(args);
         std::cerr << ErrorHelpers::bold() << location << ErrorHelpers::warning_str() << ErrorHelpers::reset_font() << msg << std::endl;
 }

src/Common/SemanticError.h ¶

@@ -49 +49 @@
 );
 
-#define SemanticWarning(loc, id, ...) SemanticWarningImpl(loc, id, WarningFormats[id], __VA_ARGS__)
+#define SemanticWarning(loc, id, ...) SemanticWarningImpl(loc, id, WarningFormats[(int)id], __VA_ARGS__)
 
 void SemanticWarningImpl (CodeLocation loc, Warning warn, const char * const fmt, ...) __attribute__((format(printf, 3, 4)));