X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=include%2Fllvm%2FADT%2FStringSwitch.h;h=7fd6e27960321a3e680fecf87d3f0467486ca01b;hb=2e522d05278a69cf75b41dcd4b358e46b5350425;hp=7ac0f60f287c5105eaef871e35f70ace3fed6142;hpb=074fe8324dd9533f1cd210091b15719ff67f49c2;p=oota-llvm.git

diff --git a/include/llvm/ADT/StringSwitch.h b/include/llvm/ADT/StringSwitch.h
index 7ac0f60f287..7fd6e279603 100644
--- a/include/llvm/ADT/StringSwitch.h
+++ b/include/llvm/ADT/StringSwitch.h
@@ -38,28 +38,44 @@ namespace llvm {
 ///   .Cases("violet", "purple", Violet)
 ///   .Default(UnknownColor);
 /// \endcode
-template<typename T>
+template<typename T, typename R = T>
 class StringSwitch {
   /// \brief The string we are matching.
   StringRef Str;
 
-  /// \brief The result of this switch statement, once known.
-  T Result;
-
-  /// \brief Set true when the result of this switch is already known; in this
-  /// case, Result is valid.
-  bool ResultKnown;
+  /// \brief The pointer to the result of this switch statement, once known,
+  /// null before that.
+  const T *Result;
 
 public:
-  explicit StringSwitch(StringRef Str)
-  : Str(Str), ResultKnown(false) { }
+  explicit StringSwitch(StringRef S)
+  : Str(S), Result(0) { }
 
   template<unsigned N>
   StringSwitch& Case(const char (&S)[N], const T& Value) {
-    if (!ResultKnown && N-1 == Str.size() &&
+    if (!Result && N-1 == Str.size() &&
         (std::memcmp(S, Str.data(), N-1) == 0)) {
-      Result = Value;
-      ResultKnown = true;
+      Result = &Value;
+    }
+
+    return *this;
+  }
+
+  template<unsigned N>
+  StringSwitch& EndsWith(const char (&S)[N], const T &Value) {
+    if (!Result && Str.size() >= N-1 &&
+        std::memcmp(S, Str.data() + Str.size() + 1 - N, N-1) == 0) {
+      Result = &Value;
+    }
+
+    return *this;
+  }
+
+  template<unsigned N>
+  StringSwitch& StartsWith(const char (&S)[N], const T &Value) {
+    if (!Result && Str.size() >= N-1 &&
+        std::memcmp(S, Str.data(), N-1) == 0) {
+      Result = &Value;
     }
 
     return *this;
@@ -92,16 +108,16 @@ public:
       .Case(S4, Value);
   }
 
-  T Default(const T& Value) {
-    if (ResultKnown)
-      return Result;
+  R Default(const T& Value) const {
+    if (Result)
+      return *Result;
 
     return Value;
   }
 
-  operator T() {
-    assert(ResultKnown && "Fell off the end of a string-switch");
-    return Result;
+  operator R() const {
+    assert(Result && "Fell off the end of a string-switch");
+    return *Result;
   }
 };