Merge pull request #4011 from tautschnig/json_expr-cleanup

Cleanup expression-to-json

Author: tautschnig

src/goto-programs/json_expr.cpp

@@ -93,8 +93,7 @@ static exprt simplify_json_expr(const exprt &src)
 /// The `mode` argument is used to correctly report types.
 /// \param type: a type
 /// \param ns: a namespace
-/// \param mode: language in which the code was written; for now ID_C and
-///   ID_java are supported
+/// \param mode: language in which the code was written
 /// \return a json object
 json_objectt json(const typet &type, const namespacet &ns, const irep_idt &mode)
 {
@@ -177,6 +176,10 @@ json_objectt json(const typet &type, const namespacet &ns, const irep_idt &mode)
       members.push_back(std::move(e));
     }
   }
+  else if(type.id() == ID_struct_tag)
+  {
+    return json(ns.follow_tag(to_struct_tag_type(type)), ns, mode);
+  }
   else if(type.id() == ID_union)
   {
     result["name"] = json_stringt("union");
@@ -190,6 +193,10 @@ json_objectt json(const typet &type, const namespacet &ns, const irep_idt &mode)
       members.push_back(std::move(e));
     }
   }
+  else if(type.id() == ID_union_tag)
+  {
+    return json(ns.follow_tag(to_union_tag_type(type)), ns, mode);
+  }
   else
     result["name"] = json_stringt("unknown");
 
@@ -207,26 +214,23 @@ static std::string binary(const constant_exprt &src)
 /// The mode is used to correctly report types.
 /// \param expr: an expression
 /// \param ns: a namespace
-/// \param mode: language in which the code was written; for now ID_C and
-///   ID_java are supported
+/// \param mode: language in which the code was written
 /// \return a json object
 json_objectt json(const exprt &expr, const namespacet &ns, const irep_idt &mode)
 {
   json_objectt result;
 
-  const typet &type = ns.follow(expr.type());
-
   if(expr.id() == ID_constant)
   {
+    const constant_exprt &constant_expr = to_constant_expr(expr);
+
+    const typet &type = expr.type();
+
     std::unique_ptr<languaget> lang;
-    if(mode == ID_unknown)
-      lang = std::unique_ptr<languaget>(get_default_language());
-    else
-    {
+    if(mode != ID_unknown)
       lang = std::unique_ptr<languaget>(get_language_from_mode(mode));
-      if(!lang)
-        lang = std::unique_ptr<languaget>(get_default_language());
-    }
+    if(!lang)
+      lang = std::unique_ptr<languaget>(get_default_language());
 
     const typet &underlying_type =
       type.id() == ID_c_bit_field ? to_c_bit_field_type(type).subtype() : type;
@@ -238,10 +242,9 @@ json_objectt json(const exprt &expr, const namespacet &ns, const irep_idt &mode)
     std::string value_string;
     lang->from_expr(expr, value_string, ns);
 
-    const constant_exprt &constant_expr = to_constant_expr(expr);
     if(
       type.id() == ID_unsignedbv || type.id() == ID_signedbv ||
-      type.id() == ID_c_bit_field)
+      type.id() == ID_c_bit_field || type.id() == ID_c_bool)
     {
       std::size_t width = to_bitvector_type(type).get_width();
 
@@ -320,15 +323,6 @@ json_objectt json(const exprt &expr, const namespacet &ns, const irep_idt &mode)
       result["binary"] = json_stringt(expr.is_true() ? "1" : "0");
       result["data"] = jsont::json_boolean(expr.is_true());
     }
-    else if(type.id() == ID_c_bool)
-    {
-      result["name"] = json_stringt("integer");
-      result["width"] =
-        json_numbert(std::to_string(to_bitvector_type(type).get_width()));
-      result["type"] = json_stringt(type_string);
-      result["binary"] = json_stringt(expr.get_string(ID_value));
-      result["data"] = json_stringt(value_string);
-    }
     else if(type.id() == ID_string)
     {
       result["name"] = json_stringt("string");
@@ -358,6 +352,8 @@ json_objectt json(const exprt &expr, const namespacet &ns, const irep_idt &mode)
   {
     result["name"] = json_stringt("struct");
 
+    const typet &type = ns.follow(expr.type());
+
     // these are expected to have a struct type
     if(type.id() == ID_struct)
     {