Format fixes

Author: Remi Delmas

src/analyses/goto_check.cpp

@@ -1856,8 +1856,8 @@ optionalt<exprt> goto_checkt::rw_ok_check(exprt expr)
 class flag_resett
 {
 public:
-
-  /// \brief Store the current value of \p flag and then set its value to \p new_value.
+  /// \brief Store the current value of \p flag and 
+  /// then set its value to \p new_value.
   /// \returns true if the flag was already seen before
   bool set_flag(bool &flag, bool new_value)
   {
@@ -1877,7 +1877,8 @@ class flag_resett
     return seen_flags.find(&flag) != seen_flags.end();
   }
 
-  /// \brief Restore the values of all flags that have been modified via `set_flag`.
+  /// \brief Restore the values of all flags that have been 
+  /// modified via `set_flag`.
   ~flag_resett()
   {
     seen_flags.clear();

src/ansi-c/ansi_c_parser.cpp

@@ -19,21 +19,18 @@ ansi_c_id_classt ansi_c_parsert::lookup(
   bool label)
 {
   // labels and tags have a separate name space
-  const irep_idt scope_name=
-    tag?"tag-"+id2string(base_name):
-    label?"label-"+id2string(base_name):
-    base_name;
+  const irep_idt scope_name =
+    tag ? "tag-" + id2string(base_name)
+        : label ? "label-" + id2string(base_name) : base_name;
 
-  for(scopest::const_reverse_iterator it=scopes.rbegin();
-      it!=scopes.rend();
+  for(scopest::const_reverse_iterator it = scopes.rbegin(); it != scopes.rend();
       it++)
   {
-    scopet::name_mapt::const_iterator n_it=
-      it->name_map.find(scope_name);
+    scopet::name_mapt::const_iterator n_it = it->name_map.find(scope_name);
 
-    if(n_it!=it->name_map.end())
+    if(n_it != it->name_map.end())
     {
-      identifier=n_it->second.prefixed_name;
+      identifier = n_it->second.prefixed_name;
       return n_it->second.id_class;
     }
   }
@@ -42,33 +39,30 @@ ansi_c_id_classt ansi_c_parsert::lookup(
   // If it's a tag, we will add to current scope.
   if(tag)
   {
-    ansi_c_identifiert &i=
-      current_scope().name_map[scope_name];
-    i.id_class=ansi_c_id_classt::ANSI_C_TAG;
-    i.prefixed_name=current_scope().prefix+id2string(scope_name);
-    i.base_name=base_name;
-    identifier=i.prefixed_name;
+    ansi_c_identifiert &i = current_scope().name_map[scope_name];
+    i.id_class = ansi_c_id_classt::ANSI_C_TAG;
+    i.prefixed_name = current_scope().prefix + id2string(scope_name);
+    i.base_name = base_name;
+    identifier = i.prefixed_name;
     return ansi_c_id_classt::ANSI_C_TAG;
   }
 
-  identifier=base_name;
+  identifier = base_name;
   return ansi_c_id_classt::ANSI_C_UNKNOWN;
 }
 
 void ansi_c_parsert::add_tag_with_body(irept &tag)
 {
-  const std::string scope_name=
-    "tag-"+tag.get_string(ID_C_base_name);
+  const std::string scope_name = "tag-" + tag.get_string(ID_C_base_name);
 
-  irep_idt prefixed_name=current_scope().prefix+scope_name;
+  irep_idt prefixed_name = current_scope().prefix + scope_name;
 
-  if(prefixed_name!=tag.get(ID_identifier))
+  if(prefixed_name != tag.get(ID_identifier))
   {
     // re-defined in a deeper scope
-    ansi_c_identifiert &identifier=
-      current_scope().name_map[scope_name];
-    identifier.id_class=ansi_c_id_classt::ANSI_C_TAG;
-    identifier.prefixed_name=prefixed_name;
+    ansi_c_identifiert &identifier = current_scope().name_map[scope_name];
+    identifier.id_class = ansi_c_id_classt::ANSI_C_TAG;
+    identifier.prefixed_name = prefixed_name;
     tag.set(ID_identifier, prefixed_name);
   }
 }
@@ -81,21 +75,18 @@ int yyansi_cerror(const std::string &error)
   return 0;
 }
 
-void ansi_c_parsert::add_declarator(
-  exprt &declaration,
-  irept &declarator)
+void ansi_c_parsert::add_declarator(exprt &declaration, irept &declarator)
 {
   assert(declarator.is_not_nil());
-  ansi_c_declarationt &ansi_c_declaration=
-    to_ansi_c_declaration(declaration);
+  ansi_c_declarationt &ansi_c_declaration = to_ansi_c_declaration(declaration);
 
   ansi_c_declaratort new_declarator;
   new_declarator.build(declarator);
 
-  irep_idt base_name=new_declarator.get_base_name();
+  irep_idt base_name = new_declarator.get_base_name();
 
-  bool is_member=ansi_c_declaration.get_is_member();
-  bool is_parameter=ansi_c_declaration.get_is_parameter();
+  bool is_member = ansi_c_declaration.get_is_member();
+  bool is_parameter = ansi_c_declaration.get_is_parameter();
 
   if(is_member)
   {
@@ -113,39 +104,35 @@ void ansi_c_parsert::add_declarator(
   if(!base_name.empty())
   {
     c_storage_spect c_storage_spec(ansi_c_declaration.type());
-    bool is_typedef=c_storage_spec.is_typedef;
-    bool is_extern=c_storage_spec.is_extern;
+    bool is_typedef = c_storage_spec.is_typedef;
+    bool is_extern = c_storage_spec.is_extern;
 
-    bool force_root_scope=false;
+    bool force_root_scope = false;
 
     // Functions always go into global scope, unless
     // declared as a parameter or are typedefs.
-    if(new_declarator.type().id()==ID_code &&
-       !is_parameter &&
-       !is_typedef)
-      force_root_scope=true;
+    if(new_declarator.type().id() == ID_code && !is_parameter && !is_typedef)
+      force_root_scope = true;
 
     // variables marked as 'extern' always go into global scope
     if(is_extern)
-      force_root_scope=true;
+      force_root_scope = true;
 
-    ansi_c_id_classt id_class=is_typedef?
-      ansi_c_id_classt::ANSI_C_TYPEDEF:
-      ansi_c_id_classt::ANSI_C_SYMBOL;
+    ansi_c_id_classt id_class = is_typedef ? ansi_c_id_classt::ANSI_C_TYPEDEF
+                                           : ansi_c_id_classt::ANSI_C_SYMBOL;
 
-    scopet &scope=
-      force_root_scope?root_scope():current_scope();
+    scopet &scope = force_root_scope ? root_scope() : current_scope();
 
     // set the final name
-    irep_idt prefixed_name=force_root_scope?
-             base_name:
-             current_scope().prefix+id2string(base_name);
+    irep_idt prefixed_name = force_root_scope
+                               ? base_name
+                               : current_scope().prefix + id2string(base_name);
     new_declarator.set_name(prefixed_name);
 
     // add to scope
-    ansi_c_identifiert &identifier=scope.name_map[base_name];
-    identifier.id_class=id_class;
-    identifier.prefixed_name=prefixed_name;
+    ansi_c_identifiert &identifier = scope.name_map[base_name];
+    identifier.id_class = id_class;
+    identifier.prefixed_name = prefixed_name;
 
     if(force_root_scope)
       current_scope().name_map[base_name] = identifier;
@@ -156,13 +143,12 @@ void ansi_c_parsert::add_declarator(
 
 ansi_c_id_classt ansi_c_parsert::get_class(const typet &type)
 {
-  if(type.id()==ID_typedef)
+  if(type.id() == ID_typedef)
     return ansi_c_id_classt::ANSI_C_TYPEDEF;
-  else if(type.id()==ID_struct ||
-          type.id()==ID_union ||
-          type.id()==ID_c_enum)
+  else if(
+    type.id() == ID_struct || type.id() == ID_union || type.id() == ID_c_enum)
     return ansi_c_id_classt::ANSI_C_TAG;
-  else if(type.id()==ID_merged_type)
+  else if(type.id() == ID_merged_type)
   {
     for(const typet &subtype : to_type_with_subtypes(type).subtypes())
     {

src/ansi-c/ansi_c_parser.h

@@ -6,22 +6,21 @@ Author: Daniel Kroening, [email protected]
 
 \*******************************************************************/
 
-
 #ifndef CPROVER_ANSI_C_ANSI_C_PARSER_H
 #define CPROVER_ANSI_C_ANSI_C_PARSER_H
 
-#include <set>
 #include <map>
+#include <set>
 
-#include <util/parser.h>
 #include <util/config.h>
+#include <util/parser.h>
 
 #include "ansi_c_parse_tree.h"
 #include "ansi_c_scope.h"
 
 int yyansi_cparse();
 
-class ansi_c_parsert:public parsert
+class ansi_c_parsert : public parsert
 {
 public:
   ansi_c_parse_treet parse_tree;
@@ -40,7 +39,7 @@ class ansi_c_parsert:public parsert
 
   virtual bool parse() override
   {
-    return yyansi_cparse()!=0;
+    return yyansi_cparse() != 0;
   }
 
   virtual void clear() override
@@ -49,9 +48,9 @@ class ansi_c_parsert:public parsert
     parse_tree.clear();
 
     // scanner state
-    tag_following=false;
-    asm_block_following=false;
-    parenthesis_counter=0;
+    tag_following = false;
+    asm_block_following = false;
+    parenthesis_counter = 0;
     string_literal.clear();
     pragma_pack.clear();
     pragma_cprover_stack.clear();
@@ -108,7 +107,13 @@ class ansi_c_parsert:public parsert
     return scopes.back();
   }
 
-  enum class decl_typet { TAG, MEMBER, PARAMETER, OTHER };
+  enum class decl_typet
+  {
+    TAG,
+    MEMBER,
+    PARAMETER,
+    OTHER
+  };
 
   // convert a declarator and then add it to existing an declaration
   void add_declarator(exprt &declaration, irept &declarator);
@@ -118,20 +123,20 @@ class ansi_c_parsert:public parsert
 
   void copy_item(const ansi_c_declarationt &declaration)
   {
-    assert(declaration.id()==ID_declaration);
+    assert(declaration.id() == ID_declaration);
     parse_tree.items.push_back(declaration);
   }
 
   void new_scope(const std::string &prefix)
   {
-    const scopet &current=current_scope();
+    const scopet &current = current_scope();
     scopes.push_back(scopet());
-    scopes.back().prefix=current.prefix+prefix;
+    scopes.back().prefix = current.prefix + prefix;
   }
 
   ansi_c_id_classt lookup(
     const irep_idt &base_name, // in
-    irep_idt &identifier, // out
+    irep_idt &identifier,      // out
     bool tag,
     bool label);
 
@@ -160,7 +165,7 @@ class ansi_c_parsert:public parsert
   /// is already present at top of the stack
   bool pragma_cprover_clash(irep_idt name, bool enabled);
 
-  /// \brief Tags \ref source_location with 
+  /// \brief Tags \ref source_location with
   /// the current CPROVER pragma stack
   void set_pragma_cprover();
 };