From 514cabd7c8cc6b8fcc7ae627cf2b2d94a56607c4 Mon Sep 17 00:00:00 2001
From: Delyan Angelov <delian66@gmail.com>
Date: Sun, 21 Feb 2021 13:32:18 +0200
Subject: [PATCH] strings: cleanup strings builder, allow reusing it

---
 vlib/strings/builder.v      | 9 +--------
 vlib/strings/builder_test.v | 8 ++++++++
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/vlib/strings/builder.v b/vlib/strings/builder.v
index dbf0313c61..191cc3729a 100644
--- a/vlib/strings/builder.v
+++ b/vlib/strings/builder.v
@@ -10,7 +10,6 @@ module strings
 pub struct Builder {
 pub mut:
 	buf          []byte
-	str_calls    int
 	len          int
 	initial_size int = 1
 }
@@ -20,7 +19,6 @@ pub fn new_builder(initial_size int) Builder {
 	return Builder{
 		// buf: make(0, initial_size)
 		buf: []byte{cap: initial_size}
-		str_calls: 0
 		len: 0
 		initial_size: initial_size
 	}
@@ -126,13 +124,10 @@ pub fn (b &Builder) after(n int) string {
 // accumulated data that was in the string builder, before the
 // .str() call.
 pub fn (mut b Builder) str() string {
-	b.str_calls++
-	if b.str_calls > 1 {
-		panic('builder.str() should be called just once.\nIf you want to reuse a builder, call b.free() first.')
-	}
 	b.buf << `\0`
 	s := unsafe { byteptr(memdup(b.buf.data, b.len)).vstring_with_len(b.len) }
 	b.len = 0
+	b.buf.trim(0)
 	return s
 }
 
@@ -140,7 +135,5 @@ pub fn (mut b Builder) str() string {
 [unsafe]
 pub fn (mut b Builder) free() {
 	unsafe { free(b.buf.data) }
-	// b.buf = []byte{cap: b.initial_size}
 	b.len = 0
-	b.str_calls = 0
 }
diff --git a/vlib/strings/builder_test.v b/vlib/strings/builder_test.v
index dd0772b1ae..eef17f3f68 100644
--- a/vlib/strings/builder_test.v
+++ b/vlib/strings/builder_test.v
@@ -75,3 +75,11 @@ fn test_byte_write() {
 	sb_final := sb.str()
 	assert sb_final == temp_str
 }
+
+fn test_strings_builder_reuse() {
+	mut sb := strings.new_builder(256)
+	sb.write('world')
+	assert sb.str() == 'world'
+	sb.write('hello')
+	assert sb.str() == 'hello'
+}