Rewrites for all remaining return statements in strings rewriter (#4178)

Towards proofs for string rewrites. All return statements all now associated with an enum value.

An indentation in a block of code changed in rewriteMembership.

1 files changed, 9 insertions, 6 deletions

diff --git a/src/util/regexp.cpp b/src/util/regexp.cpp
index ca6547134..7051b251f 100644
--- a/src/util/regexp.cpp
+++ b/src/util/regexp.cpp
@@ -18,21 +18,25 @@
 
 namespace CVC4 {
 
-RegExpRepeat::RegExpRepeat(uint32_t repeatAmount) : d_repeatAmount(repeatAmount) {}
+RegExpRepeat::RegExpRepeat(uint32_t repeatAmount) : d_repeatAmount(repeatAmount)
+{
+}
 
 bool RegExpRepeat::operator==(const RegExpRepeat& r) const
 {
   return d_repeatAmount == r.d_repeatAmount;
 }
 
-RegExpLoop::RegExpLoop(uint32_t l, uint32_t h) : d_loopMinOcc(l), d_loopMaxOcc(h) {}
+RegExpLoop::RegExpLoop(uint32_t l, uint32_t h)
+    : d_loopMinOcc(l), d_loopMaxOcc(h)
+{
+}
 
 bool RegExpLoop::operator==(const RegExpLoop& r) const
 {
-  return d_loopMinOcc == r.d_loopMinOcc
-          && d_loopMaxOcc == r.d_loopMaxOcc;
+  return d_loopMinOcc == r.d_loopMinOcc && d_loopMaxOcc == r.d_loopMaxOcc;
 }
-  
+
 size_t RegExpRepeatHashFunction::operator()(const RegExpRepeat& r) const
 {
   return r.d_repeatAmount;
@@ -54,4 +58,3 @@ std::ostream& operator<<(std::ostream& os, const RegExpLoop& r)
 }
 
 }  // namespace CVC4
-