From 138c7acf228cdbf293a4bf3bbedbe3f89df21f0b Mon Sep 17 00:00:00 2001
From: Nipunn Koorapati <nkoorapa@andrew.cmu.edu>
Date: Sat, 21 Apr 2012 01:44:10 -0400
Subject: [PATCH] Error() and Warning() functions for reporting compiler
 errors/warnings now respects newlines as part of valid error messages.

---
 lex.ll   |  2 +-
 stmt.cpp | 24 ++++++++++--------------
 util.cpp | 18 ++++++++++++++++--
 3 files changed, 27 insertions(+), 17 deletions(-)

diff --git a/lex.ll b/lex.ll
index 96c19d1d..026b1b48 100644
--- a/lex.ll
+++ b/lex.ll
@@ -704,7 +704,7 @@ lEscapeChar(char *str, char *pChar, SourcePos *pos)
             str = tail - 1;
             break;
         default:
-            Error(*pos, "Bad character escape sequence: '%s'\n.", str);
+            Error(*pos, "Bad character escape sequence: '%s'.", str);
             break;
         }
     }
diff --git a/stmt.cpp b/stmt.cpp
index e2b533f3..0c8ed0c8 100644
--- a/stmt.cpp
+++ b/stmt.cpp
@@ -2281,26 +2281,22 @@ GotoStmt::EmitCode(FunctionEmitContext *ctx) const {
 
     llvm::BasicBlock *bb = ctx->GetLabeledBasicBlock(label);
     if (bb == NULL) {
-        /* Label wasn't found. Emit an error */
-        Error(identifierPos, 
-                "No label named \"%s\" found in current function.",
-              label.c_str());
-
-        /* Look for suggestions that are close */
+        /* Label wasn't found. Look for suggestions that are close */
         std::vector<std::string> labels = ctx->GetLabels();
         std::vector<std::string> matches = MatchStrings(label, labels);
+        std::string match_output;
         if (! matches.empty()) {
             /* Print up to 5 matches. Don't want to spew too much */
-            std::string match_output("Did you mean\n");
+            match_output += "\nDid you mean:";
             for (unsigned int i=0; i<matches.size() && i<5; i++)
-                match_output += " " + matches[i] + "?\n";
-
-            /*TODO. Embed these suggestions IN the error message
-               itself. Currently it looks ugly since line breaks
-               are ignored inside Error() strings. Multiple
-               Error() messages are not an option either */
-            printf("%s", match_output.c_str());
+                match_output += "\n " + matches[i] + "?";
         }
+
+        /* Label wasn't found. Emit an error */
+        Error(identifierPos, 
+                "No label named \"%s\" found in current function.%s",
+              label.c_str(), match_output.c_str());
+
         return;
     }
 
diff --git a/util.cpp b/util.cpp
index 92c1bac1..cc628214 100644
--- a/util.cpp
+++ b/util.cpp
@@ -237,6 +237,20 @@ lPrintWithWordBreaks(const char *buf, int indent, int columnWidth, FILE *out) {
             } while (*msgPos != '\0' && *msgPos != 'm');
             continue;
         }
+        else if (*msgPos == '\n') {
+            // Handle newlines cleanly
+            column = indent;
+            outStr.push_back('\n');
+            for (int i = 0; i < indent; ++i)
+                outStr.push_back(' ');
+            // Respect spaces after newlines
+            ++msgPos;
+            while (*msgPos == ' ') {
+                outStr.push_back(' ');
+                ++msgPos;
+            }
+            continue;
+        }
 
         while (*msgPos != '\0' && isspace(*msgPos))
             ++msgPos;
@@ -314,7 +328,7 @@ lPrint(const char *type, bool isError, SourcePos p, const char *fmt,
     int indent = 0;
     if (p.first_line == 0) {
         // We don't have a valid SourcePos, so create a message without it
-        if (asprintf(&formattedBuf, "%s%s%s%s%s: %s%s\n", lStartBold(),
+        if (asprintf(&formattedBuf, "%s%s%s%s%s: %s%s", lStartBold(),
                      isError ? lStartRed() : lStartBlue(), type,
                      lResetColor(), lStartBold(), errorBuf, 
                      lResetColor()) == -1) {
@@ -325,7 +339,7 @@ lPrint(const char *type, bool isError, SourcePos p, const char *fmt,
     }
     else {
         // Create an error message that includes the file and line number
-        if (asprintf(&formattedBuf, "%s%s:%d:%d: %s%s%s%s: %s%s\n", 
+        if (asprintf(&formattedBuf, "%s%s:%d:%d: %s%s%s%s: %s%s", 
                      lStartBold(), p.name, p.first_line, p.first_column, 
                      isError ? lStartRed() : lStartBlue(), type, 
                      lResetColor(), lStartBold(), errorBuf,