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

fix parenthesis arithmetic parsing

Browse source
This commit is contained in:
zawwz 2021-11-05 10:27:47 +01:00
parent 0e9aa3b023
commit 9a3086fc06
1 changed files with 13 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/parse.cpp
View file

@ -295,6 +295,18 @@ std::pair<arithmetic_t*, parse_context> parse_arithmetic(parse_context ctx)
ctx.i++; ctx.i++;
ret = new arithmetic_number_t( std::string(ctx.data+j, ctx.i-j) ); ret = new arithmetic_number_t( std::string(ctx.data+j, ctx.i-j) );
} }
else if(word_eq("$((", ctx)) // arithmetics in arithmetics: equivalent to ()
{
auto pa = parse_arithmetic(ctx);
ret = new arithmetic_parenthesis_t(pa.first);
ctx = pa.second;
ctx.i++;
if(ctx.i >= ctx.size || ctx[ctx.i] != ')') {
parse_error( "Unexpected ')', Expecting '))'", ctx );
return std::make_pair(ret, ctx);
}
ctx.i++;
}
else if(word_eq("$(", ctx)) else if(word_eq("$(", ctx))
{ {
ctx.i+=2; ctx.i+=2;
@ -313,7 +325,7 @@ std::pair<arithmetic_t*, parse_context> parse_arithmetic(parse_context ctx)
{ {
ctx.i++; ctx.i++;
auto pa = parse_arithmetic(ctx); auto pa = parse_arithmetic(ctx);
ret = pa.first; ret = new arithmetic_parenthesis_t(pa.first);
ctx = pa.second; ctx = pa.second;
ctx.i++; ctx.i++;
} }