xfnw/plan9fox
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

forp: fix precedence for []

Browse source
This commit is contained in:
aiju 2018-03-31 12:30:48 +00:00
parent 7d18756b39
commit 20e695c178
1 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
sys/src/cmd/forp/parse.c
View file

@ -291,12 +291,8 @@ expr(int level)
mpint *num;
int t;
if(level == MAXPREC+1){
if(level == MAXPREC+2){
switch(t = lex()){
case '~': return node(ASTUN, OPCOM, expr(level));
case '!': return node(ASTUN, OPNOT, expr(level));
case '+': return expr(level);
case '-': return node(ASTUN, OPNEG, expr(level));
case '(':
a = expr(0);
expect(')');
@ -318,7 +314,7 @@ expr(int level)
default:
error(nil, "unexpected %t", t);
}
}else if(level == MAXPREC){
}else if(level == MAXPREC+1){
a = expr(level + 1);
if(got('[')){
b = expr(0);
@ -330,6 +326,14 @@ expr(int level)
a = node(ASTIDX, a, b, c);
}
return a;
}else if(level == MAXPREC){
switch(t = lex()){
case '~': return node(ASTUN, OPCOM, expr(level));
case '!': return node(ASTUN, OPNOT, expr(level));
case '+': return expr(level);
case '-': return node(ASTUN, OPNEG, expr(level));
default: superman(t); return expr(level+1); break;
}
}else if(level == 3){
a = expr(level + 1);
if(got('?')){