Formatting updates

Author: thomasspriggs

src/java_bytecode/java_types.h

@@ -34,13 +34,13 @@ class java_class_typet:public class_typet
 
 inline const java_class_typet &to_java_class_type(const typet &type)
 {
-  PRECONDITION(type.id()==ID_struct);
+  PRECONDITION(type.id() == ID_struct);
   return static_cast<const java_class_typet &>(type);
 }
 
 inline java_class_typet &to_java_class_type(typet &type)
 {
-  PRECONDITION(type.id()==ID_struct);
+  PRECONDITION(type.id() == ID_struct);
   return static_cast<java_class_typet &>(type);
 }
 
@@ -536,8 +536,8 @@ class java_generic_base_typet : public typet
     : typet(ID_generic_base)
   {
     set(ID_identifier, identifier);
-    generic_types().insert(generic_types().end(), gen_types.begin(), gen_types
-      .end());
+    generic_types().insert(
+      generic_types().end(), gen_types.begin(), gen_types.end());
   }
 
   static java_generic_base_typet build_from_ref(

src/jbmc/jbmc_parse_options.cpp

@@ -705,25 +705,22 @@ bool jbmc_parse_optionst::process_goto_functions(
     // TODO Should really get this from java_bytecode_language somehow, but we
     // don't have an instance of that here.
     object_factory_parameterst factory_params;
-    factory_params.max_nondet_array_length=
+    factory_params.max_nondet_array_length =
       cmdline.isset("java-max-input-array-length")
         ? std::stoul(cmdline.get_value("java-max-input-array-length"))
         : MAX_NONDET_ARRAY_LENGTH_DEFAULT;
-    factory_params.max_nondet_string_length=
+    factory_params.max_nondet_string_length =
       cmdline.isset("string-max-input-length")
         ? std::stoul(cmdline.get_value("string-max-input-length"))
         : MAX_NONDET_STRING_LENGTH;
-    factory_params.max_nondet_tree_depth=
+    factory_params.max_nondet_tree_depth =
       cmdline.isset("java-max-input-tree-depth")
         ? std::stoul(cmdline.get_value("java-max-input-tree-depth"))
         : MAX_NONDET_TREE_DEPTH;
 
     replace_java_nondet(goto_model);
 
-    convert_nondet(
-      goto_model,
-      get_message_handler(),
-      factory_params);
+    convert_nondet(goto_model, get_message_handler(), factory_params);
 
     // add generic checks
     status() << "Generic Property Instrumentation" << eom;

unit/testing-utils/require_type.cpp

@@ -352,9 +352,9 @@ require_type::require_symbol(const typet &type, const irep_idt &identifier)
 /// \param type The type to check
 /// \param identifier The identifier to match
 /// \return The type, cast to a java_generic_base_typet
-java_generic_base_typet require_type::require_java_generic_base_type
-  (const typet &type, const
-std::string &identifier)
+java_generic_base_typet require_type::require_java_generic_base_type(
+  const typet &type,
+  const std::string &identifier)
 {
   REQUIRE(is_java_generic_base_type(type));
   REQUIRE(type.get(ID_identifier) == identifier);
@@ -377,8 +377,7 @@ std::string &identifier)
 java_generic_base_typet require_type::require_java_generic_base_type(
   const typet &type,
   const std::string &identifier,
-  const require_type::expected_type_argumentst &type_expectations
-)
+  const require_type::expected_type_argumentst &type_expectations)
 {
   const java_generic_base_typet &generic_base_type =
     require_type::require_java_generic_base_type(type, identifier);
@@ -395,4 +394,3 @@ java_generic_base_typet require_type::require_java_generic_base_type(
 
   return generic_base_type;
 }
-

unit/testing-utils/require_type.h

@@ -85,9 +85,9 @@ java_implicitly_generic_class_typet require_java_implicitly_generic_class(
 
 java_class_typet require_java_non_generic_class(const typet &class_type);
 
-java_generic_base_typet require_java_generic_base_type(const typet &type,
-                                                           const std::string
-                                                           &identifier);
+java_generic_base_typet require_java_generic_base_type(
+  const typet &type,
+  const std::string &identifier);
 
 java_generic_base_typet require_java_generic_base_type(
   const typet &type,