Add meaningfull names instead of id_X

Author: mmuesly

regression/memory-analyzer/arrays/test.desc

@@ -4,17 +4,21 @@ arrays.exe
 analyzing symbol: test_struct
 GENERATED CODE: 
 \{
-  char id_1\[7l\]="accept";
-  char id_2\[8l\]="unique0";
-  char id_3\[8l\]="unique1";
-  char id_4\[8l\]="unique2";
-  char id_5\[8l\]="unique3";
-  struct a_typet id_0=\{ .config=\{ 10, 11, 12, 13, 14, 15, 16, 17, 18, 19 \}, .initalized=false,
-    .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 \*\)&id_1 \}, \{ .text=\(char \*\)&id_2 \} \} \}, 
-    \{ .id=13, .options=\{ \{ .text=\(char \*\)&id_1 \}, \{ .text=\(char \*\)&id_3 \} \} \}, 
-    \{ .id=14, .options=\{ \{ .text=\(char \*\)&id_1 \}, \{ .text=\(char \*\)&id_4 \} \} \}, 
-    \{ .id=15, .options=\{ \{ .text=\(char \*\)&id_1 \}, \{ .text=\(char \*\)&id_5 \} \} \} \} \};
-  test_struct = &id_0;
+  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";
+  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 \} \} \}, 
+    \{ .id=13, .options=\{ \{ .text=\(char \*\)&_test_struct_childs0_options0_text_1 \},
+    \{ .text=\(char \*\)&_test_struct_childs1_options1_text_3 \} \} \}, 
+    \{ .id=14, .options=\{ \{ .text=\(char \*\)&_test_struct_childs0_options0_text_1 \},
+    \{ .text=\(char \*\)&_test_struct_childs2_options1_text_4 \} \} \}, 
+    \{ .id=15, .options=\{ \{ .text=\(char \*\)&_test_struct_childs0_options0_text_1 \},
+    \{ .text=\(char \*\)&_test_struct_childs3_options1_text_5 \} \} \} \} \};
+  test_struct = &test_struct_0;
 \}
 --
 --

regression/memory-analyzer/cycles/test.desc

@@ -4,17 +4,17 @@ cycles.exe
 analyzing symbol: buffer
 GENERATED CODE: 
 \{
-  char id_1\[5l\]="snow";
-  char id_3\[4l\]="sun";
-  char id_5\[5l\]="rain";
-  char id_7\[14l\]="thunder storm";
-  struct cycle_buffer_entry id_6=\{ .data=\(char \*\)&id_7, .next=\(\(struct cycle_buffer_entry \*\)NULL\) \};
-  struct cycle_buffer_entry id_4=\{ .data=\(char \*\)&id_5, .next=&id_6 \};
-  struct cycle_buffer_entry id_2=\{ .data=\(char \*\)&id_3, .next=&id_4 \};
-  struct cycle_buffer_entry id_0=\{ .data=\(char \*\)&id_1, .next=&id_2 \};
-  buffer.start = &id_0;
-  buffer.end = &id_6;
-  \(\*\(\*\(\*\(\*buffer.start\).next\).next\).next\).next = &id_0;
+  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";
+  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 \};
+  struct cycle_buffer_entry buffer_start_0=\{ .data=\(char \*\)&_buffer_start_data_1, .next=&_buffer_start_next_2 \};
+  buffer.start = &buffer_start_0;
+  buffer.end = &___buffer_start_next_next_next_6;
+  \(\*\(\*\(\*\(\*buffer.start\).next\).next\).next\).next = &buffer_start_0;
 \}
 --
 --

regression/memory-analyzer/primitive_types/test.desc

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

regression/memory-analyzer/void_pointer/test.desc

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

src/memory-analyzer/analyze_symbol.cpp

@@ -4,6 +4,7 @@
 #include "analyze_symbol.h"
 #include "gdb_api.h"
 
+#include <algorithm>
 #include <regex>
 
 #include <ansi-c/expr2c_class.h>
