Adopt regex_replace tags to new Liquid BlockBody class

app/concerns/liquid_interpolatable.rb

@@ -386,21 +386,27 @@ def initialize(tag_name, markup, tokens)
         else
           raise Liquid::SyntaxError, 'Syntax Error in regex_replace tag - Valid syntax: regex_replace pattern in'
         end
-        @nodelist = @in_block = []
-        @with_block = nil
+        @in_block = Liquid::BlockBody.new
       end
 
+      def parse(tokens)
+        if more = parse_body(@in_block, tokens)
+          @with_block = Liquid::BlockBody.new
+          parse_body(@with_block, tokens)
+       end
+     end
+
       def nodelist
         if @with_block
-          @in_block + @with_block
+          [@in_block, @with_block]
         else
-          @in_block
+          [@in_block]
         end
       end
 
       def unknown_tag(tag, markup, tokens)
         return super unless tag == 'with'.freeze
-        @nodelist = @with_block = []
+        @with_block = Liquid::BlockBody.new
       end
 
       def render(context)
@@ -410,7 +416,7 @@ def render(context)
           raise Liquid::SyntaxError, "Syntax Error in regex_replace tag - #{e.message}"
         end
 
-        subject = render_all(@in_block, context)
+        subject = @in_block.render(context)
 
         subject.send(first? ? :sub : :gsub, regexp) {
           next '' unless @with_block
@@ -420,7 +426,7 @@ def render(context)
               context[name] = m[name]
             end
             context['match'.freeze] = m
-            render_all(@with_block, context)
+            @with_block.render(context)
           end
         }
       end