OctaForge
/
libcubescript
1
0
Fork 1
Code Issues 1 Pull Requests Releases Wiki Activity

simplify code

master
Daniel Kolesa 2015-08-13 23:26:04 +01:00
parent a8ca0b376f
commit f3a881cccd
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
cubescript.cc
View File

@ -170,7 +170,7 @@ ostd::ConstCharRange cs_debug_line(CsState &cs,
for (;;) { for (;;) {
ostd::ConstCharRange end = ostd::find(line, '\n'); ostd::ConstCharRange end = ostd::find(line, '\n');
if (!end.empty()) if (!end.empty())
line = line.slice(0, line.distance_front(end)); line = ostd::slice_until(line, end);
if (&p[0] >= &line[0] && &p[0] <= &line[line.size()]) { if (&p[0] >= &line[0] && &p[0] <= &line[line.size()]) {
ostd::CharRange r(buf); ostd::CharRange r(buf);
if (!cs.src_file.empty()) if (!cs.src_file.empty())
@ -3833,10 +3833,10 @@ struct ListParser {
input.pop_front(); input.pop_front();
item = input; item = input;
input = cs_parse_str(input); input = cs_parse_str(input);
item = item.slice(0, item.distance_front(input)); item = ostd::slice_until(item, input);
if (!input.empty() && (input.front() == '"')) if (!input.empty() && (input.front() == '"'))
input.pop_front(); input.pop_front();
quote = quote.slice(0, quote.distance_front(input)); quote = ostd::slice_until(quote, input);
break; break;
case '(': case '(':
case '[': { case '[': {
@ -3877,8 +3877,9 @@ struct ListParser {
} }
} }
endblock: endblock:
item = item.slice(0, item.distance_front(input) - 1); item = ostd::slice_until(item, input);
quote = quote.slice(0, quote.distance_front(input)); item.pop_back();
quote = ostd::slice_until(quote, input);
break; break;
} }
case ')': case ')':
@ -3888,7 +3889,7 @@ endblock:
const char *e = parseword(input.data()); const char *e = parseword(input.data());
item = input; item = input;
input.pop_front_n(e - input.data()); input.pop_front_n(e - input.data());
item = item.slice(0, item.distance_front(input)); item = ostd::slice_until(item, input);
quote = item; quote = item;
break; break;
} }