Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 29 additions & 0 deletions src/strbuf.h
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

#include <string.h>
#include <stdio.h>
#include <inttypes.h>

#define STRBUF_DEFAULT_CAP 256

Expand Down Expand Up @@ -72,6 +73,34 @@ void StringBuf_append_MINUS_double(StringBuf* sb, double n) {
sb->len += slen;
}

void StringBuf_append_MINUS_long(StringBuf* sb, Long n) {
char tmp[24];
int slen = snprintf(tmp, sizeof(tmp), "%" PRId64, n);
strbuf_grow(sb, slen);
memcpy(sb->data + sb->len, tmp, slen);
sb->len += slen;
}

void StringBuf_append_MINUS_float(StringBuf* sb, float n) {
char tmp[64];
int slen = snprintf(tmp, sizeof(tmp), "%g", (double)n);
strbuf_grow(sb, slen);
memcpy(sb->data + sb->len, tmp, slen);
sb->len += slen;
}

void StringBuf_append_MINUS_bool(StringBuf* sb, bool b) {
if (b) {
strbuf_grow(sb, 4);
memcpy(sb->data + sb->len, "true", 4);
sb->len += 4;
} else {
strbuf_grow(sb, 5);
memcpy(sb->data + sb->len, "false", 5);
sb->len += 5;
}
}

void StringBuf_append_MINUS_crlf(StringBuf* sb) {
strbuf_grow(sb, 2);
sb->data[sb->len++] = '\r';
Expand Down
10 changes: 10 additions & 0 deletions strbuf.carp
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,16 @@ amortized O(1) appends.
(doc append-double "appends a double as its string representation.")
(register append-double (Fn [&StringBuf Double] ()))

(doc append-long "appends a long as its decimal string representation.")
(register append-long (Fn [&StringBuf Long] ()))

(doc append-float "appends a float as its string representation.")
(register append-float (Fn [&StringBuf Float] ()))

(doc append-bool
"appends a bool as \\342\\200\\234true\\342\\200\\235 or \\342\\200\\234false\\342\\200\\235.")
(register append-bool (Fn [&StringBuf Bool] ()))

(doc append-crlf "appends \\r\\n (HTTP line ending).")
(register append-crlf (Fn [&StringBuf] ()))

Expand Down
26 changes: 26 additions & 0 deletions test/strbuf.carp
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,32 @@
(let-do [s (StringBuf.to-string &sb)] (StringBuf.delete sb) s))
"append-double")

(assert-equal test
"n=42"
&(let-do [sb (StringBuf.create)]
(StringBuf.append-str &sb "n=")
(StringBuf.append-long &sb 42l)
(let-do [s (StringBuf.to-string &sb)] (StringBuf.delete sb) s))
"append-long")

(assert-equal test
"x=1.5"
&(let-do [sb (StringBuf.create)]
(StringBuf.append-str &sb "x=")
(StringBuf.append-float &sb 1.5f)
(let-do [s (StringBuf.to-string &sb)] (StringBuf.delete sb) s))
"append-float")

(assert-equal test
"yes=true no=false"
&(let-do [sb (StringBuf.create)]
(StringBuf.append-str &sb "yes=")
(StringBuf.append-bool &sb true)
(StringBuf.append-str &sb " no=")
(StringBuf.append-bool &sb false)
(let-do [s (StringBuf.to-string &sb)] (StringBuf.delete sb) s))
"append-bool")

(assert-equal test
"abc"
&(let-do [sb (StringBuf.create)
Expand Down