1berry/pawn-compiler
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix 2d ellips initializer not increasing on next element

Browse Source 
Closes #48.
This commit is contained in:
Zeex 2015-04-04 14:35:07 +06:00
parent 128c56df3f
commit 932efdfad9
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
source/compiler/sc1.c
View File

@ -2460,7 +2460,7 @@ static cell initarray(int ident,int tag,int dim[],int numdim,int cur,
constvalue *enumroot,int *errorfound) constvalue *enumroot,int *errorfound)
{ {
cell dsize,totalsize=0; cell dsize,totalsize=0;
int idx=0,vec_idx,abortparse=FALSE; int idx=0,idx_ellips,vidx,abortparse=FALSE;
cell *prev1=NULL,*prev2=NULL; cell *prev1=NULL,*prev2=NULL;
assert(cur>=0 && cur<numdim); assert(cur>=0 && cur<numdim);
@ -2469,7 +2469,6 @@ static cell initarray(int ident,int tag,int dim[],int numdim,int cur,
assert(errorfound!=NULL && *errorfound==FALSE); assert(errorfound!=NULL && *errorfound==FALSE);
needtoken('{'); needtoken('{');
do { do {
int ellips=FALSE;
/* In case the major dimension is zero, we need to store the offset /* In case the major dimension is zero, we need to store the offset
* to the newly detected sub-array into the indirection table; i.e. * to the newly detected sub-array into the indirection table; i.e.
* this table needs to be expanded and updated. * this table needs to be expanded and updated.
@ -2489,17 +2488,19 @@ static cell initarray(int ident,int tag,int dim[],int numdim,int cur,
lastdim,enumroot,errorfound); lastdim,enumroot,errorfound);
} else { } else {
if (matchtoken(tELLIPS)!=0) { if (matchtoken(tELLIPS)!=0) {
if (prev1!=NULL) if (prev1!=NULL) {
idx_ellips=1;
while (idx < dim[cur]) { while (idx < dim[cur]) {
for (vec_idx=0; vec_idx < dsize; vec_idx++) { for (vidx=0; vidx < dsize; vidx++)
if (prev2!=NULL) if (prev2!=NULL)
litadd(prev1[vec_idx]+(prev1[vec_idx]-prev2[vec_idx])); litadd(prev1[vidx]+idx_ellips*(prev1[vidx]-prev2[vidx]));
else else
litadd(prev1[vec_idx]); litadd(prev1[vidx]);
} /* for */ append_constval(lastdim,itoh(idx),dsize,0);
append_constval(lastdim,itoh(idx++),dsize,0); idx++;
idx_ellips++;
} /* while */ } /* while */
else } else
error(41); /* invalid ellipsis, array size unknown */ error(41); /* invalid ellipsis, array size unknown */
} else { } else {
prev2=prev1; prev2=prev1;