Update to work with diffblue#2713 for clean c code output

Author: mmuesly

regression/memory-analyzer/arrays/test.desc

@@ -4,11 +4,11 @@ arrays.exe
 analyzing symbol: test_struct
 GENERATED CODE: 
 \{
-  char _test_struct_childs0_options0_text_1\[7l\]="accept";
-  char _test_struct_childs0_options1_text_2\[8l\]="unique0";
-  char _test_struct_childs1_options1_text_3\[8l\]="unique1";
-  char _test_struct_childs2_options1_text_4\[8l\]="unique2";
-  char _test_struct_childs3_options1_text_5\[8l\]="unique3";
+  char _test_struct_childs0_options0_text_1\[\]="accept";
+  char _test_struct_childs0_options1_text_2\[\]="unique0";
+  char _test_struct_childs1_options1_text_3\[\]="unique1";
+  char _test_struct_childs2_options1_text_4\[\]="unique2";
+  char _test_struct_childs3_options1_text_5\[\]="unique3";
   struct a_typet test_struct_0=\{ .config=\{ 10, 11, 12, 13, 14, 15, 16, 17, 18, 19 \}, .initalized=0,
     .values=\{ 243, 243, 243, 243, 243, 243, 243, 243, 243, 243, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 171, 171, 171, 171, 171, 171, 171, 171, 171, 171 \}, .childs=\{ \{ .id=12, .options=\{ \{ .text=\(char \*\)&_test_struct_childs0_options0_text_1 \},
     \{ .text=\(char \*\)&_test_struct_childs0_options1_text_2 \} \} \}, 

regression/memory-analyzer/cycles/test.desc

@@ -4,10 +4,10 @@ cycles.exe
 analyzing symbol: buffer
 GENERATED CODE: 
 \{
-  char _buffer_start_data_1\[5l\]="snow";
-  char __buffer_start_next_data_3\[4l\]="sun";
-  char ___buffer_start_next_next_data_5\[5l\]="rain";
-  char ____buffer_start_next_next_next_data_7\[14l\]="thunder storm";
+  char _buffer_start_data_1\[\]="snow";
+  char __buffer_start_next_data_3\[\]="sun";
+  char ___buffer_start_next_next_data_5\[\]="rain";
+  char ____buffer_start_next_next_next_data_7\[\]="thunder storm";
   struct cycle_buffer_entry ___buffer_start_next_next_next_6=\{ .data=\(char \*\)&____buffer_start_next_next_next_data_7, .next=\(\(struct cycle_buffer_entry \*\)NULL\) \};
   struct cycle_buffer_entry __buffer_start_next_next_4=\{ .data=\(char \*\)&___buffer_start_next_next_data_5, .next=&___buffer_start_next_next_next_6 \};
   struct cycle_buffer_entry _buffer_start_next_2=\{ .data=\(char \*\)&__buffer_start_next_data_3, .next=&__buffer_start_next_next_4 \};

regression/memory-analyzer/primitive_types/test.desc

@@ -12,13 +12,13 @@ GENERATED CODE:
   e = 17;
   f = &e;
   f_1 = &e;
-  char d_b_0\[6l\]="test2";
+  char d_b_0\[\]="test2";
   d.a = 4;
   d.b = \(char \*\)&d_b_0;
   d.c = -32;
   struct mapping_things g_1=\{ .a=0, .b=\(\(char \*\)NULL\), .c=0 \};
   g = &g_1;
-  char h_2\[5l\]="test";
+  char h_2\[\]="test";
   h = \(char \*\)&h_2;
 }
 ^EXIT=0

regression/memory-analyzer/void_pointer/test.desc

@@ -5,9 +5,9 @@ analyzing symbol: blob
 GENERATED CODE: 
 \{
   a_void_pointer = NULL;
-  char char_a_second_void_pointer_0\[12l\]="test_string";
+  char char_a_second_void_pointer_0\[\]="test_string";
   a_second_void_pointer = \(char \*\)&char_a_second_void_pointer_0;
-  char char_a_third_void_pointer_1\[7ul\]=\{ -13, -13, 'H', -1, '\\\\', '\\\\', -1 \};
+  char char_a_third_void_pointer_1\[\]=\{ -13, -13, 'H', -1, '\\\\', '\\\\', -1 \};
   a_third_void_pointer = \(char \*\)&char_a_third_void_pointer_1;
   blob.size = 7;
   blob.data = \(char \*\)&char_a_third_void_pointer_1;

src/memory-analyzer/analyze_symbol.cpp

@@ -7,7 +7,6 @@
 #include <algorithm>
 #include <regex>
 
-#include <ansi-c/expr2c_class.h>
 #include <goto-programs/goto_model.h>
 #include <goto-programs/read_goto_binary.h>
 #include <util/arith_tools.h>
@@ -27,7 +26,11 @@ symbol_analyzert::symbol_analyzert(
   const symbol_tablet &st,
   gdb_apit &gdb,
   message_handlert &handler)
-  : messaget(handler), gdb_api(gdb), ns(st), c_converter(ns), id_counter(0)
+  : messaget(handler),
+    gdb_api(gdb),
+    ns(st),
+    c_converter(ns, expr2c_configurationt::clean_configuration),
+    id_counter(0)
 {
 }
 

src/memory-analyzer/analyze_symbol.h

@@ -28,7 +28,7 @@ class symbol_analyzert : public messaget
 private:
   gdb_apit &gdb_api;
   const namespacet ns;
-  expr2c_pretty_structt c_converter;
+  expr2ct c_converter;
 
   code_blockt generated_code;
   size_t id_counter;