From: Rui Ueyama <ruiu@google.com>
Date: Tue, 3 Nov 2015 01:04:44 +0000 (+0000)
Subject: llvm-pdbdump: Simplify. NFC.
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=55861d07e0bad20da724208f287ddb7605dd757c;p=oota-llvm.git

llvm-pdbdump: Simplify. NFC.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@251873 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/tools/llvm-pdbdump/LinePrinter.cpp b/tools/llvm-pdbdump/LinePrinter.cpp
index 9f0f5d8c068..4f3ee54c769 100644
--- a/tools/llvm-pdbdump/LinePrinter.cpp
+++ b/tools/llvm-pdbdump/LinePrinter.cpp
@@ -84,54 +84,40 @@ bool LinePrinter::IsCompilandExcluded(llvm::StringRef CompilandName) {
 }
 
 WithColor::WithColor(LinePrinter &P, PDB_ColorItem C) : OS(P.OS) {
-  if (C == PDB_ColorItem::None)
-    OS.resetColor();
-  else {
-    raw_ostream::Colors Color;
-    bool Bold;
-    translateColor(C, Color, Bold);
-    OS.changeColor(Color, Bold);
-  }
+  applyColor(C);
 }
 
 WithColor::~WithColor() { OS.resetColor(); }
 
-void WithColor::translateColor(PDB_ColorItem C, raw_ostream::Colors &Color,
-                               bool &Bold) const {
+void WithColor::applyColor(PDB_ColorItem C) {
   switch (C) {
+  case PDB_ColorItem::None:
+    OS.resetColor();
+    return;
   case PDB_ColorItem::Address:
-    Color = raw_ostream::YELLOW;
-    Bold = true;
+    OS.changeColor(raw_ostream::YELLOW, /*bold=*/true);
     return;
   case PDB_ColorItem::Keyword:
-    Color = raw_ostream::MAGENTA;
-    Bold = true;
+    OS.changeColor(raw_ostream::MAGENTA, true);
     return;
   case PDB_ColorItem::Register:
   case PDB_ColorItem::Offset:
-    Color = raw_ostream::YELLOW;
-    Bold = false;
+    OS.changeColor(raw_ostream::YELLOW, false);
     return;
   case PDB_ColorItem::Type:
-    Color = raw_ostream::CYAN;
-    Bold = true;
+    OS.changeColor(raw_ostream::CYAN, true);
     return;
   case PDB_ColorItem::Identifier:
-    Color = raw_ostream::CYAN;
-    Bold = false;
+    OS.changeColor(raw_ostream::CYAN, false);
     return;
   case PDB_ColorItem::Path:
-    Color = raw_ostream::CYAN;
-    Bold = false;
+    OS.changeColor(raw_ostream::CYAN, false);
     return;
   case PDB_ColorItem::SectionHeader:
-    Color = raw_ostream::RED;
-    Bold = true;
+    OS.changeColor(raw_ostream::RED, true);
     return;
   case PDB_ColorItem::LiteralValue:
-    Color = raw_ostream::GREEN;
-    Bold = true;
-  default:
+    OS.changeColor(raw_ostream::GREEN, true);
     return;
   }
 }
diff --git a/tools/llvm-pdbdump/LinePrinter.h b/tools/llvm-pdbdump/LinePrinter.h
index 67006b03b09..b0a9d2cfc4e 100644
--- a/tools/llvm-pdbdump/LinePrinter.h
+++ b/tools/llvm-pdbdump/LinePrinter.h
@@ -84,8 +84,7 @@ public:
   raw_ostream &get() { return OS; }
 
 private:
-  void translateColor(PDB_ColorItem C, raw_ostream::Colors &Color,
-                      bool &Bold) const;
+  void applyColor(PDB_ColorItem C);
   raw_ostream &OS;
 };
 }