Apply suggestions from Code Review

ad-freiburg · May 22, 2024 · a333b10 · a333b10
1 parent 7640db8
commit a333b10
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/src/global/ValueId.h b/src/global/ValueId.h
@@ -327,9 +327,14 @@ class ValueId {
   /// human-readable representation.
   friend std::ostream& operator<<(std::ostream& ostr, const ValueId& id) {
     ostr << toString(id.getDatatype())[0] << ':';
+    if (id.getDatatype() == Datatype::Undefined) {
+      return ostr << id.getBits();
+    }
+
     auto visitor = [&ostr]<typename T>(T&& value) {
       if constexpr (ad_utility::isSimilar<T, ValueId::UndefinedType>) {
-        ostr << "xx";
+        // already handled above
+        AD_FAIL();
       } else if constexpr (ad_utility::isSimilar<T, double> ||
                            ad_utility::isSimilar<T, int64_t>) {
         ostr << std::to_string(value);

diff --git a/test/SparqlExpressionTypesTest.cpp b/test/SparqlExpressionTypesTest.cpp
@@ -34,7 +34,7 @@ TEST(SparqlExpressionTypes, printIdOrString) {
 
   IdOrLiteralOrIri idOrString{Id::makeUndefined()};
   PrintTo(idOrString, &str);
-  ASSERT_EQ(str.str(), "U:xx");
+  ASSERT_EQ(str.str(), "U:0");
   idOrString = LiteralOrIri::literalWithoutQuotes("bimm");
   // Clear the stringstream.
   str.str({});

diff --git a/test/ValueIdTest.cpp b/test/ValueIdTest.cpp
@@ -289,7 +289,7 @@ TEST(ValueId, toDebugString) {
     stream << id;
     ASSERT_EQ(stream.str(), expected);
   };
-  test(ValueId::makeUndefined(), "U:xx");
+  test(ValueId::makeUndefined(), "U:0");
   test(ValueId::makeFromInt(-42), "I:-42");
   test(ValueId::makeFromDouble(42.0), "D:42.000000");
   test(ValueId::makeFromBool(false), "B:false");