Make try_get_string_data_array() non-static

This is so the function can be called outside of simplify_expr.cpp.

Author: danpoe

src/util/simplify_expr.cpp

@@ -64,11 +64,6 @@ struct simplify_expr_cachet
 simplify_expr_cachet simplify_expr_cache;
 #endif
 
-static optionalt<std::reference_wrapper<const array_exprt>>
-try_get_string_data_array(
-  const refined_string_exprt &s,
-  const namespacet &ns);
-
 simplify_exprt::resultt<> simplify_exprt::simplify_abs(const abs_exprt &expr)
 {
   if(expr.op().is_constant())
@@ -1670,22 +1665,8 @@ optionalt<std::string> simplify_exprt::expr2bits(
   return {};
 }
 
-/// Get char sequence from refined string expression
-///
-/// If `s.content()` is of the form `&id[e]`, where `id` is an array-typed
-/// symbol expression (and `e` is any expression), return the value of the
-/// symbol `id` (as given by the `value` field of the symbol in the namespace
-/// `ns`); otherwise return an empty optional.
-///
-/// \param s: refined string expression
-/// \param ns: namespace
-/// \return array expression representing the char sequence which forms the
-///   content of the refined string expression, empty optional if the content
-///   cannot be determined
-static optionalt<std::reference_wrapper<const array_exprt>>
-  try_get_string_data_array(
-    const refined_string_exprt &s,
-    const namespacet &ns)
+optionalt<std::reference_wrapper<const array_exprt>>
+try_get_string_data_array(const refined_string_exprt &s, const namespacet &ns)
 {
   if(s.content().id() != ID_address_of)
   {

src/util/simplify_expr.h

@@ -10,8 +10,12 @@ Author: Daniel Kroening, [email protected]
 #ifndef CPROVER_UTIL_SIMPLIFY_EXPR_H
 #define CPROVER_UTIL_SIMPLIFY_EXPR_H
 
+class array_exprt;
 class exprt;
 class namespacet;
+class refined_string_exprt;
+
+#include <util/optional.h>
 
 //
 // simplify an expression
@@ -27,4 +31,19 @@ bool simplify(
 // this is the preferred interface
 exprt simplify_expr(exprt src, const namespacet &ns);
 
+/// Get char sequence from refined string expression
+///
+/// If `s.content()` is of the form `&id[e]`, where `id` is an array-typed
+/// symbol expression (and `e` is any expression), return the value of the
+/// symbol `id` (as given by the `value` field of the symbol in the namespace
+/// `ns`); otherwise return an empty optional.
+///
+/// \param s: refined string expression
+/// \param ns: namespace
+/// \return array expression representing the char sequence which forms the
+///   content of the refined string expression, empty optional if the content
+///   cannot be determined
+optionalt<std::reference_wrapper<const array_exprt>>
+try_get_string_data_array(const refined_string_exprt &s, const namespacet &ns);
+
 #endif // CPROVER_UTIL_SIMPLIFY_EXPR_H