Commit 828cc489 by alokp@chromium.org

Replaced Token::Location::string with Token::Location::file.

git-svn-id: https://angleproject.googlecode.com/svn/trunk@1056 736b8ea6-26fd-11df-bfd4-992fa37f6226
parent ef1eaa04
...@@ -13,7 +13,7 @@ TEST(TokenTest, DefaultConstructor) ...@@ -13,7 +13,7 @@ TEST(TokenTest, DefaultConstructor)
EXPECT_EQ(0, token.type); EXPECT_EQ(0, token.type);
EXPECT_EQ(0, token.flags); EXPECT_EQ(0, token.flags);
EXPECT_EQ(0, token.location.line); EXPECT_EQ(0, token.location.line);
EXPECT_EQ(0, token.location.string); EXPECT_EQ(0, token.location.file);
EXPECT_STREQ("", token.value.c_str()); EXPECT_STREQ("", token.value.c_str());
} }
...@@ -23,14 +23,14 @@ TEST(TokenTest, Assignment) ...@@ -23,14 +23,14 @@ TEST(TokenTest, Assignment)
token.type = 1; token.type = 1;
token.flags = 1; token.flags = 1;
token.location.line = 1; token.location.line = 1;
token.location.string = 1; token.location.file = 1;
token.value.assign("foo"); token.value.assign("foo");
token = pp::Token(); token = pp::Token();
EXPECT_EQ(0, token.type); EXPECT_EQ(0, token.type);
EXPECT_EQ(0, token.flags); EXPECT_EQ(0, token.flags);
EXPECT_EQ(0, token.location.line); EXPECT_EQ(0, token.location.line);
EXPECT_EQ(0, token.location.string); EXPECT_EQ(0, token.location.file);
EXPECT_STREQ("", token.value.c_str()); EXPECT_STREQ("", token.value.c_str());
} }
...@@ -51,9 +51,9 @@ TEST(TokenTest, Equals) ...@@ -51,9 +51,9 @@ TEST(TokenTest, Equals)
EXPECT_FALSE(token.equals(pp::Token())); EXPECT_FALSE(token.equals(pp::Token()));
token.location.line = 0; token.location.line = 0;
token.location.string = 1; token.location.file = 1;
EXPECT_FALSE(token.equals(pp::Token())); EXPECT_FALSE(token.equals(pp::Token()));
token.location.string = 0; token.location.file = 0;
token.value.assign("foo"); token.value.assign("foo");
EXPECT_FALSE(token.equals(pp::Token())); EXPECT_FALSE(token.equals(pp::Token()));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment