move code_declt to goto_instruction_code.h

After introducing code_frontend_declt, code_declt is now used exclusively by
goto instructions, and thus belongs into goto_instruction_code.h.

Author: kroening

jbmc/src/java_bytecode/create_array_with_type_intrinsic.cpp

@@ -75,7 +75,7 @@ codet create_array_with_type_body(
   code_blockt code_block;
 
   // Declare new_array temporary:
-  code_block.add(code_declt(new_array_symbol_expr));
+  code_block.add(code_frontend_declt(new_array_symbol_expr));
 
   // new_array = new Object[length];
   side_effect_exprt new_array_expr{

src/util/goto_instruction_code.h

@@ -189,6 +189,71 @@ inline code_deadt &to_code_dead(codet &code)
   return static_cast<code_deadt &>(code);
 }
 
+/// A `codet` representing the declaration of a local variable.
+/// For example, if a variable (symbol) `x` is represented as a
+/// \ref symbol_exprt `sym`, then the declaration of this variable can be
+/// represented as `code_declt(sym)`.
+class code_declt : public codet
+{
+public:
+  explicit code_declt(symbol_exprt symbol) : codet(ID_decl, {std::move(symbol)})
+  {
+  }
+
+  symbol_exprt &symbol()
+  {
+    return static_cast<symbol_exprt &>(op0());
+  }
+
+  const symbol_exprt &symbol() const
+  {
+    return static_cast<const symbol_exprt &>(op0());
+  }
+
+  const irep_idt &get_identifier() const
+  {
+    return symbol().get_identifier();
+  }
+
+  static void check(
+    const codet &code,
+    const validation_modet vm = validation_modet::INVARIANT)
+  {
+    DATA_CHECK(
+      vm, code.operands().size() == 1, "declaration must have one operand");
+    DATA_CHECK(
+      vm,
+      code.op0().id() == ID_symbol,
+      "declaring a non-symbol: " +
+        id2string(to_symbol_expr(code.op0()).get_identifier()));
+  }
+};
+
+template <>
+inline bool can_cast_expr<code_declt>(const exprt &base)
+{
+  return detail::can_cast_code_impl(base, ID_decl);
+}
+
+inline void validate_expr(const code_declt &x)
+{
+  code_declt::check(x);
+}
+
+inline const code_declt &to_code_decl(const codet &code)
+{
+  PRECONDITION(code.get_statement() == ID_decl);
+  code_declt::check(code);
+  return static_cast<const code_declt &>(code);
+}
+
+inline code_declt &to_code_decl(codet &code)
+{
+  PRECONDITION(code.get_statement() == ID_decl);
+  code_declt::check(code);
+  return static_cast<code_declt &>(code);
+}
+
 /// \ref codet representation of a function call statement.
 /// The function call statement has three operands.
 /// The first is the expression that is used to store the return value.

src/util/std_code.h

@@ -352,71 +352,6 @@ template<> inline bool can_cast_expr<code_skipt>(const exprt &base)
 
 // there is no to_code_skip, so no validate_expr is provided for code_skipt
 
-/// A `codet` representing the declaration of a local variable.
-/// For example, if a variable (symbol) `x` is represented as a
-/// \ref symbol_exprt `sym`, then the declaration of this variable can be
-/// represented as `code_declt(sym)`.
-class code_declt:public codet
-{
-public:
-  explicit code_declt(symbol_exprt symbol) : codet(ID_decl, {std::move(symbol)})
-  {
-  }
-
-  symbol_exprt &symbol()
-  {
-    return static_cast<symbol_exprt &>(op0());
-  }
-
-  const symbol_exprt &symbol() const
-  {
-    return static_cast<const symbol_exprt &>(op0());
-  }
-
-  const irep_idt &get_identifier() const
-  {
-    return symbol().get_identifier();
-  }
-
-  static void check(
-    const codet &code,
-    const validation_modet vm = validation_modet::INVARIANT)
-  {
-    DATA_CHECK(
-      vm, code.operands().size() == 1, "declaration must have one operand");
-    DATA_CHECK(
-      vm,
-      code.op0().id() == ID_symbol,
-      "declaring a non-symbol: " +
-        id2string(to_symbol_expr(code.op0()).get_identifier()));
-  }
-};
-
-template <>
-inline bool can_cast_expr<code_declt>(const exprt &base)
-{
-  return detail::can_cast_code_impl(base, ID_decl);
-}
-
-inline void validate_expr(const code_declt &x)
-{
-  code_declt::check(x);
-}
-
-inline const code_declt &to_code_decl(const codet &code)
-{
-  PRECONDITION(code.get_statement() == ID_decl);
-  code_declt::check(code);
-  return static_cast<const code_declt &>(code);
-}
-
-inline code_declt &to_code_decl(codet &code)
-{
-  PRECONDITION(code.get_statement() == ID_decl);
-  code_declt::check(code);
-  return static_cast<code_declt &>(code);
-}
-
 /// A `codet` representing the declaration of a local variable.
 /// For example, if a variable (symbol) `x` is represented as a
 /// \ref symbol_exprt `sym`, then the declaration of this variable can be