Răsfoiți Sursa

Add floats to SharedValueStores yaml (#5626)

Just fixing a missing print.
Jon Ross-Perkins 11 luni în urmă
părinte
comite
b7c582ad22

+ 1 - 0
toolchain/base/shared_value_stores.h

@@ -55,6 +55,7 @@ class SharedValueStores : public Yaml::Printable<SharedValueStores> {
               Yaml::OutputMapping([&](Yaml::OutputMapping::Map map) {
                 map.Add("ints", ints_.OutputYaml());
                 map.Add("reals", reals_.OutputYaml());
+                map.Add("floats", floats_.OutputYaml());
                 map.Add("identifiers", identifiers_.OutputYaml());
                 map.Add("strings", string_literals_.OutputYaml());
               }));

+ 6 - 3
toolchain/base/shared_value_stores_test.cpp

@@ -19,12 +19,14 @@ using ::testing::Pair;
 
 auto MatchSharedValues(testing::Matcher<Yaml::MappingValue> ints,
                        testing::Matcher<Yaml::MappingValue> reals,
+                       testing::Matcher<Yaml::MappingValue> floats,
                        testing::Matcher<Yaml::MappingValue> identifiers,
                        testing::Matcher<Yaml::MappingValue> strings) -> auto {
   return Yaml::IsYaml(Yaml::Sequence(ElementsAre(Yaml::Mapping(ElementsAre(Pair(
       "shared_values",
       Yaml::Mapping(ElementsAre(Pair("ints", Yaml::Mapping(ints)),
                                 Pair("reals", Yaml::Mapping(reals)),
+                                Pair("floats", Yaml::Mapping(floats)),
                                 Pair("identifiers", Yaml::Mapping(identifiers)),
                                 Pair("strings", Yaml::Mapping(strings))))))))));
 }
@@ -33,8 +35,9 @@ TEST(SharedValueStores, PrintEmpty) {
   SharedValueStores value_stores;
   RawStringOstream out;
   value_stores.Print(out);
-  EXPECT_THAT(Yaml::Value::FromText(out.TakeStr()),
-              MatchSharedValues(IsEmpty(), IsEmpty(), IsEmpty(), IsEmpty()));
+  EXPECT_THAT(
+      Yaml::Value::FromText(out.TakeStr()),
+      MatchSharedValues(IsEmpty(), IsEmpty(), IsEmpty(), IsEmpty(), IsEmpty()));
 }
 
 TEST(SharedValueStores, PrintVals) {
@@ -52,7 +55,7 @@ TEST(SharedValueStores, PrintVals) {
   EXPECT_THAT(Yaml::Value::FromText(out.TakeStr()),
               MatchSharedValues(
                   ElementsAre(Pair("ap_int0", Yaml::Scalar("999999999999"))),
-                  ElementsAre(Pair("real0", Yaml::Scalar("8*10^8"))),
+                  ElementsAre(Pair("real0", Yaml::Scalar("8*10^8"))), IsEmpty(),
                   ElementsAre(Pair("identifier0", Yaml::Scalar("a"))),
                   ElementsAre(Pair("string0", Yaml::Scalar("foo'\"baz")))));
 }

+ 1 - 0
toolchain/driver/testdata/dump_shared_values.carbon

@@ -27,6 +27,7 @@ var str2: String = "ab'\"c";
 // CHECK:STDOUT:     real0:           10*10^-1
 // CHECK:STDOUT:     real1:           8*10^7
 // CHECK:STDOUT:     real2:           8*10^8
+// CHECK:STDOUT:   floats:          {}
 // CHECK:STDOUT:   identifiers:
 // CHECK:STDOUT:     identifier0:     int1
 // CHECK:STDOUT:     identifier1:     int2