pacify cpplint

Author: mgudemann

src/java_bytecode/expr2java.cpp

@@ -90,7 +90,10 @@ std::string expr2javat::convert_code_function_call(
       unsigned p;
       std::string arg_str=convert(*it, p);
 
-      if(first) first=false; else dest+=", ";
+      if(first)
+        first=false;
+      else
+        dest+=", ";
       // TODO: ggf. Klammern je nach p
       dest+=arg_str;
     }
@@ -218,7 +221,7 @@ std::string expr2javat::convert_constant(
     dest+="(char)'";
 
     if(int_value>=' ' && int_value<127)
-      dest+=(char)(int_value.to_long());
+      dest+=static_cast<char>(int_value.to_long());
     else
     {
       std::string hex=integer2string(int_value, 16);
@@ -332,7 +335,8 @@ std::string expr2javat::convert_rec(
 
     if(code_type.has_ellipsis())
     {
-      if(!parameters.empty()) dest+=", ";
+      if(!parameters.empty())
+        dest+=", ";
       dest+="...";
     }
 
@@ -534,7 +538,7 @@ std::string expr2javat::convert_code(
 
   if(statement==ID_java_new ||
      statement==ID_java_new_array)
-    return convert_java_new(src,indent);
+    return convert_java_new(src, indent);
 
   if(statement==ID_function_call)
     return convert_code_function_call(to_code_function_call(src), indent);

src/java_bytecode/expr2java.h

@@ -19,7 +19,7 @@ class typet;
 class expr2javat:public expr2ct
 {
 public:
-  expr2javat(const namespacet &_ns):expr2ct(_ns) { }
+  explicit expr2javat(const namespacet &_ns):expr2ct(_ns) { }
 
   virtual std::string convert(const exprt &src)
   {
@@ -34,13 +34,21 @@ class expr2javat:public expr2ct
 protected:
   virtual std::string convert(const exprt &src, unsigned &precedence);
   virtual std::string convert_java_this(const exprt &src, unsigned precedence);
-  virtual std::string convert_java_instanceof(const exprt &src, unsigned precedence);
+  virtual std::string convert_java_instanceof(
+    const exprt &src,
+    unsigned precedence);
   virtual std::string convert_java_new(const exprt &src, unsigned precedence);
-  virtual std::string convert_code_java_delete(const exprt &src, unsigned precedence);
+  virtual std::string convert_code_java_delete(
+    const exprt &src,
+    unsigned precedence);
   virtual std::string convert_struct(const exprt &src, unsigned &precedence);
   virtual std::string convert_code(const codet &src, unsigned indent);
-  virtual std::string convert_constant(const constant_exprt &src, unsigned &precedence);
-  virtual std::string convert_code_function_call(const code_function_callt &src, unsigned indent);
+  virtual std::string convert_constant(
+    const constant_exprt &src,
+    unsigned &precedence);
+  virtual std::string convert_code_function_call(
+    const code_function_callt &src,
+    unsigned indent);
 
   virtual std::string convert_rec(
     const typet &src,

src/java_bytecode/java_bytecode_convert_class.cpp

@@ -20,7 +20,6 @@ Author: Daniel Kroening, [email protected]
 #include <util/std_expr.h>
 #include <util/expr_util.h>
 
-namespace {
 class java_bytecode_convert_classt:public messaget
 {
 public:
@@ -61,7 +60,6 @@ class java_bytecode_convert_classt:public messaget
   void generate_class_stub(const irep_idt &class_name);
   void add_array_types();
 };
-}
 
 /*******************************************************************\
 
@@ -151,7 +149,8 @@ Function: java_bytecode_convert_classt::generate_class_stub
 
 \*******************************************************************/
 
-void java_bytecode_convert_classt::generate_class_stub(const irep_idt &class_name)
+void java_bytecode_convert_classt::generate_class_stub(
+  const irep_idt &class_name)
 {
   class_typet class_type;
 
@@ -174,7 +173,8 @@ void java_bytecode_convert_classt::generate_class_stub(const irep_idt &class_nam
 
   if(symbol_table.move(new_symbol, class_symbol))
   {
-    warning() << "stub class symbol "+id2string(new_symbol.name)+" already exists";
+    warning() << "stub class symbol "+
+      id2string(new_symbol.name)+" already exists";
   }
   else
   {
@@ -213,7 +213,8 @@ void java_bytecode_convert_classt::convert(
     new_symbol.name=id2string(class_symbol.name)+"."+id2string(f.name);
     new_symbol.base_name=f.name;
     new_symbol.type=field_type;
-    new_symbol.pretty_name=id2string(class_symbol.pretty_name)+"."+id2string(f.name);
+    new_symbol.pretty_name=id2string(class_symbol.pretty_name)+
+      "."+id2string(f.name);
     new_symbol.mode=ID_java;
     new_symbol.is_type=false;
     new_symbol.value=gen_zero(field_type);