move escape(s) to string_utils

Author: Daniel Kroening

src/util/format_expr.cpp

@@ -18,13 +18,13 @@ Author: Daniel Kroening, kroening@kroening.com
 #include "format_type.h"
 #include "ieee_float.h"
 #include "invariant.h"
-#include "lispexpr.h"
 #include "mp_arith.h"
 #include "rational.h"
 #include "rational_tools.h"
 #include "std_code.h"
 #include "std_expr.h"
 #include "string2int.h"
+#include "string_utils.h"
 
 #include <ostream>
 #include <stack>

src/util/lispexpr.cpp

@@ -8,6 +8,8 @@ Author: Daniel Kroening, kroening@kroening.com
 
 #include "lispexpr.h"
 
+#include "string_utils.h"
+
 #include <iostream>
 
 std::string lispexprt::expr2string() const
@@ -147,21 +149,6 @@ bool lispexprt::parse(
   return false;
 }
 
-std::string escape(const std::string &s)
-{
-  std::string result;
-
-  for(std::size_t i=0; i<s.size(); i++)
-  {
-    if(s[i]=='\\' || s[i]=='"')
-      result+='\\';
-
-    result+=s[i];
-  }
-
-  return result;
-}
-
 int test_lispexpr()
 {
   std::string line;

src/util/lispexpr.h

@@ -99,8 +99,6 @@ inline std::ostream &operator<<(
   return out << expr.expr2string();
 }
 
-std::string escape(const std::string &s);
-
 int test_lispexpr();
 
 #endif // CPROVER_UTIL_LISPEXPR_H

src/util/string_utils.cpp

@@ -133,3 +133,18 @@ std::string trim_from_last_delimiter(
     result=s.substr(0, index);
   return result;
 }
+
+std::string escape(const std::string &s)
+{
+  std::string result;
+
+  for(std::size_t i=0; i<s.size(); i++)
+  {
+    if(s[i]=='\\' || s[i]=='"')
+      result+='\\';
+
+    result+=s[i];
+  }
+
+  return result;
+}

src/util/string_utils.h

@@ -63,4 +63,8 @@ Stream &join_strings(
   return os;
 }
 
+/// Generic escaping of strings; this is not meant to be a particular
+/// programming language.
+std::string escape(const std::string &);
+
 #endif