aboutsummaryrefslogtreecommitdiff
path: root/tool/lemon.c
diff options
context:
space:
mode:
Diffstat (limited to 'tool/lemon.c')
-rw-r--r--tool/lemon.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/tool/lemon.c b/tool/lemon.c
index f0f2c8d72..324dda0c5 100644
--- a/tool/lemon.c
+++ b/tool/lemon.c
@@ -2023,10 +2023,10 @@ static char *msort(
list = NEXT(list);
NEXT(ep) = 0;
for(i=0; i<LISTSIZE-1 && set[i]!=0; i++){
- ep = merge(ep,set[i],cmp,offset);
+ ep = merge(set[i],ep,cmp,offset);
set[i] = 0;
}
- set[i] = ep;
+ set[i] = merge(set[i],ep,cmp,offset);
}
ep = 0;
for(i=0; i<LISTSIZE; i++) if( set[i] ) ep = merge(set[i],ep,cmp,offset);
@@ -4035,10 +4035,10 @@ PRIVATE int translate_code(struct lemon *lemp, struct rule *rp){
}
}
if( lhsdirect ){
- sprintf(zLhs, "yymsp[%d].minor.yy%d",1-rp->nrhs,rp->lhs->dtnum);
+ lemon_sprintf(zLhs, "yymsp[%d].minor.yy%d",1-rp->nrhs,rp->lhs->dtnum);
}else{
rc = 1;
- sprintf(zLhs, "yylhsminor.yy%d",rp->lhs->dtnum);
+ lemon_sprintf(zLhs, "yylhsminor.yy%d",rp->lhs->dtnum);
}
append_str(0,0,0,0);
@@ -5925,7 +5925,7 @@ struct state **State_arrayof(void)
PRIVATE unsigned confighash(struct config *a)
{
unsigned h=0;
- h = h*571 + a->rp->index*37 + a->dot;
+ h = a->rp->index*37 + a->dot;
return h;
}