Flummi/amxmodx
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Compiler: Fix an issue related to passing arrays based on an enumeration to a function (#582)

Browse Source
This commit is contained in:
Vincent Herbet 2018-09-14 15:47:11 +02:00 committed by GitHub
parent 8f88dc5ac8
commit 5694acf482
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
compiler/libpc300/sc3.c
View File

@ -2058,7 +2058,8 @@ static int nesting=0;
error(35,argidx+1); /* argument type mismatch */ error(35,argidx+1); /* argument type mismatch */
/* Verify that the dimensions match with those in arg[argidx]. /* Verify that the dimensions match with those in arg[argidx].
* A literal array always has a single dimension. * A literal array always has a single dimension.
* An iARRAYCELL parameter is also assumed to have a single dimension. * An iARRAYCELL parameter is also assumed to have a single dimension,
* but its size may be >1 in case of an enumeration pseudo-array.
*/ */
if (lval.sym==NULL || lval.ident==iARRAYCELL) { if (lval.sym==NULL || lval.ident==iARRAYCELL) {
if (arg[argidx].numdim!=1) { if (arg[argidx].numdim!=1) {
@ -2066,6 +2067,7 @@ static int nesting=0;
} else if (arg[argidx].dim[0]!=0) { } else if (arg[argidx].dim[0]!=0) {
assert(arg[argidx].dim[0]>0); assert(arg[argidx].dim[0]>0);
if (lval.ident==iARRAYCELL) { if (lval.ident==iARRAYCELL) {
if (lval.constval==0 || arg[argidx].dim[0]!=lval.constval)
error(47); /* array sizes must match */ error(47); /* array sizes must match */
} else { } else {
assert(lval.constval!=0); /* literal array must have a size */ assert(lval.constval!=0); /* literal array must have a size */