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

Allow "stock static" in addition to "static stock".

Browse Source
This commit is contained in:
David Anderson 2015-01-04 12:04:29 -08:00
parent 3e012e7f79
commit 491036a1e6
3 changed files with 37 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
sourcepawn/compiler/sc1.cpp
View File

@ -1445,12 +1445,25 @@ static void dodecl(const token_t *tok)
return;
}
int fpublic = (tok->id == tPUBLIC);
int fstock = (tok->id == tSTOCK);
int fstatic = (tok->id == tSTATIC);
int fpublic = FALSE, fstock = FALSE, fstatic = FALSE, fconst = FALSE;
switch (tok->id) {
case tPUBLIC:
fpublic = TRUE;
break;
case tSTOCK:
fstock = TRUE;
if (matchtoken(tSTATIC))
fstatic = TRUE;
break;
case tSTATIC:
fstatic = TRUE;
if (fstatic && matchtoken(tSTOCK))
fstock = TRUE;
// For compatibility, we must include this case. Though "stock" should
// come first.
if (matchtoken(tSTOCK))
fstock = TRUE;
break;
}
int flags = DECLFLAG_MAYBE_FUNCTION | DECLFLAG_VARIABLE | DECLFLAG_ENUMROOT;
if (tok->id == tNEW)
@ -1462,7 +1475,13 @@ static void dodecl(const token_t *tok)
decl.type.tag = 0;
}
if (!decl.opertok && (tok->id == tNEW || decl.type.has_postdims || !lexpeek('('))) {
// Hacky bag o' hints as to whether this is a variable decl.
bool probablyVariable = tok->id == tNEW ||
decl.type.has_postdims ||
!lexpeek('(') ||
((decl.type.usage & uCONST) == uCONST);
if (!decl.opertok && probablyVariable) {
if (tok->id == tNEW && decl.type.is_new)
error(143);
if (decl.type.tag & STRUCTTAG) {

5
sourcepawn/compiler/tests/ok-static-stocks-1.sp Normal file
View File

@ -0,0 +1,5 @@
static stock const X = 5;
stock static const Y = 6;
public main()
{}

7
sourcepawn/compiler/tests/ok-static-stocks-2.sp Normal file
View File

@ -0,0 +1,7 @@
static stock const X = 5;
stock static const Y = 6;
public main()
{
return X + Y;
}