summaryrefslogtreecommitdiffstats
path: root/tools/gn
diff options
context:
space:
mode:
authorscottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-03-27 00:13:50 +0000
committerscottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-03-27 00:13:50 +0000
commit3a27dbd70e0f6268d5edd1c3a0f99c6a4c48db13 (patch)
tree0ed9494e9ac34cb66f6b08ca1eebc2de6232c101 /tools/gn
parentd86560444000f113e4b2c5bb298f3ec6f43f51e0 (diff)
downloadchromium_src-3a27dbd70e0f6268d5edd1c3a0f99c6a4c48db13.zip
chromium_src-3a27dbd70e0f6268d5edd1c3a0f99c6a4c48db13.tar.gz
chromium_src-3a27dbd70e0f6268d5edd1c3a0f99c6a4c48db13.tar.bz2
Reland of GN: Remove some dead code that was confusing. https://codereview.chromium.org/202733003/
BUG=354626 TBR=brettw@chromium.org Review URL: https://codereview.chromium.org/213233005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@259754 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'tools/gn')
-rw-r--r--tools/gn/token.cc26
-rw-r--r--tools/gn/token.h4
-rw-r--r--tools/gn/tokenizer_unittest.cc11
3 files changed, 0 insertions, 41 deletions
diff --git a/tools/gn/token.cc b/tools/gn/token.cc
index ba59526..70ce2a1 100644
--- a/tools/gn/token.cc
+++ b/tools/gn/token.cc
@@ -6,25 +6,6 @@
#include "base/logging.h"
-namespace {
-
-std::string UnescapeString(const base::StringPiece& input) {
- std::string result;
- result.reserve(input.size());
-
- for (size_t i = 0; i < input.size(); i++) {
- if (input[i] == '\\') {
- DCHECK(i < input.size() - 1); // Last char shouldn't be a backslash or
- // it would have escaped the terminator.
- i++; // Skip backslash, next char is a literal.
- }
- result.push_back(input[i]);
- }
- return result;
-}
-
-} // namespace
-
Token::Token() : type_(INVALID), value_() {
}
@@ -43,10 +24,3 @@ bool Token::IsIdentifierEqualTo(const char* v) const {
bool Token::IsStringEqualTo(const char* v) const {
return type_ == STRING && value_ == v;
}
-
-std::string Token::StringValue() const {
- DCHECK(type() == STRING);
-
- // Trim off the string terminators at the end.
- return UnescapeString(value_.substr(1, value_.size() - 2));
-}
diff --git a/tools/gn/token.h b/tools/gn/token.h
index 69ef2fd..8c7cd58 100644
--- a/tools/gn/token.h
+++ b/tools/gn/token.h
@@ -69,10 +69,6 @@ class Token {
bool IsIdentifierEqualTo(const char* v) const;
bool IsStringEqualTo(const char* v) const;
- // For STRING tokens, returns the string value (no quotes at end, does
- // unescaping).
- std::string StringValue() const;
-
private:
Type type_;
base::StringPiece value_;
diff --git a/tools/gn/tokenizer_unittest.cc b/tools/gn/tokenizer_unittest.cc
index e8abdf4..45fd744 100644
--- a/tools/gn/tokenizer_unittest.cc
+++ b/tools/gn/tokenizer_unittest.cc
@@ -133,17 +133,6 @@ TEST(Tokenizer, FunctionCall) {
EXPECT_TRUE(CheckTokenizer("fun(\"foo\") {\nfoo = 12}", fn));
}
-TEST(Tokenizer, StringUnescaping) {
- InputFile input(SourceFile("/test"));
- input.SetContents("\"asd\\\"f\" \"\"");
- Err err;
- std::vector<Token> results = Tokenizer::Tokenize(&input, &err);
-
- ASSERT_EQ(2u, results.size());
- EXPECT_EQ("asd\"f", results[0].StringValue());
- EXPECT_EQ("", results[1].StringValue());
-}
-
TEST(Tokenizer, Locations) {
InputFile input(SourceFile("/test"));
input.SetContents("1 2 \"three\"\n 4");