Merge pull request #3593 from tautschnig/fix-xml-binary

Fix binary value string in XML representation of expressions

Author: tautschnig

src/util/xml_expr.cpp

@@ -164,8 +164,8 @@ xmlt xml(
       std::size_t width=to_bitvector_type(type).get_width();
 
       result.name="integer";
-      result.set_attribute("binary",
-        id2string(to_constant_expr(expr).get_value()));
+      result.set_attribute(
+        "binary", integer2binary(numeric_cast_v<mp_integer>(expr), width));
       result.set_attribute("width", width);
 
       const typet &underlying_type = type.id() == ID_c_bit_field

unit/Makefile

@@ -65,6 +65,7 @@ SRC += analyses/ai/ai.cpp \
        util/symbol_table.cpp \
        util/symbol.cpp \
        util/unicode.cpp \
+       util/xml_expr.cpp \
        # Empty last line
 
 INCLUDES= -I ../src/ -I.

unit/util/xml_expr.cpp

@@ -0,0 +1,29 @@
+/*******************************************************************\
+
+ Module: Unit tests of expression to xmlt conversion
+
+ Author: Michael Tautschnig
+
+\*******************************************************************/
+
+#include <testing-utils/catch.hpp>
+
+#include <util/arith_tools.h>
+#include <util/config.h>
+#include <util/namespace.h>
+#include <util/std_expr.h>
+#include <util/symbol_table.h>
+#include <util/xml_expr.h>
+
+TEST_CASE("Constant expression to XML")
+{
+  config.set_arch("none");
+
+  const symbol_tablet symbol_table;
+  const namespacet ns(symbol_table);
+
+  const constant_exprt number = from_integer(0xFF, unsignedbv_typet(8));
+  const xmlt x = xml(number, ns);
+
+  REQUIRE(x.get_attribute("binary") == "11111111");
+}