navigine/jq
1
0 Fork 0
mirror of https://github.com/jqlang/jq.git synced 2026-10-30 10:06:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Split on empty sep: fix #552 moar

Browse Source
This commit is contained in:
Nicolas Williams committed 2015-01-14 01:32:11 -06:00
1 parent d630597e87
commit 8b5ff40402
2 files changed
+18 -8
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

jv.c
+14 -8
View File
@@ -656,14 +656,20 @@ jv jv_string_split(jv j, jv sep) {
assert(jv_get_refcnt(a) == 1);
for (p = jstr; p < jend; p = s + seplen) {
s = _jq_memmem(p, jend - p, sepstr, seplen);
if (s == NULL)
s = jend;
a = jv_array_append(a, jv_string_sized(p, s - p));
// Add an empty string to denote that j ends on a sep
if (s + seplen == jend)
a = jv_array_append(a, jv_string(""));
if (seplen == 0) {
int c;
while ((jstr = jvp_utf8_next(jstr, jend, &c)))
a = jv_array_append(a, jv_string_append_codepoint(jv_string(""), c));
} else {
for (p = jstr; p < jend; p = s + seplen) {
s = _jq_memmem(p, jend - p, sepstr, seplen);
if (s == NULL)
s = jend;
a = jv_array_append(a, jv_string_sized(p, s - p));
// Add an empty string to denote that j ends on a sep
if (s + seplen == jend && seplen != 0)
a = jv_array_append(a, jv_string(""));
}
}
jv_free(j);
jv_free(sep);