tech
/
engine
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Patch from BlackHC, Increase maximum macro size and fix endless loop bug caused by empty macros 

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@2880 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
Lance 2008-01-27 01:14:44 +00:00
parent 8c6dccbb70
commit ff6630d28c
2 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
engine/qclib/qcc.h
View File

@ -64,7 +64,7 @@ extern int MAX_FUNCTIONS;
extern int MAX_CONSTANTS;
#define MAXCONSTANTLENGTH 64
#define MAXCONSTANTVALUELENGTH 256
#define MAXCONSTANTVALUELENGTH 1024
#define MAXCONSTANTPARAMLENGTH 32
#define MAXCONSTANTPARAMS 8
@ -890,6 +890,7 @@ void inline QCC_PR_Expect (char *string)
void editbadfile(char *fname, int line);
char *TypeName(QCC_type_t *type);
void QCC_PR_IncludeChunk (char *data, pbool duplicate, char *filename);
void QCC_PR_IncludeChunkEx(char *data, pbool duplicate, char *filename, CompilerConstant_t *cnst);
pbool QCC_PR_UnInclude(void);
extern void *(*pHash_Get)(hashtable_t *table, char *name);
extern void *(*pHash_GetNext)(hashtable_t *table, char *name, void *old);

24
engine/qclib/qcc_pr_lex.c
View File

@ -107,9 +107,10 @@ typedef struct qcc_includechunk_s {
char *filename;
char *currentdatapoint;
int currentlinenumber;
CompilerConstant_t *cnst;
} qcc_includechunk_t;
qcc_includechunk_t *currentchunk;
void QCC_PR_IncludeChunk (char *data, pbool duplicate, char *filename)
void QCC_PR_IncludeChunkEx (char *data, pbool duplicate, char *filename, CompilerConstant_t *cnst)
{
qcc_includechunk_t *chunk = qccHunkAlloc(sizeof(qcc_includechunk_t));
chunk->prev = currentchunk;
@ -117,6 +118,11 @@ void QCC_PR_IncludeChunk (char *data, pbool duplicate, char *filename)
chunk->currentdatapoint = pr_file_p;
chunk->currentlinenumber = pr_source_line;
chunk->cnst = cnst;
if( cnst )
{
cnst->inside++;
}
if (duplicate)
{
@ -126,11 +132,19 @@ void QCC_PR_IncludeChunk (char *data, pbool duplicate, char *filename)
else
pr_file_p = data;
}
void QCC_PR_IncludeChunk (char *data, pbool duplicate, char *filename)
{
QCC_PR_IncludeChunkEx(data, duplicate, filename, NULL);
}
pbool QCC_PR_UnInclude(void)
{
if (!currentchunk)
return false;
if( currentchunk->cnst )
currentchunk->cnst->inside--;
pr_file_p = currentchunk->currentdatapoint;
pr_source_line = currentchunk->currentlinenumber;
@ -2115,7 +2129,7 @@ int QCC_PR_CheakCompConst(void)
{
strcat(buffer, "#");
strcat(buffer, qcc_token);
QCC_PR_ParseWarning(0, "Stringification ignored");
//QCC_PR_ParseWarning(0, "Stringification ignored");
}
continue; //already did this one
}
@ -2142,17 +2156,15 @@ int QCC_PR_CheakCompConst(void)
paramoffset[p][strlen(paramoffset[p])] = ')';
pr_file_p = oldpr_file_p;
QCC_PR_IncludeChunk(buffer, true, NULL);
QCC_PR_IncludeChunkEx(buffer, true, NULL, c);
}
else
QCC_PR_ParseError(ERR_TOOFEWPARAMS, "Macro without opening brace");
}
else
QCC_PR_IncludeChunk(c->value, false, NULL);
QCC_PR_IncludeChunkEx(c->value, false, NULL, c);
c->inside++;
QCC_PR_Lex();
c->inside--;
return true;
}