Merge pull request #3426 from tautschnig/vs-remove-names

tautschnig · web-flow · commit de0b481f28f0 · 2018-11-24T14:22:47.000Z
Remove names of unused parameters [blocks: #2310]
diff --git a/jbmc/src/java_bytecode/select_pointer_type.cpp b/jbmc/src/java_bytecode/select_pointer_type.cpp
@@ -211,7 +211,7 @@ select_pointer_typet::get_recursively_instantiated_type(
 std::set<symbol_typet> select_pointer_typet::get_parameter_alternative_types(
   const irep_idt &function_name,
   const irep_idt &parameter_name,
-  const namespacet &ns) const
+  const namespacet &) const
 {
   // unused parameters
   (void)function_name;
diff --git a/jbmc/unit/pointer-analysis/custom_value_set_analysis.cpp b/jbmc/unit/pointer-analysis/custom_value_set_analysis.cpp
@@ -91,7 +91,7 @@ class test_value_sett:public value_sett
 
   void adjust_assign_rhs_values(
     const exprt &expr,
-    const namespacet &ns,
+    const namespacet &,
     object_mapt &dest) const override
   {
     // Always add an ID_unknown to reads from variables containing
@@ -109,7 +109,7 @@ class test_value_sett:public value_sett
 
   void apply_assign_side_effects(
     const exprt &lhs,
-    const exprt &rhs,
+    const exprt &,
     const namespacet &ns) override
   {
     // Whenever someone touches the variable "cause", null the
diff --git a/jbmc/unit/util/has_subtype.cpp b/jbmc/unit/util/has_subtype.cpp
@@ -80,7 +80,7 @@ SCENARIO("has_subtype", "[core][utils][has_subtype]")
     THEN("has_subtype terminates")
     {
       REQUIRE_FALSE(
-        has_subtype(struct_type, [&](const typet &t) { return false; }, ns));
+        has_subtype(struct_type, [&](const typet &) { return false; }, ns));
     }
     THEN("symbol type is a subtype")
     {
diff --git a/src/analyses/ai_domain.h b/src/analyses/ai_domain.h
@@ -63,7 +63,7 @@ class ai_domain_baset
     const namespacet &ns) = 0;
 
   virtual void
-  output(std::ostream &out, const ai_baset &ai, const namespacet &ns) const
+  output(std::ostream &, const ai_baset &, const namespacet &) const
   {
   }
 
@@ -102,7 +102,7 @@ class ai_domain_baset
   /// simplification
 
   /// return true if unchanged
-  virtual bool ai_simplify(exprt &condition, const namespacet &ns) const
+  virtual bool ai_simplify(exprt &condition, const namespacet &) const
   {
     (void)condition; // unused parameter
     return true;
diff --git a/src/analyses/escape_analysis.cpp b/src/analyses/escape_analysis.cpp
@@ -166,9 +166,9 @@ void escape_domaint::get_rhs_aliases_address_of(
 }
 
 void escape_domaint::transform(
-  const irep_idt &function_from,
+  const irep_idt &,
   locationt from,
-  const irep_idt &function_to,
+  const irep_idt &,
   locationt,
   ai_baset &,
   const namespacet &)
diff --git a/src/analyses/global_may_alias.cpp b/src/analyses/global_may_alias.cpp
@@ -91,9 +91,9 @@ void global_may_alias_domaint::get_rhs_aliases_address_of(
 }
 
 void global_may_alias_domaint::transform(
-  const irep_idt &function_from,
+  const irep_idt &,
   locationt from,
-  const irep_idt &function_to,
+  const irep_idt &,
   locationt,
   ai_baset &,
   const namespacet &)
diff --git a/src/analyses/interval_domain.cpp b/src/analyses/interval_domain.cpp
@@ -57,9 +57,9 @@ void interval_domaint::output(
 }
 
 void interval_domaint::transform(
-  const irep_idt &function_from,
+  const irep_idt &,
   locationt from,
-  const irep_idt &function_to,
+  const irep_idt &,
   locationt to,
   ai_baset &,
   const namespacet &ns)
diff --git a/src/analyses/invariant_set_domain.cpp b/src/analyses/invariant_set_domain.cpp
@@ -14,9 +14,9 @@ Author: Daniel Kroening, kroening@kroening.com
 #include <util/simplify_expr.h>
 
 void invariant_set_domaint::transform(
-  const irep_idt &function_from,
+  const irep_idt &,
   locationt from_l,
-  const irep_idt &function_to,
+  const irep_idt &,
   locationt to_l,
   ai_baset &,
   const namespacet &ns)
diff --git a/src/analyses/uninitialized_domain.cpp b/src/analyses/uninitialized_domain.cpp
@@ -19,9 +19,9 @@ Date: January 2010
 #include <list>
 
 void uninitialized_domaint::transform(
-  const irep_idt &function_from,
+  const irep_idt &,
   locationt from,
-  const irep_idt &function_to,
+  const irep_idt &,
   locationt,
   ai_baset &,
   const namespacet &ns)
diff --git a/src/pointer-analysis/value_set_domain_transform.inc b/src/pointer-analysis/value_set_domain_transform.inc
@@ -16,7 +16,7 @@ Author: Daniel Kroening, kroening@kroening.com
 template<class VST>
 void value_set_domain_templatet<VST>::transform(
   const namespacet &ns,
-  const irep_idt &function_from,
+  const irep_idt &,
   locationt from_l,
   const irep_idt &function_to,
   locationt to_l)
diff --git a/src/solvers/sat/satcheck_minisat2.cpp b/src/solvers/sat/satcheck_minisat2.cpp
@@ -156,6 +156,7 @@ static Minisat::Solver *solver_to_interrupt=nullptr;
 
 static void interrupt_solver(int signum)
 {
+  (void)signum; // unused parameter -- just removing the name trips up cpplint
   solver_to_interrupt->interrupt();
 }
 
diff --git a/src/util/expr.h b/src/util/expr.h
@@ -246,9 +246,7 @@ class exprt:public irept
   ///
   /// The validation mode indicates whether well-formedness check failures are
   /// reported via DATA_INVARIANT violations or exceptions.
-  static void check(
-    const exprt &expr,
-    const validation_modet vm = validation_modet::INVARIANT)
+  static void check(const exprt &, const validation_modet)
   {
   }
 
@@ -262,7 +260,7 @@ class exprt:public irept
   /// reported via DATA_INVARIANT violations or exceptions.
   static void validate(
     const exprt &expr,
-    const namespacet &ns,
+    const namespacet &,
     const validation_modet vm = validation_modet::INVARIANT)
   {
     check_expr(expr, vm);
diff --git a/src/util/graph.h b/src/util/graph.h
@@ -78,7 +78,7 @@ class graph_nodet
   ///        << "\"]";
   ///     return ss.str();
   ///
-  virtual std::string dot_attributes(const node_indext &idx) const
+  virtual std::string dot_attributes(const node_indext &) const
   {
     return "";
   }
diff --git a/src/util/small_shared_ptr.h b/src/util/small_shared_ptr.h
@@ -185,17 +185,17 @@ class small_shared_pointeet
   small_shared_pointeet() = default;
 
   // These can't be `= default` because we need the use_count_ to be unaffected
-  small_shared_pointeet(const small_shared_pointeet &rhs)
+  small_shared_pointeet(const small_shared_pointeet &)
   {
   }
-  small_shared_pointeet &operator=(const small_shared_pointeet &rhs)
+  small_shared_pointeet &operator=(const small_shared_pointeet &)
   {
     return *this;
   }
-  small_shared_pointeet(small_shared_pointeet &&rhs)
+  small_shared_pointeet(small_shared_pointeet &&)
   {
   }
-  small_shared_pointeet &operator=(small_shared_pointeet &&rhs)
+  small_shared_pointeet &operator=(small_shared_pointeet &&)
   {
     return *this;
   }
diff --git a/src/util/small_shared_two_way_ptr.h b/src/util/small_shared_two_way_ptr.h
@@ -225,13 +225,13 @@ class small_shared_two_way_pointeet
   small_shared_two_way_pointeet() = default;
 
   // The use count shall be unaffected
-  small_shared_two_way_pointeet(const small_shared_two_way_pointeet &rhs)
+  small_shared_two_way_pointeet(const small_shared_two_way_pointeet &)
   {
   }
 
   // The use count shall be unaffected
   small_shared_two_way_pointeet &
-  operator=(const small_shared_two_way_pointeet &rhs)
+  operator=(const small_shared_two_way_pointeet &)
   {
     return *this;
   }
diff --git a/src/util/std_code.h b/src/util/std_code.h
@@ -72,9 +72,7 @@ class codet:public exprt
   ///
   /// The validation mode indicates whether well-formedness check failures are
   /// reported via DATA_INVARIANT violations or exceptions.
-  static void check(
-    const codet &code,
-    const validation_modet vm = validation_modet::INVARIANT)
+  static void check(const codet &, const validation_modet)
   {
   }
 
@@ -89,7 +87,7 @@ class codet:public exprt
   /// reported via DATA_INVARIANT violations or exceptions.
   static void validate(
     const codet &code,
-    const namespacet &ns,
+    const namespacet &,
     const validation_modet vm = validation_modet::INVARIANT)
   {
     check_code(code, vm);
@@ -105,7 +103,7 @@ class codet:public exprt
   /// reported via DATA_INVARIANT violations or exceptions.
   static void validate_full(
     const codet &code,
-    const namespacet &ns,
+    const namespacet &,
     const validation_modet vm = validation_modet::INVARIANT)
   {
     check_code(code, vm);
diff --git a/src/util/std_expr.h b/src/util/std_expr.h
@@ -782,7 +782,7 @@ class binary_exprt:public exprt
 
   static void validate(
     const exprt &expr,
-    const namespacet &ns,
+    const namespacet &,
     const validation_modet vm = validation_modet::INVARIANT)
   {
     check(expr, vm);
diff --git a/src/util/type.h b/src/util/type.h
@@ -87,9 +87,7 @@ class typet:public irept
   ///
   /// The validation mode indicates whether well-formedness check failures are
   /// reported via DATA_INVARIANT violations or exceptions.
-  static void check(
-    const typet &type,
-    const validation_modet vm = validation_modet::INVARIANT)
+  static void check(const typet &, const validation_modet)
   {
   }
 
@@ -103,7 +101,7 @@ class typet:public irept
   /// reported via DATA_INVARIANT violations or exceptions.
   static void validate(
     const typet &type,
-    const namespacet &ns,
+    const namespacet &,
     const validation_modet vm = validation_modet::INVARIANT)
   {
     check_type(type, vm);
diff --git a/unit/analyses/ai/ai.cpp b/unit/analyses/ai/ai.cpp
@@ -70,7 +70,7 @@ class instruction_counter_domaint : public ai_domain_baset
     return true;
   }
 
-  bool merge(const instruction_counter_domaint &b, locationt from, locationt to)
+  bool merge(const instruction_counter_domaint &b, locationt, locationt)
   {
     if(b.is_bottom())
       return false;
diff --git a/unit/path_strategies.cpp b/unit/path_strategies.cpp
@@ -64,7 +64,7 @@ SCENARIO("path strategies")
   std::string c;
   GIVEN("a simple conditional program")
   {
-    std::function<void(optionst &)> opts_callback = [](optionst &opts) {};
+    std::function<void(optionst &)> opts_callback = [](optionst &) {};
 
     c =
       "/*  1 */  int main()      \n"
@@ -94,7 +94,7 @@ SCENARIO("path strategies")
 
   GIVEN("a program with nested conditionals")
   {
-    std::function<void(optionst &)> opts_callback = [](optionst &opts) {};
+    std::function<void(optionst &)> opts_callback = [](optionst &) {};
 
     c =
       "/*  1 */  int main()            \n"
@@ -229,7 +229,7 @@ SCENARIO("path strategies")
     std::function<void(optionst &)> halt_callback = [](optionst &opts) {
       opts.set_option("stop-on-fail", true);
     };
-    std::function<void(optionst &)> no_halt_callback = [](optionst &opts) {};
+    std::function<void(optionst &)> no_halt_callback = [](optionst &) {};
 
     c =
       "/*  1 */  int main()      \n"
diff --git a/unit/solvers/miniBDD/miniBDD.cpp b/unit/solvers/miniBDD/miniBDD.cpp
@@ -61,7 +61,7 @@ class bdd_propt:public propt
     return to_literal(to_bdd(a) & to_bdd(b));
   }
 
-  literalt lor(literalt a, literalt b) override
+  literalt lor(literalt, literalt) override
   {
     UNREACHABLE;
     return {};
@@ -92,19 +92,19 @@ class bdd_propt:public propt
     return to_literal(to_bdd(a) ^ to_bdd(b));
   }
 
-  literalt lxor(const bvt &bv) override
+  literalt lxor(const bvt &) override
   {
     UNREACHABLE;
     return {};
   }
 
-  literalt lnand(literalt a, literalt b) override
+  literalt lnand(literalt, literalt) override
   {
     UNREACHABLE;
     return {};
   }
 
-  literalt lnor(literalt a, literalt b) override
+  literalt lnor(literalt, literalt) override
   {
     UNREACHABLE;
     return {};
@@ -115,19 +115,19 @@ class bdd_propt:public propt
     return to_literal(to_bdd(a)==to_bdd(b));
   }
 
-  literalt limplies(literalt a, literalt b) override
+  literalt limplies(literalt, literalt) override
   {
     UNREACHABLE;
     return {};
   }
 
-  literalt lselect(literalt a, literalt b, literalt c) override
+  literalt lselect(literalt, literalt, literalt) override
   {
     UNREACHABLE;
     return {};
   }
 
-  void lcnf(const bvt &bv) override
+  void lcnf(const bvt &) override
   {
     UNREACHABLE;
   }
@@ -153,7 +153,7 @@ class bdd_propt:public propt
     return {};
   }
 
-  tvt l_get(literalt a) const override
+  tvt l_get(literalt) const override
   {
     UNREACHABLE;
     return {};

Original file line number	Diff line number	Diff line change
`@@ -211,7 +211,7 @@ select_pointer_typet::get_recursively_instantiated_type(`
`211`	`211`	`std::set<symbol_typet> select_pointer_typet::get_parameter_alternative_types(`
`212`	`212`	`const irep_idt &function_name,`
`213`	`213`	`const irep_idt &parameter_name,`
`214`		`- const namespacet &ns) const`
	`214`	`+ const namespacet &) const`
`215`	`215`	`{`
`216`	`216`	`// unused parameters`
`217`	`217`	`(void)function_name;`
Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,7 @@ SCENARIO("has_subtype", "[core][utils][has_subtype]")`
`80`	`80`	`THEN("has_subtype terminates")`
`81`	`81`	`{`
`82`	`82`	`REQUIRE_FALSE(`
`83`		`- has_subtype(struct_type, [&](const typet &t) { return false; }, ns));`
	`83`	`+ has_subtype(struct_type, [&](const typet &) { return false; }, ns));`
`84`	`84`	`}`
`85`	`85`	`THEN("symbol type is a subtype")`
`86`	`86`	`{`
Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ class ai_domain_baset`
`63`	`63`	`const namespacet &ns) = 0;`
`64`	`64`
`65`	`65`	`virtual void`
`66`		`- output(std::ostream &out, const ai_baset &ai, const namespacet &ns) const`
	`66`	`+ output(std::ostream &, const ai_baset &, const namespacet &) const`
`67`	`67`	`{`
`68`	`68`	`}`
`69`	`69`
`@@ -102,7 +102,7 @@ class ai_domain_baset`
`102`	`102`	`/// simplification`
`103`	`103`
`104`	`104`	`/// return true if unchanged`
`105`		`- virtual bool ai_simplify(exprt &condition, const namespacet &ns) const`
	`105`	`+ virtual bool ai_simplify(exprt &condition, const namespacet &) const`
`106`	`106`	`{`
`107`	`107`	`(void)condition; // unused parameter`
`108`	`108`	`return true;`