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

Slightly easier to use. 

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@1867 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
Spoike 2006-01-14 03:37:22 +00:00
parent 9bed1da484
commit ac60336e9e
3 changed files with 29 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
engine/qclib/comprout.c
View File

@ -54,6 +54,8 @@ void PostCompile(void)
}
pbool PreCompile(void)
{
QCC_PR_ResetErrorScope();
qccClearHunk();
strcpy(qcc_gamedir, "");
qcchunk = malloc(qcchunksize=128*1024*1024);

26
engine/qclib/qcc_pr_lex.c
View File

@ -2336,7 +2336,26 @@ void QCC_PR_ParsePrintDef (int type, QCC_def_t *def)
if (def->s_file)
printf ("%s:%i: %s is defined here\n", strings + def->s_file, def->s_line, def->name);
}
void *errorscope;
void QCC_PR_PrintScope (void)
{
if (pr_scope)
{
if (errorscope != pr_scope)
printf ("in function %s (line %i)\n", pr_scope->name, pr_scope->s_line);
errorscope = pr_scope;
}
else
{
if (errorscope)
printf ("at global scope\n");
errorscope = NULL;
}
}
void QCC_PR_ResetErrorScope(void)
{
errorscope = NULL;
}
/*
============
PR_ParseError
@ -2359,6 +2378,8 @@ void VARGS QCC_PR_ParseError (int errortype, char *error, ...)
#ifndef QCC
editbadfile(strings+s_file, pr_source_line);
#endif
QCC_PR_PrintScope();
printf ("%s:%i: error: %s\n", strings + s_file, pr_source_line, string);
longjmp (pr_parse_abort, 1);
@ -2375,6 +2396,7 @@ void VARGS QCC_PR_ParseErrorPrintDef (int errortype, QCC_def_t *def, char *error
#ifndef QCC
editbadfile(strings+s_file, pr_source_line);
#endif
QCC_PR_PrintScope();
printf ("%s:%i: error: %s\n", strings + s_file, pr_source_line, string);
QCC_PR_ParsePrintDef(WARN_ERROR, def);
@ -2393,6 +2415,7 @@ void VARGS QCC_PR_ParseWarning (int type, char *error, ...)
QC_vsnprintf (string,sizeof(string)-1, error,argptr);
va_end (argptr);
QCC_PR_PrintScope();
if (type >= ERR_PARSEERRORS)
{
printf ("%s:%i: error: %s\n", strings + s_file, pr_source_line, string);
@ -2417,6 +2440,7 @@ void VARGS QCC_PR_Warning (int type, char *file, int line, char *error, ...)
QC_vsnprintf (string,sizeof(string)-1, error,argptr);
va_end (argptr);
QCC_PR_PrintScope();
if (file)
printf ("%s:%i: warning: %s\n", file, line, string);
else

2
engine/qclib/qccmain.c
View File

@ -1424,6 +1424,8 @@ void QCC_PR_BeginCompilation (void *memory, int memsize)
pr.def_tail = &pr.def_head;
QCC_PR_ResetErrorScope();
/* numpr_globals = RESERVED_OFS;
for (i=0 ; i<RESERVED_OFS ; i++)