UNLOZE/sourcemod
10
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed compiler erroring when tagging functions for string return (bug 3837, r=fyren).

Browse Source
This commit is contained in:
David Anderson 2009-05-30 20:03:01 -04:00
parent a1543f79cb
commit c4b17855e5
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sourcepawn/compiler/sc1.c
View File

@ -6416,7 +6416,7 @@ static void doreturn(void)
} /* if */ } /* if */
} else { } else {
int idxtag[sDIMEN_MAX]; int idxtag[sDIMEN_MAX];
int argcount; int argcount, slength=0;
/* this function does not yet have an array attached; clone the /* this function does not yet have an array attached; clone the
* returned symbol beneath the current function * returned symbol beneath the current function
*/ */
@ -6434,6 +6434,8 @@ static void doreturn(void)
if (dim[numdim]<=0) if (dim[numdim]<=0)
error(46,sym->name); error(46,sym->name);
} /* for */ } /* for */
if (sym->tag==pc_tag_string && numdim!=0)
slength=dim[numdim-1];
/* the address of the array is stored in a hidden parameter; the address /* the address of the array is stored in a hidden parameter; the address
* of this parameter is 1 + the number of parameters (times the size of * of this parameter is 1 + the number of parameters (times the size of
* a cell) + the size of the stack frame and the return address * a cell) + the size of the stack frame and the return address
@ -6449,7 +6451,7 @@ static void doreturn(void)
assert(curfunc->dim.arglist!=NULL); assert(curfunc->dim.arglist!=NULL);
for (argcount=0; curfunc->dim.arglist[argcount].ident!=0; argcount++) for (argcount=0; curfunc->dim.arglist[argcount].ident!=0; argcount++)
/* nothing */; /* nothing */;
sub=addvariable(curfunc->name,(argcount+3)*sizeof(cell),iREFARRAY,sGLOBAL,curfunc->tag,dim,numdim,idxtag); sub=addvariable2(curfunc->name,(argcount+3)*sizeof(cell),iREFARRAY,sGLOBAL,curfunc->tag,dim,numdim,idxtag,slength);
sub->parent=curfunc; sub->parent=curfunc;
} /* if */ } /* if */
/* get the hidden parameter, copy the array (the array is on the heap; /* get the hidden parameter, copy the array (the array is on the heap;