eukara/fteqw
1
0
Fork 0
forked from fte/fteqw
Code Pull requests Activity

Support forward declaration of classes (hopefully). Reject declarations of already declared classes.

Browse source 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@2396 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
Mark Olsen 2006-09-28 02:46:42 +00:00
parent d76ae63551
commit af6b5bdc77
1 changed files with 34 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
engine/qclib/qcc_pr_lex.c
View file

@ -3036,11 +3036,44 @@ QCC_type_t *QCC_PR_ParseType (int newtype)
QCC_type_t *fieldtype; QCC_type_t *fieldtype;
char membername[2048]; char membername[2048];
char *classname = QCC_PR_ParseName(); char *classname = QCC_PR_ParseName();
newt = QCC_PR_NewType(classname, ev_entity); int forwarddeclaration;
newt = 0;
/* Don't advance the line number yet */
forwarddeclaration = pr_token[0] == ';';
/* Look to see if this type is already defined */
for(i=0;i<numtypeinfos;i++)
{
if (STRCMP(qcc_typeinfo[i].name, classname) == 0)
{
newt = &qcc_typeinfo[i];
break;
}
}
if (newt && forwarddeclaration)
QCC_PR_ParseError(ERR_REDECLARATION, "Forward declaration of already defined class %s", classname);
if (newt && newt->num_parms != 0)
QCC_PR_ParseError(ERR_REDECLARATION, "Redeclaration of class %s", classname);
if (!newt)
newt = QCC_PR_NewType(classname, ev_entity);
newt->size=type_entity->size; newt->size=type_entity->size;
type = NULL; type = NULL;
if (forwarddeclaration)
{
QCC_PR_CheckToken(";");
return NULL;
}
if (QCC_PR_CheckToken(":")) if (QCC_PR_CheckToken(":"))
{ {
char *parentname = QCC_PR_ParseName(); char *parentname = QCC_PR_ParseName();