statement-list: use new symbolt constructors

To the extent possible, apply resource-acquisition-is-initialisation.
The constructors ensure that at least the most essential fields (name,
type, mode) are set.

Author: tautschnig

src/statement-list/statement_list_entry_point.cpp

@@ -103,13 +103,11 @@ static void add_main_function_block_call(
   PRECONDITION(1u == function_type.parameters().size());
   const code_typet::parametert &data_block_interface =
     function_type.parameters().front();
-  symbolt instance_data_block;
-  instance_data_block.name =
-    id2string(data_block_interface.get_base_name()) + DB_ENTRY_POINT_POSTFIX;
-  instance_data_block.type =
-    to_type_with_subtype(data_block_interface.type()).subtype();
+  symbolt instance_data_block{
+    id2string(data_block_interface.get_base_name()) + DB_ENTRY_POINT_POSTFIX,
+    to_type_with_subtype(data_block_interface.type()).subtype(),
+    ID_statement_list};
   instance_data_block.is_static_lifetime = true;
-  instance_data_block.mode = ID_statement_list;
   symbol_table.add(instance_data_block);
   const address_of_exprt data_block_ref{instance_data_block.symbol_expr()};
 
@@ -124,10 +122,8 @@ static void add_main_function_block_call(
 static void
 generate_statement_list_init_function(symbol_table_baset &symbol_table)
 {
-  symbolt init;
-  init.name = INITIALIZE_FUNCTION;
-  init.mode = ID_statement_list;
-  init.type = code_typet({}, empty_typet{});
+  symbolt init{
+    INITIALIZE_FUNCTION, code_typet({}, empty_typet{}), ID_statement_list};
 
   code_blockt dest;
   dest.add(code_labelt(CPROVER_HIDE, code_skipt()));
@@ -146,9 +142,7 @@ generate_statement_list_init_function(symbol_table_baset &symbol_table)
 /// \param [out] symbol_table: Symbol table that should contain the symbol.
 static void generate_rounding_mode(symbol_table_baset &symbol_table)
 {
-  symbolt rounding_mode;
-  rounding_mode.name = rounding_mode_identifier();
-  rounding_mode.type = signed_int_type();
+  symbolt rounding_mode{rounding_mode_identifier(), signed_int_type(), ID_C};
   rounding_mode.is_thread_local = true;
   rounding_mode.is_static_lifetime = true;
   const constant_exprt rounding_val{
@@ -179,12 +173,10 @@ bool generate_statement_list_start_function(
   add_main_function_block_call(start_function_body, symbol_table, main);
 
   // Add the start symbol.
-  symbolt start_symbol;
-  start_symbol.name = goto_functionst::entry_point();
+  symbolt start_symbol{
+    goto_functionst::entry_point(), code_typet{{}, empty_typet{}}, main.mode};
   start_symbol.base_name = goto_functionst::entry_point();
-  start_symbol.type = code_typet({}, empty_typet{});
   start_symbol.value.swap(start_function_body);
-  start_symbol.mode = main.mode;
 
   if(!symbol_table.insert(std::move(start_symbol)).second)
   {

src/statement-list/statement_list_typecheck.cpp

@@ -158,12 +158,10 @@ void statement_list_typecheckt::typecheck_function_block_declaration(
   const statement_list_parse_treet::function_blockt &function_block)
 {
   // Create FB symbol.
-  symbolt function_block_sym;
+  symbolt function_block_sym{function_block.name, typet{}, ID_statement_list};
   function_block_sym.module = module;
-  function_block_sym.name = function_block.name;
   function_block_sym.base_name = function_block_sym.name;
   function_block_sym.pretty_name = function_block_sym.name;
-  function_block_sym.mode = ID_statement_list;
 
   // When calling function blocks, the passed parameters are value-copied to a
   // corresponding instance data block. This block contains all input, inout,
@@ -175,11 +173,11 @@ void statement_list_typecheckt::typecheck_function_block_declaration(
   // Create and add DB type symbol.
   const struct_typet data_block_type{
     create_instance_data_block_type(function_block)};
-  type_symbolt data_block{data_block_type};
-  data_block.name =
-    id2string(function_block_sym.name) + DATA_BLOCK_TYPE_POSTFIX;
+  type_symbolt data_block{
+    id2string(function_block_sym.name) + DATA_BLOCK_TYPE_POSTFIX,
+    data_block_type,
+    ID_statement_list};
   data_block.base_name = data_block.name;
-  data_block.mode = ID_statement_list;
   symbol_table.add(data_block);
 
   // Create and add parameter symbol.
@@ -206,12 +204,10 @@ void statement_list_typecheckt::typecheck_function_block_declaration(
 void statement_list_typecheckt::typecheck_function_declaration(
   const statement_list_parse_treet::functiont &function)
 {
-  symbolt function_sym;
+  symbolt function_sym{function.name, typet{}, ID_statement_list};
   function_sym.module = module;
-  function_sym.name = function.name;
   function_sym.base_name = function_sym.name;
   function_sym.pretty_name = function_sym.name;
-  function_sym.mode = ID_statement_list;
   code_typet::parameterst params;
   typecheck_function_var_decls(
     function.var_input, params, function.name, ID_statement_list_var_input);
@@ -230,28 +226,22 @@ void statement_list_typecheckt::typecheck_tag_list()
 {
   for(const symbol_exprt &tag : parse_tree.tags)
   {
-    symbolt tag_sym;
+    symbolt tag_sym{tag.get_identifier(), tag.type(), ID_statement_list};
     tag_sym.is_static_lifetime = true;
     tag_sym.module = module;
-    tag_sym.name = tag.get_identifier();
     tag_sym.base_name = tag_sym.name;
     tag_sym.pretty_name = tag_sym.name;
-    tag_sym.type = tag.type();
-    tag_sym.mode = ID_statement_list;
     symbol_table.add(tag_sym);
   }
 }
 
 void statement_list_typecheckt::add_temp_rlo()
 {
-  symbolt temp_rlo;
+  symbolt temp_rlo{CPROVER_TEMP_RLO, get_bool_type(), ID_statement_list};
   temp_rlo.is_static_lifetime = true;
   temp_rlo.module = module;
-  temp_rlo.name = CPROVER_TEMP_RLO;
   temp_rlo.base_name = temp_rlo.name;
   temp_rlo.pretty_name = temp_rlo.name;
-  temp_rlo.type = get_bool_type();
-  temp_rlo.mode = ID_statement_list;
   symbol_table.add(temp_rlo);
 }
 
@@ -321,13 +311,13 @@ void statement_list_typecheckt::typecheck_temp_var_decls(
   for(const statement_list_parse_treet::var_declarationt &declaration :
       tia_module.var_temp)
   {
-    symbolt temp_sym;
-    temp_sym.name = id2string(tia_symbol.name) +
-                    "::" + id2string(declaration.variable.get_identifier());
+    symbolt temp_sym{
+      id2string(tia_symbol.name) +
+        "::" + id2string(declaration.variable.get_identifier()),
+      declaration.variable.type(),
+      ID_statement_list};
     temp_sym.base_name = declaration.variable.get_identifier();
     temp_sym.pretty_name = temp_sym.base_name;
-    temp_sym.type = declaration.variable.type();
-    temp_sym.mode = ID_statement_list;
     temp_sym.module = module;
     symbol_table.add(temp_sym);