@@ -181,6 +182,37 @@ array_exprt create_char_array_from_string(
   return result_array;
 }
 
+code_declt
+symbol_analyzert::declare_instance(const std::string &prefix, const typet &type)
+{
+  std::string safe_prefix = prefix;
+  std::replace(safe_prefix.begin(), safe_prefix.end(), '.', '_');
+  std::replace(safe_prefix.begin(), safe_prefix.end(), '-', '_');
+  std::replace(safe_prefix.begin(), safe_prefix.end(), '>', '_');
+  std::replace(safe_prefix.begin(), safe_prefix.end(), '&', '_');
+  std::replace(safe_prefix.begin(), safe_prefix.end(), '*', '_');
+  safe_prefix.erase(
+    std::remove(safe_prefix.begin(), safe_prefix.end(), '('),
+    safe_prefix.end());
+  safe_prefix.erase(
+    std::remove(safe_prefix.begin(), safe_prefix.end(), ')'),
+    safe_prefix.end());
+  safe_prefix.erase(
+    std::remove(safe_prefix.begin(), safe_prefix.end(), '['),
+    safe_prefix.end());
+  safe_prefix.erase(
+    std::remove(safe_prefix.begin(), safe_prefix.end(), ']'),
+    safe_prefix.end());
+  safe_prefix.erase(
+    std::remove(safe_prefix.begin(), safe_prefix.end(), ' '),
+    safe_prefix.end());
+
+  const std::string var_id = safe_prefix + "_" + std::to_string(id_counter);
+  ++id_counter;
+  const code_declt declaration(symbol_exprt(var_id, type));
+  return declaration;
+}
+
 exprt symbol_analyzert::declare_and_initalize_char_ptr(
   const symbol_exprt &symbol,
   const std::string &memory_location,
@@ -201,7 +233,8 @@ exprt symbol_analyzert::declare_and_initalize_char_ptr(
       init = create_char_array_from_string(value, bv_type, location, ns);
     }
 
-    code_declt target_object = declare_instance(init.type());
+    code_declt target_object =
+      declare_instance(id2string(symbol.get_identifier()), init.type());
     target_object.operands().resize(2);
     target_object.op1() = init;
     generated_code.add(target_object);
@@ -217,14 +250,6 @@ exprt symbol_analyzert::declare_and_initalize_char_ptr(
   }
 }
 
-code_declt symbol_analyzert::declare_instance(const typet &type)
-{
-  const std::string var_id = "id_" + std::to_string(id_counter);
-  ++id_counter;
-  const code_declt declaration(symbol_exprt(var_id, type));
-  return declaration;
-}
-
 exprt symbol_analyzert::process_any_pointer_target(
   const symbol_exprt &symbol,
   const std::string memory_location,
@@ -254,7 +279,7 @@ code_declt symbol_analyzert::get_pointer_target(
   const typet &type,
   const source_locationt &location)
 {
-  code_declt declaration = declare_instance(type);
+  code_declt declaration = declare_instance(pointer_name, type);
 
   const std::string deref_pointer = "(*" + pointer_name + ")";
   const exprt target_expr = fill_expr_with_values(
@@ -373,7 +398,7 @@ exprt symbol_analyzert::fill_struct_with_values(
       }
       else if(is_struct(resolved_type))
       {
-        code_declt declaration = declare_instance(resolved_type);
+        code_declt declaration = declare_instance(field_access, resolved_type);
 
         const exprt target_expr = fill_expr_with_values(
           field_access,

src/memory-analyzer/analyze_symbol.h

@@ -70,7 +70,7 @@ class symbol_analyzert : public messaget
     const typet &type,
     const source_locationt &location);
 
-  code_declt declare_instance(const typet &type);
+  code_declt declare_instance(const std::string &prefix, const typet &type);
   exprt declare_and_initalize_char_ptr(
     const symbol_exprt &symbol,
     const std::string &memory_location,