carbon-language/carbon-lang
1
0
Fork 0
mirror of https://github.com/carbon-language/carbon-lang.git synced 2026-10-05 22:02:55 +01:00
Code Issues Packages Projects Releases 10 Wiki Activity

Rename Carbon::StringLiteralId -> Carbon::StringLiteralValueId. (#3522)

Browse Source 
We have `StringLiteral`s in multiple other `Carbon` sub-namespaces.
Rename to a more specific name to avoid collisions.

We should likely also rename `Carbon::IntId` -> `Carbon::IntValueId` and
`Carbon::RealId` -> `Carbon::RealValueId`, but this collision is
prioritized because it was blocking work on typed parse nodes which
introduces a `Carbon::Parse::StringLiteralId`.
This commit is contained in:
Richard Smith
2023-12-18 23:27:33 +00:00
committed by GitHub
parent 9390e666ce
commit d87fe8b532
14 changed files with 43 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
toolchain/base/value_store_test.cpp
+5 -4
View File
@@ -64,18 +64,19 @@ TEST(ValueStore, String) {
std::string b = "b";
SharedValueStores value_stores;
auto a_id = value_stores.identifiers().Add(a);
auto b_id = value_stores.string_literals().Add(b);
auto b_id = value_stores.string_literal_values().Add(b);
ASSERT_TRUE(a_id.is_valid());
ASSERT_TRUE(b_id.is_valid());
EXPECT_THAT(a_id.index, Not(Eq(b_id.index)));
EXPECT_THAT(value_stores.identifiers().Get(a_id), Eq(a));
EXPECT_THAT(value_stores.string_literals().Get(b_id), Eq(b));
EXPECT_THAT(value_stores.string_literal_values().Get(b_id), Eq(b));
// Adding the same string again, even with a different Id type, should return
// the same id.
EXPECT_THAT(value_stores.string_literals().Add(a).index, Eq(a_id.index));
EXPECT_THAT(value_stores.string_literal_values().Add(a).index,
Eq(a_id.index));
EXPECT_THAT(value_stores.identifiers().Add(b).index, Eq(b_id.index));
}
@@ -103,7 +104,7 @@ TEST(ValueStore, PrintVals) {
value_stores.ints().Add(apint);
value_stores.reals().Add(
Real{.mantissa = apint, .exponent = apint, .is_decimal = true});
value_stores.string_literals().Add("foo'\"baz");
value_stores.string_literal_values().Add("foo'\"baz");
TestRawOstream out;
value_stores.Print(out);