Replace (Lower|Upper)caseString in favor of StringRef's newest methods.

[oota-llvm.git] / lib / Support / SourceMgr.cpp

diff --git a/lib/Support/SourceMgr.cpp b/lib/Support/SourceMgr.cpp
index ba2201816e988f94e1daaaf1ab4c9aad1c94e3bc..5a6090d05e3fd90c0a3c5e61f2c6168e8e0a4c31 100644 (file)
--- a/lib/Support/SourceMgr.cpp
+++ b/lib/Support/SourceMgr.cpp
@@ -140,9 +140,9 @@ void SourceMgr::PrintIncludeStack(SMLoc IncludeLoc, raw_ostream &OS) const {
 ///
 /// @param Type - If non-null, the kind of message (e.g., "error") which is
 /// prefixed to the message.
-SMDiagnostic SourceMgr::GetMessage(SMLoc Loc, const Twine &Msg,
-                                   const char *Type, ArrayRef<SMRange> Ranges,
-                                   bool ShowLine) const {
+SMDiagnostic SourceMgr::GetMessage(SMLoc Loc, SourceMgr::DiagKind Kind,
+                                   const Twine &Msg,
+                                   ArrayRef<SMRange> Ranges) const {
 
   // First thing to do: find the current buffer containing the specified
   // location.
@@ -164,12 +164,6 @@ SMDiagnostic SourceMgr::GetMessage(SMLoc Loc, const Twine &Msg,
     ++LineEnd;
   std::string LineStr(LineStart, LineEnd);
 
-  std::string PrintedMsg;
-  raw_string_ostream OS(PrintedMsg);
-  if (Type)
-    OS << Type << ": ";
-  OS << Msg;
-
   // Convert any ranges to column ranges that only intersect the line of the
   // location.
   SmallVector<std::pair<unsigned, unsigned>, 4> ColRanges;
@@ -194,16 +188,17 @@ SMDiagnostic SourceMgr::GetMessage(SMLoc Loc, const Twine &Msg,
   
   return SMDiagnostic(*this, Loc,
                       CurMB->getBufferIdentifier(), FindLineNumber(Loc, CurBuf),
-                      Loc.getPointer()-LineStart, OS.str(),
-                      LineStr, ColRanges, ShowLine);
+                      Loc.getPointer()-LineStart, Kind, Msg.str(),
+                      LineStr, ColRanges);
 }
 
-void SourceMgr::PrintMessage(SMLoc Loc, const Twine &Msg,
-                             const char *Type, ArrayRef<SMRange> Ranges,
-                             bool ShowLine) const {
+void SourceMgr::PrintMessage(SMLoc Loc, SourceMgr::DiagKind Kind,
+                             const Twine &Msg, ArrayRef<SMRange> Ranges) const {
+  SMDiagnostic Diagnostic = GetMessage(Loc, Kind, Msg, Ranges);
+  
   // Report the message with the diagnostic handler if present.
   if (DiagHandler) {
-    DiagHandler(GetMessage(Loc, Msg, Type, Ranges, ShowLine), DiagContext);
+    DiagHandler(Diagnostic, DiagContext);
     return;
   }
 
@@ -213,7 +208,7 @@ void SourceMgr::PrintMessage(SMLoc Loc, const Twine &Msg,
   assert(CurBuf != -1 && "Invalid or unspecified location!");
   PrintIncludeStack(getBufferInfo(CurBuf).IncludeLoc, OS);
 
-  GetMessage(Loc, Msg, Type, Ranges, ShowLine).print(0, OS);
+  Diagnostic.print(0, OS);
 }
 
 //===----------------------------------------------------------------------===//
@@ -221,12 +216,13 @@ void SourceMgr::PrintMessage(SMLoc Loc, const Twine &Msg,
 //===----------------------------------------------------------------------===//
 
 SMDiagnostic::SMDiagnostic(const SourceMgr &sm, SMLoc L, const std::string &FN,
-                           int Line, int Col, const std::string &Msg,
+                           int Line, int Col, SourceMgr::DiagKind Kind,
+                           const std::string &Msg,
                            const std::string &LineStr,
-                           ArrayRef<std::pair<unsigned,unsigned> > Ranges,
-                           bool showline)
-  : SM(&sm), Loc(L), Filename(FN), LineNo(Line), ColumnNo(Col), Message(Msg),
-    LineContents(LineStr), ShowLine(showline), Ranges(Ranges.vec()) {}
+                           ArrayRef<std::pair<unsigned,unsigned> > Ranges)
+  : SM(&sm), Loc(L), Filename(FN), LineNo(Line), ColumnNo(Col), Kind(Kind),
+    Message(Msg), LineContents(LineStr), Ranges(Ranges.vec()) {
+}
 
 
 void SMDiagnostic::print(const char *ProgName, raw_ostream &S) const {
@@ -247,9 +243,16 @@ void SMDiagnostic::print(const char *ProgName, raw_ostream &S) const {
     S << ": ";
   }
 
+  switch (Kind) {
+  default: assert(0 && "Unknown diagnostic kind");
+  case SourceMgr::DK_Error: S << "error: "; break;
+  case SourceMgr::DK_Warning: S << "warning: "; break;
+  case SourceMgr::DK_Note: S << "note: "; break;
+  }
+  
   S << Message << '\n';
 
-  if (LineNo == -1 || ColumnNo == -1 || !ShowLine)
+  if (LineNo == -1 || ColumnNo == -1)
     return;
 
   // Build the line with the caret and ranges.