fte/fteqw
2
0
Fork 1
Code Issues Pull requests Projects Releases Packages Wiki Activity

Support for '[const] static type name=val;' inside classes.

Browse source 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@5963 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
Spoike 2021-07-17 15:09:44 +00:00
parent 89a1be8e8c
commit 2ae4157738
1 changed files with 25 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
engine/qclib/qcc_pr_lex.c
View file

@ -5696,11 +5696,15 @@ QCC_type_t *QCC_PR_ParseType (int newtype, pbool silentfail)
QCC_PR_ParseError(ERR_NOTANAME, "member missing name"); QCC_PR_ParseError(ERR_NOTANAME, "member missing name");
while (!QCC_PR_CheckToken("}")) while (!QCC_PR_CheckToken("}"))
{ {
unsigned int gdf_flags;
pbool havebody = false; pbool havebody = false;
pbool isnull = false; pbool isnull = false;
pbool isvirt = false; pbool isvirt = false;
pbool isnonvirt = false; pbool isnonvirt = false;
pbool isstatic = false; pbool isstatic = false;
pbool isconst = false;
pbool isvar = false;
pbool isignored = false; pbool isignored = false;
pbool isinline = false; pbool isinline = false;
pbool isget = false; pbool isget = false;
@ -5714,6 +5718,10 @@ QCC_type_t *QCC_PR_ParseType (int newtype, pbool silentfail)
isnonvirt = true; isnonvirt = true;
else if (QCC_PR_CheckKeyword(1, "static")) else if (QCC_PR_CheckKeyword(1, "static"))
isstatic = true; isstatic = true;
else if (QCC_PR_CheckKeyword(1, "const"))
isconst = isstatic = true;
else if (QCC_PR_CheckKeyword(1, "var"))
isvar = true;
else if (QCC_PR_CheckKeyword(1, "virtual")) else if (QCC_PR_CheckKeyword(1, "virtual"))
isvirt = true; isvirt = true;
else if (QCC_PR_CheckKeyword(1, "ignore")) else if (QCC_PR_CheckKeyword(1, "ignore"))
@ -5794,7 +5802,10 @@ QCC_type_t *QCC_PR_ParseType (int newtype, pbool silentfail)
else if (assumevirtual == -1) else if (assumevirtual == -1)
isnonvirt = true; isnonvirt = true;
else else
{
QCC_PR_ParseWarning(WARN_MISSINGMEMBERQUALIFIER, "%s::%s was not qualified. Assuming non-virtual.", classname, parmname); QCC_PR_ParseWarning(WARN_MISSINGMEMBERQUALIFIER, "%s::%s was not qualified. Assuming non-virtual.", classname, parmname);
isnonvirt = true;
}
} }
if (isvirt+isnonvirt+isstatic != 1) if (isvirt+isnonvirt+isstatic != 1)
QCC_PR_ParseError(ERR_INTERNAL, "Multiple conflicting qualifiers on %s::%s.", classname, pr_token); QCC_PR_ParseError(ERR_INTERNAL, "Multiple conflicting qualifiers on %s::%s.", classname, pr_token);
@ -5807,17 +5818,16 @@ QCC_type_t *QCC_PR_ParseType (int newtype, pbool silentfail)
QCC_Error(ERR_INTERNAL, "inline keyword on member that is not a function"); QCC_Error(ERR_INTERNAL, "inline keyword on member that is not a function");
} }
if (newparm->type == ev_function) if (QCC_PR_CheckToken("="))
{ havebody = true;
if (QCC_PR_CheckToken("=")) else if (newparm->type == ev_function && pr_token[0] == '{')
{ havebody = true;
havebody = true; if (isinline && (!havebody || isvirt))
} QCC_Error(ERR_INTERNAL, "inline keyword on function prototype or virtual function");
else if (pr_token[0] == '{')
havebody = true; gdf_flags = 0;
if (isinline && (!havebody || isvirt)) if ((newparm->type == ev_function && !arraysize && !isvar) || isconst)
QCC_Error(ERR_INTERNAL, "inline keyword on function prototype or virtual function"); gdf_flags = GDF_CONST;
}
if (havebody) if (havebody)
{ {
@ -5833,7 +5843,7 @@ QCC_type_t *QCC_PR_ParseType (int newtype, pbool silentfail)
def = NULL; def = NULL;
else else
{ {
def = QCC_PR_GetDef(newparm, membername, NULL, true, 0, 0); def = QCC_PR_GetDef(newparm, membername, NULL, true, 0, gdf_flags);
def->symboldata[def->ofs].function = 0; def->symboldata[def->ofs].function = 0;
def->initialized = 1; def->initialized = 1;
} }
@ -5843,9 +5853,9 @@ QCC_type_t *QCC_PR_ParseType (int newtype, pbool silentfail)
if (isignored) if (isignored)
def = NULL; def = NULL;
else else
def = QCC_PR_GetDef(newparm, membername, NULL, true, 0, GDF_CONST); def = QCC_PR_GetDef(newparm, membername, NULL, true, 0, gdf_flags);
if (newparm->type != ev_function) if (newparm->type != ev_function && !isstatic)
QCC_Error(ERR_INTERNAL, "Can only initialise member functions"); QCC_Error(ERR_INTERNAL, "Can only initialise member functions");
else else
{ {
@ -5942,12 +5952,8 @@ QCC_type_t *QCC_PR_ParseType (int newtype, pbool silentfail)
//static members are technically just funny-named globals, and do not generate fields. //static members are technically just funny-named globals, and do not generate fields.
if (isnonvirt || isstatic || (newparm->type == ev_function && !arraysize)) if (isnonvirt || isstatic || (newparm->type == ev_function && !arraysize))
{ {
unsigned int fl = 0;
if (newparm->type == ev_function && !arraysize)
fl = GDF_CONST;
QC_snprintfz(membername, sizeof(membername), "%s::%s", classname, parmname); QC_snprintfz(membername, sizeof(membername), "%s::%s", classname, parmname);
QCC_FreeDef(QCC_PR_GetDef(newparm, membername, NULL, true, 0, fl)); QCC_FreeDef(QCC_PR_GetDef(newparm, membername, NULL, true, 0, gdf_flags));
if (isnonvirt || isstatic) if (isnonvirt || isstatic)
continue; continue;