From: Chandler Carruth Date: Sun, 31 Jul 2016 02:19:13 +0000 (+0000) Subject: [ADT] Add 'consume_front' and 'consume_back' methods to StringRef which X-Git-Tag: llvmorg-4.0.0-rc1~13727 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=974c67e7c6101328c3791e560fa187227a525065;p=platform%2Fupstream%2Fllvm.git [ADT] Add 'consume_front' and 'consume_back' methods to StringRef which are very handy when parsing text. They are essentially a combination of startswith and a self-modifying drop_front, or endswith and drop_back respectively. Differential Revision: https://reviews.llvm.org/D22723 llvm-svn: 277288 --- diff --git a/llvm/include/llvm/ADT/StringRef.h b/llvm/include/llvm/ADT/StringRef.h index 0b66af5..17a428c 100644 --- a/llvm/include/llvm/ADT/StringRef.h +++ b/llvm/include/llvm/ADT/StringRef.h @@ -446,6 +446,30 @@ namespace llvm { return substr(0, size()-N); } + /// Returns true if this StringRef has the given prefix and removes that + /// prefix. + LLVM_ATTRIBUTE_ALWAYS_INLINE + LLVM_ATTRIBUTE_UNUSED_RESULT + bool consume_front(StringRef Prefix) { + if (!startswith(Prefix)) + return false; + + *this = drop_front(Prefix.size()); + return true; + } + + /// Returns true if this StringRef has the given suffix and removes that + /// suffix. + LLVM_ATTRIBUTE_ALWAYS_INLINE + LLVM_ATTRIBUTE_UNUSED_RESULT + bool consume_back(StringRef Suffix) { + if (!endswith(Suffix)) + return false; + + *this = drop_back(Suffix.size()); + return true; + } + /// Return a reference to the substring from [Start, End). /// /// \param Start The index of the starting character in the substring; if diff --git a/llvm/unittests/ADT/StringRefTest.cpp b/llvm/unittests/ADT/StringRefTest.cpp index 66e5944..7201886 100644 --- a/llvm/unittests/ADT/StringRefTest.cpp +++ b/llvm/unittests/ADT/StringRefTest.cpp @@ -322,6 +322,22 @@ TEST(StringRefTest, StartsWithLower) { EXPECT_FALSE(Str.startswith_lower("hi")); } +TEST(StringRefTest, ConsumeFront) { + StringRef Str("hello"); + EXPECT_TRUE(Str.consume_front("")); + EXPECT_EQ("hello", Str); + EXPECT_TRUE(Str.consume_front("he")); + EXPECT_EQ("llo", Str); + EXPECT_FALSE(Str.consume_front("lloworld")); + EXPECT_EQ("llo", Str); + EXPECT_FALSE(Str.consume_front("lol")); + EXPECT_EQ("llo", Str); + EXPECT_TRUE(Str.consume_front("llo")); + EXPECT_EQ("", Str); + EXPECT_FALSE(Str.consume_front("o")); + EXPECT_TRUE(Str.consume_front("")); +} + TEST(StringRefTest, EndsWith) { StringRef Str("hello"); EXPECT_TRUE(Str.endswith("")); @@ -341,6 +357,22 @@ TEST(StringRefTest, EndsWithLower) { EXPECT_FALSE(Str.endswith_lower("hi")); } +TEST(StringRefTest, ConsumeBack) { + StringRef Str("hello"); + EXPECT_TRUE(Str.consume_back("")); + EXPECT_EQ("hello", Str); + EXPECT_TRUE(Str.consume_back("lo")); + EXPECT_EQ("hel", Str); + EXPECT_FALSE(Str.consume_back("helhel")); + EXPECT_EQ("hel", Str); + EXPECT_FALSE(Str.consume_back("hle")); + EXPECT_EQ("hel", Str); + EXPECT_TRUE(Str.consume_back("hel")); + EXPECT_EQ("", Str); + EXPECT_FALSE(Str.consume_back("h")); + EXPECT_TRUE(Str.consume_back("")); +} + TEST(StringRefTest, Find) { StringRef Str("hello"); EXPECT_EQ(2U, Str.find('l'));