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

Fix error when static/stock/public constant used as array size

Browse Source 
Fixes #70

--------- test code --------

native printf(const format[], ...);

static const a = 1;
static stock const b = 2;
stock const c = 3;
public const d = 4;

main() {
	static const e = 5;
	new aa[a];
	new ab[b];
	new ac[c];
	new ad[d];
	new ae[e];
	printf("%d", sizeof(aa), aa);
	printf("%d", sizeof(ab), ab);
	printf("%d", sizeof(ac), ac);
	printf("%d", sizeof(ad), ad);
	printf("%d", sizeof(ae), ae);
}

----- end of test code -----
This commit is contained in:
Zeex 2015-06-19 21:38:05 +06:00
parent 1cca8af0d2
commit 39828f23f2
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
source/compiler/sc1.c
View File

@ -1860,8 +1860,13 @@ static void declfuncvar(int fpublic,int fstatic,int fstock,int fconst)
/* only variables can be "const" or both "public" and "stock" */
invalidfunc= fconst || (fpublic && fstock);
if (invalidfunc || !newfunc(name,tag,fpublic,fstatic,fstock)) {
/* if not a function, try a global variable */
declglb(name,tag,fpublic,fstatic,fstock,fconst);
/* if not a function, try a global constant/variable */
if (fconst) {
lexpush();
decl_const(sGLOBAL);
} else {
declglb(name,tag,fpublic,fstatic,fstock,fconst);
} /* if */
} /* if */
} /* if */
}
@ -4948,8 +4953,14 @@ static void statement(int *lastindent,int allow_decl)
break;
case tSTATIC:
if (allow_decl) {
declloc(TRUE);
lastst=tNEW;
tok=lex(&val,&st);
if (tok==tCONST) {
decl_const(sSTATIC);
} else {
lexpush();
declloc(TRUE);
lastst=tNEW;
} /* if */
} else {
error(3); /* declaration only valid in a block */
} /* if */