fix build
parent
41eb8b211f
commit
efe4ee523a
|
@ -588,19 +588,19 @@ namespace util {
|
||||||
for (; !str.empty(); str.pop_front()) {
|
for (; !str.empty(); str.pop_front()) {
|
||||||
switch (str.front()) {
|
switch (str.front()) {
|
||||||
case '\n':
|
case '\n':
|
||||||
ret += writer.put_n("^n", 2);
|
ret += ostd::range_put_n(writer, "^n", 2);
|
||||||
break;
|
break;
|
||||||
case '\t':
|
case '\t':
|
||||||
ret += writer.put_n("^t", 2);
|
ret += ostd::range_put_n(writer, "^t", 2);
|
||||||
break;
|
break;
|
||||||
case '\f':
|
case '\f':
|
||||||
ret += writer.put_n("^f", 2);
|
ret += ostd::range_put_n(writer, "^f", 2);
|
||||||
break;
|
break;
|
||||||
case '"':
|
case '"':
|
||||||
ret += writer.put_n("^\"", 2);
|
ret += ostd::range_put_n(writer, "^\"", 2);
|
||||||
break;
|
break;
|
||||||
case '^':
|
case '^':
|
||||||
ret += writer.put_n("^^", 2);
|
ret += ostd::range_put_n(writer, "^^", 2);
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
ret += writer.put(str.front());
|
ret += writer.put(str.front());
|
||||||
|
@ -690,7 +690,7 @@ namespace util {
|
||||||
if (!p_quote.empty() && (*p_quote == '"')) {
|
if (!p_quote.empty() && (*p_quote == '"')) {
|
||||||
return unescape_string(std::forward<R>(writer), p_item);
|
return unescape_string(std::forward<R>(writer), p_item);
|
||||||
} else {
|
} else {
|
||||||
return writer.put_n(p_item.data(), p_item.size());
|
return ostd::range_put_n(writer, p_item.data(), p_item.size());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -771,7 +771,7 @@ private:
|
||||||
case cs_value_type::Cstring:
|
case cs_value_type::Cstring:
|
||||||
case cs_value_type::Macro: {
|
case cs_value_type::Macro: {
|
||||||
auto sv = vals[i].get_strr();
|
auto sv = vals[i].get_strr();
|
||||||
ret += writer.put_n(sv.data(), sv.size());
|
ret += ostd::range_put_n(writer, sv.data(), sv.size());
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
default:
|
default:
|
||||||
|
@ -780,7 +780,7 @@ private:
|
||||||
if (i == (vals.size() - 1)) {
|
if (i == (vals.size() - 1)) {
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
ret += writer.put_n(sep.data(), sep.size());
|
ret += ostd::range_put_n(writer, sep.data(), sep.size());
|
||||||
}
|
}
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
|
@ -431,7 +431,9 @@ end:
|
||||||
(p.get_raw_item(true).front() == '"')) {
|
(p.get_raw_item(true).front() == '"')) {
|
||||||
util::unescape_string(buf, p.get_raw_item());
|
util::unescape_string(buf, p.get_raw_item());
|
||||||
} else {
|
} else {
|
||||||
buf.put_n(p.get_raw_item().data(), p.get_raw_item().size());
|
ostd::range_put_n(
|
||||||
|
buf, p.get_raw_item().data(), p.get_raw_item().size()
|
||||||
|
);
|
||||||
}
|
}
|
||||||
if ((n + 1) < len) {
|
if ((n + 1) < len) {
|
||||||
if ((len > 2) || conj.empty()) {
|
if ((len > 2) || conj.empty()) {
|
||||||
|
@ -439,7 +441,7 @@ end:
|
||||||
}
|
}
|
||||||
if ((n + 2 == len) && !conj.empty()) {
|
if ((n + 2 == len) && !conj.empty()) {
|
||||||
buf.put(' ');
|
buf.put(' ');
|
||||||
buf.put_n(conj.data(), conj.size());
|
ostd::range_put_n(buf, conj.data(), conj.size());
|
||||||
}
|
}
|
||||||
buf.put(' ');
|
buf.put(' ');
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue