Clang format updates

Author: thomasspriggs

src/java_bytecode/java_bytecode_parser.cpp

@@ -1687,9 +1687,8 @@ void java_bytecode_parsert::rmethod(classt &parsed_class)
     rmethod_attribute(method);
 }
 
-optionalt<class java_bytecode_parse_treet> java_bytecode_parse(
-  std::istream &istream,
-  message_handlert &message_handler)
+optionalt<class java_bytecode_parse_treet>
+java_bytecode_parse(std::istream &istream, message_handlert &message_handler)
 {
   java_bytecode_parsert java_bytecode_parser;
   java_bytecode_parser.in=&istream;
@@ -1705,9 +1704,8 @@ optionalt<class java_bytecode_parse_treet> java_bytecode_parse(
   return java_bytecode_parser.parse_tree;
 }
 
-optionalt<class java_bytecode_parse_treet> java_bytecode_parse(
-  const std::string &file,
-  message_handlert &message_handler)
+optionalt<class java_bytecode_parse_treet>
+java_bytecode_parse(const std::string &file, message_handlert &message_handler)
 {
   std::ifstream in(file, std::ios::binary);
 

src/java_bytecode/java_bytecode_parser.h

@@ -14,12 +14,10 @@ Author: Daniel Kroening, kroening@kroening.com
 #include <string>
 #include <util/optional.h>
 
-optionalt<class java_bytecode_parse_treet> java_bytecode_parse(
-  const std::string &file,
-  class message_handlert &);
+optionalt<class java_bytecode_parse_treet>
+java_bytecode_parse(const std::string &file, class message_handlert &);
 
-optionalt<class java_bytecode_parse_treet> java_bytecode_parse(
-  std::istream &,
-  class message_handlert &);
+optionalt<class java_bytecode_parse_treet>
+java_bytecode_parse(std::istream &, class message_handlert &);
 
 #endif // CPROVER_JAVA_BYTECODE_JAVA_BYTECODE_PARSER_H

src/java_bytecode/java_class_loader.cpp

@@ -189,7 +189,8 @@ java_class_loadert::get_parse_tree(
         debug()
           << "Getting class `" << class_name << "' from file " << full_path
           << eom;
-        optionalt<java_bytecode_parse_treet> parse_tree = java_bytecode_parse(full_path, get_message_handler());
+        optionalt<java_bytecode_parse_treet> parse_tree =
+          java_bytecode_parse(full_path, get_message_handler());
         if(parse_tree)
           parse_trees.push_back(std::move(*parse_tree));
       }

unit/java_bytecode/java_bytecode_parse_lambdas/java_bytecode_parse_lambda_method_table.cpp

@@ -33,8 +33,7 @@ SCENARIO(
     GIVEN(
       "A class with a static lambda variables from " + compiler + " compiler.")
     {
-      optionalt<java_bytecode_parse_treet> parse_tree =
-      java_bytecode_parse(
+      optionalt<java_bytecode_parse_treet> parse_tree = java_bytecode_parse(
         "./java_bytecode/java_bytecode_parse_lambdas/lambda_examples/" +
           compiler + "_classes/StaticLambdas.class",
         message_handler);
@@ -345,8 +344,7 @@ SCENARIO(
       null_message_handlert message_handler;
       GIVEN("A method with local lambdas from " + compiler + " compiler.")
       {
-        optionalt<java_bytecode_parse_treet> parse_tree =
-        java_bytecode_parse(
+        optionalt<java_bytecode_parse_treet> parse_tree = java_bytecode_parse(
           "./java_bytecode/java_bytecode_parse_lambdas/lambda_examples/" +
             compiler + "_classes/LocalLambdas.class",
           message_handler);
@@ -655,8 +653,7 @@ SCENARIO(
         "A class that has lambdas as member variables from " + compiler +
         " compiler.")
       {
-        optionalt<java_bytecode_parse_treet> parse_tree =
-        java_bytecode_parse(
+        optionalt<java_bytecode_parse_treet> parse_tree = java_bytecode_parse(
           "./java_bytecode/java_bytecode_parse_lambdas/lambda_examples/" +
             compiler + "_classes/MemberLambdas.class",
           message_handler);
@@ -991,8 +988,7 @@ SCENARIO(
         "variables from " +
         compiler + " compiler.")
       {
-        optionalt<java_bytecode_parse_treet> parse_tree =
-        java_bytecode_parse(
+        optionalt<java_bytecode_parse_treet> parse_tree = java_bytecode_parse(
           "./java_bytecode/java_bytecode_parse_lambdas/lambda_examples/" +
             compiler + "_classes/OuterMemberLambdas$Inner.class",
           message_handler);