zawz/lxsh
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix some parsing errors resulting in unwanted behaviour

Browse source
This commit is contained in:
zawz 2020-11-14 17:57:02 +01:00
parent 1a030c2a65
commit 4cb502182e
1 changed files with 18 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/parse.cpp
View file

@ -510,10 +510,21 @@ std::pair<list*, uint32_t> parse_list_until(const char* in, uint32_t size, uint3
{ {
auto pp=parse_condlist(in, size, i); auto pp=parse_condlist(in, size, i);
ret->cls.push_back(pp.first); ret->cls.push_back(pp.first);
if(is_in(in[pp.second], COMMAND_SEPARATOR)) if(pp.second < size)
i = skip_unread(in, size, pp.second+1); {
if(in[pp.second] == end_c) // end char, stop here
break;
else if(is_in(in[pp.second], COMMAND_SEPARATOR)) // command separator: next char
i = skip_unread(in, size, pp.second+1);
else if(is_in(in[pp.second], CONTROL_END))
throw PARSE_ERROR(strf("Unexpected token: '%c'", in[pp.second]), pp.second);
else
i = skip_unread(in, size, pp.second);
}
else else
i = skip_unread(in, size, pp.second); {
i=pp.second;
}
if(i>=size) if(i>=size)
{ {
@ -559,6 +570,8 @@ std::pair<list*, uint32_t> parse_list_until(const char* in, uint32_t size, uint3
ret->cls.push_back(pp.first); ret->cls.push_back(pp.first);
if(is_in(in[pp.second], COMMAND_SEPARATOR)) if(is_in(in[pp.second], COMMAND_SEPARATOR))
i = skip_unread(in, size, pp.second+1); i = skip_unread(in, size, pp.second+1);
else if(is_in(in[pp.second], CONTROL_END))
throw PARSE_ERROR(strf("Unexpected token: '%c'", in[pp.second]), pp.second);
else else
i = skip_unread(in, size, pp.second); i = skip_unread(in, size, pp.second);
// word wasn't found // word wasn't found
@ -750,6 +763,8 @@ std::pair<cmd*, uint32_t> parse_cmd(const char* in, uint32_t size, uint32_t star
ret->args = pp.first; ret->args = pp.first;
i = pp.second; i = pp.second;
} }
else if(ret->var_assigns.size() <= 0)
throw PARSE_ERROR( strf("Unexpected token: '%c'", in[i]), i );
} }
catch(ztd::format_error& e) catch(ztd::format_error& e)