team-fte
/
fteqw
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix some type confusion in fteqcc's enums. 

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@5809 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
Spoike 2021-02-17 03:55:20 +00:00
parent 931bddff56
commit d4606452e6
3 changed files with 91 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
engine/qclib/qcc.h
View File

@ -1199,6 +1199,7 @@ pbool Packager_CompressDir(const char *dirname, enum pkgtype_e type, void (*me
struct pkgctx_s *Packager_Create(void (*messagecallback)(void *userctx, const char *message, ...), void *userctx); struct pkgctx_s *Packager_Create(void (*messagecallback)(void *userctx, const char *message, ...), void *userctx);
void Packager_ParseFile(struct pkgctx_s *ctx, char *scriptfilename); void Packager_ParseFile(struct pkgctx_s *ctx, char *scriptfilename);
void Packager_ParseText(struct pkgctx_s *ctx, char *scripttext); void Packager_ParseText(struct pkgctx_s *ctx, char *scripttext);
void Packager_WriteDataset(struct pkgctx_s *ctx, char *setname);
void Packager_Destroy(struct pkgctx_s *ctx); void Packager_Destroy(struct pkgctx_s *ctx);

100
engine/qclib/qcc_pr_comp.c
View File

@ -5225,6 +5225,21 @@ QCC_sref_t QCC_PR_StatementFlags ( QCC_opcode_t *op, QCC_sref_t var_a, QCC_sref_
case OP_EQ_U: var_a.cast = type_integer; var_b.cast = type_integer; var_c = QCC_PR_StatementFlags(&pr_opcodes[OP_EQ_I], var_a, var_b, NULL, flags); var_c.cast = type_uint; return var_c; case OP_EQ_U: var_a.cast = type_integer; var_b.cast = type_integer; var_c = QCC_PR_StatementFlags(&pr_opcodes[OP_EQ_I], var_a, var_b, NULL, flags); var_c.cast = type_uint; return var_c;
case OP_NE_U: var_a.cast = type_integer; var_b.cast = type_integer; var_c = QCC_PR_StatementFlags(&pr_opcodes[OP_NE_I], var_a, var_b, NULL, flags); var_c.cast = type_uint; return var_c; case OP_NE_U: var_a.cast = type_integer; var_b.cast = type_integer; var_c = QCC_PR_StatementFlags(&pr_opcodes[OP_NE_I], var_a, var_b, NULL, flags); var_c.cast = type_uint; return var_c;
case OP_ADD_U64: var_a.cast = type_int64; var_b.cast = type_int64; var_c = QCC_PR_StatementFlags(&pr_opcodes[OP_ADD_I64], var_a, var_b, NULL, flags); var_c.cast = type_uint64; return var_c;
case OP_SUB_U64: var_a.cast = type_int64; var_b.cast = type_int64; var_c = QCC_PR_StatementFlags(&pr_opcodes[OP_SUB_I64], var_a, var_b, NULL, flags); var_c.cast = type_uint64; return var_c;
case OP_MUL_U64: var_a.cast = type_int64; var_b.cast = type_int64; var_c = QCC_PR_StatementFlags(&pr_opcodes[OP_MUL_I64], var_a, var_b, NULL, flags); var_c.cast = type_uint64; return var_c;
// case OP_MOD_U64: var_a.cast = type_int64; var_b.cast = type_int64; var_c = QCC_PR_StatementFlags(&pr_opcodes[OP_MOD_I64], var_a, var_b, NULL, flags); var_c.cast = type_uint64; return var_c;
case OP_BITAND_U64: var_a.cast = type_int64; var_b.cast = type_int64; var_c = QCC_PR_StatementFlags(&pr_opcodes[OP_BITAND_I64], var_a, var_b, NULL, flags); var_c.cast = type_uint64; return var_c;
case OP_BITOR_U64: var_a.cast = type_int64; var_b.cast = type_int64; var_c = QCC_PR_StatementFlags(&pr_opcodes[OP_BITOR_I64], var_a, var_b, NULL, flags); var_c.cast = type_uint64; return var_c;
case OP_BITXOR_U64: var_a.cast = type_int64; var_b.cast = type_int64; var_c = QCC_PR_StatementFlags(&pr_opcodes[OP_BITXOR_I64], var_a, var_b, NULL, flags); var_c.cast = type_uint64; return var_c;
case OP_BITNOT_U64: var_a.cast = type_int64; var_b.cast = type_int64; var_c = QCC_PR_StatementFlags(&pr_opcodes[OP_BITNOT_I64], var_a, var_b, NULL, flags); var_c.cast = type_uint64; return var_c;
case OP_BITCLR_U64: var_a.cast = type_int64; var_b.cast = type_int64; var_c = QCC_PR_StatementFlags(&pr_opcodes[OP_BITCLR_I64], var_a, var_b, NULL, flags); var_c.cast = type_uint64; return var_c;
case OP_LSHIFT_U64I: var_a.cast = type_int64; var_b.cast = type_int64; var_c = QCC_PR_StatementFlags(&pr_opcodes[OP_LSHIFT_I64I], var_a, var_b, NULL, flags); var_c.cast = type_uint64; return var_c;
case OP_GE_U64: var_a.cast = type_int64; var_b.cast = type_int64; return QCC_PR_StatementFlags(&pr_opcodes[OP_LT_U64], var_b, var_a, NULL, flags);
case OP_GT_U64: var_a.cast = type_int64; var_b.cast = type_int64; return QCC_PR_StatementFlags(&pr_opcodes[OP_LE_U64], var_b, var_a, NULL, flags);
case OP_EQ_U64: var_a.cast = type_int64; var_b.cast = type_int64; var_c = QCC_PR_StatementFlags(&pr_opcodes[OP_EQ_I64], var_a, var_b, NULL, flags); var_c.cast = type_uint64; return var_c;
case OP_NE_U64: var_a.cast = type_int64; var_b.cast = type_int64; var_c = QCC_PR_StatementFlags(&pr_opcodes[OP_NE_I64], var_a, var_b, NULL, flags); var_c.cast = type_uint64; return var_c;
case OP_STORE_I64: case OP_STORE_I64:
var_c = var_b; var_c = var_b;
var_c.cast = type_integer; var_c.cast = type_integer;
@ -5889,9 +5904,11 @@ noflags:
//case 'll': //long long //case 'll': //long long
case 'l': isfloat = 0; break; //long case 'l': isfloat = 0; break; //long
case 'L': isfloat = 0; break; //long double case 'L': isfloat = 0; break; //long double
case 'j': break; //[u]intmax_t case 'j': //[u]intmax_t
case 'z': break; //size_t case 'z': //size_t
case 't': break; //ptrdiff_t case 't': //ptrdiff_t
QCC_PR_ParseWarning(WARN_FORMATSTRING, "%s: length modifier %s%c%s is a placeholder", funcname, col_type, *s, col_none);
break;
default: default:
goto nolength; goto nolength;
} }
@ -5963,6 +5980,7 @@ nolength:
switch(ARGTYPE(thisarg)) switch(ARGTYPE(thisarg))
{ {
case ev_integer: case ev_integer:
case ev_uint:
case ev_variant: case ev_variant:
break; break;
case ev_entity: //accept ents ONLY for %i case ev_entity: //accept ents ONLY for %i
@ -17338,8 +17356,8 @@ QCC_type_t *QCC_PR_ParseEnum(pbool flags)
{ {
const char *name = NULL; const char *name = NULL;
QCC_sref_t sref; QCC_sref_t sref;
int next_i = flags?1:0; unsigned longlong next_i = flags?1:0;
float next_f = next_i; double next_f = next_i;
struct accessor_s *acc; struct accessor_s *acc;
QCC_type_t *enumtype = NULL, *basetype; QCC_type_t *enumtype = NULL, *basetype;
pbool strictenum = false; pbool strictenum = false;
@ -17375,9 +17393,6 @@ QCC_type_t *QCC_PR_ParseEnum(pbool flags)
QCC_PR_Expect("{"); QCC_PR_Expect("{");
} }
if (flags && basetype->type != ev_float && basetype->type != ev_integer && basetype->type != ev_vector)
QCC_PR_ParseError(ERR_NOTATYPE, "enumflags - must be numeric type");
if (name) if (name)
{ {
enumtype = QCC_TypeForName(name); enumtype = QCC_TypeForName(name);
@ -17420,11 +17435,19 @@ QCC_type_t *QCC_PR_ParseEnum(pbool flags)
{ {
if (sref.cast->type == ev_float) if (sref.cast->type == ev_float)
next_i = next_f = eval->_float; next_i = next_f = eval->_float;
else if (sref.cast->type == ev_double)
next_i = next_f = eval->_double;
else if (sref.cast->type == ev_integer) else if (sref.cast->type == ev_integer)
next_f = next_i = eval->_int; next_f = (int)(next_i = eval->_int);
else if (sref.cast->type == ev_uint)
next_f = next_i = eval->_uint;
else if (sref.cast->type == ev_int64)
next_f = (longlong)(next_i = eval->_int64);
else if (sref.cast->type == ev_uint64)
next_f = next_i = eval->_uint64;
} }
else if (sref.sym) else if (sref.sym)
QCC_PR_ParseError(ERR_NOTANUMBER, "enum - %s is not a constant", sref.sym->name); QCC_PR_ParseError(ERR_NOTANUMBER, "enum - %s is not a compile-time constant", sref.sym->name);
else else
QCC_PR_ParseError(ERR_NOTANUMBER, "enum - not a number"); QCC_PR_ParseError(ERR_NOTANUMBER, "enum - not a number");
@ -17434,10 +17457,30 @@ QCC_type_t *QCC_PR_ParseEnum(pbool flags)
QCC_FreeTemp(sref); QCC_FreeTemp(sref);
sref = QCC_MakeIntConst(next_i); sref = QCC_MakeIntConst(next_i);
} }
else if (basetype->type==ev_uint)
{
QCC_FreeTemp(sref);
sref = QCC_MakeUIntConst(next_i);
}
else if (basetype->type==ev_int64)
{
QCC_FreeTemp(sref);
sref = QCC_MakeInt64Const(next_i);
}
else if (basetype->type==ev_uint64)
{
QCC_FreeTemp(sref);
sref = QCC_MakeUInt64Const(next_i);
}
else if (basetype->type==ev_float) else if (basetype->type==ev_float)
{ {
QCC_FreeTemp(sref); QCC_FreeTemp(sref);
sref = QCC_MakeFloatConst(next_i); sref = QCC_MakeFloatConst(next_f);
}
else if (basetype->type==ev_double)
{
QCC_FreeTemp(sref);
sref = QCC_MakeDoubleConst(next_f);
} }
} }
} }
@ -17445,15 +17488,37 @@ QCC_type_t *QCC_PR_ParseEnum(pbool flags)
{ {
if (basetype->type==ev_integer) if (basetype->type==ev_integer)
sref = QCC_MakeIntConst(next_i); sref = QCC_MakeIntConst(next_i);
else if (basetype->type==ev_uint)
sref = QCC_MakeUIntConst(next_i);
else if (basetype->type==ev_int64)
sref = QCC_MakeInt64Const(next_i);
else if (basetype->type==ev_uint64)
sref = QCC_MakeUInt64Const(next_i);
else if (basetype->type==ev_float) else if (basetype->type==ev_float)
sref = QCC_MakeFloatConst(next_f); sref = QCC_MakeFloatConst(next_f);
else if (basetype->type==ev_double)
sref = QCC_MakeDoubleConst(next_f);
else else
QCC_PR_ParseError(ERR_NOTANUMBER, "values for enums of this type must be initialised"); QCC_PR_ParseError(ERR_NOTANUMBER, "values for enums of this type must be initialised");
} }
if (flags) if (flags)
{ {
int bits = 0; int bits = 0;
unsigned int i = (basetype->type==ev_integer)?next_i:(int)next_f; unsigned longlong i;
if (basetype->type == ev_float)
i = (longlong)next_f;
else if (basetype->type == ev_double)
i = (longlong)next_f;
else if (basetype->type == ev_integer)
i = (int)next_i;
else if (basetype->type == ev_uint)
i = (unsigned int)next_i;
else if (basetype->type == ev_int64)
i = (longlong)next_i;
else if (basetype->type == ev_uint64)
i = (unsigned longlong)next_i;
else
QCC_PR_ParseError(ERR_NOTATYPE, "enumflags - must be numeric type");
if (basetype->type!=ev_integer && (double)i != next_f) if (basetype->type!=ev_integer && (double)i != next_f)
QCC_PR_ParseWarning(WARN_ENUMFLAGS_NOTINTEGER, "enumflags - %f not an integer value", next_f); QCC_PR_ParseWarning(WARN_ENUMFLAGS_NOTINTEGER, "enumflags - %f not an integer value", next_f);
else else
@ -17469,6 +17534,11 @@ QCC_type_t *QCC_PR_ParseEnum(pbool flags)
} }
} }
//value gets added to global pool too (but referable whenever not strict)
//we just generate an entirely new def (within the parent's pr_globals allocation). this also gives 'symbol was defined HERE' info.
sref.sym = QCC_PR_DummyDef(sref.cast, name, pr_scope, 0, sref.sym, sref.ofs, !strictenum, GDF_CONST|GDF_STRIP);
sref.sym->initialized = true; //must be true for it to have been considered a compile-time constant.
sref.ofs = 0;
if (enumtype) if (enumtype)
{ {
//generate enumname::valname symbol info //generate enumname::valname symbol info
@ -17487,16 +17557,12 @@ QCC_type_t *QCC_PR_ParseEnum(pbool flags)
acc->staticval = sref; acc->staticval = sref;
acc->staticval.cast = enumtype; acc->staticval.cast = enumtype;
} }
if (!strictenum)
{ //value gets added to global pool too (whenever not strict)
pHash_Add(&globalstable, name, sref.sym, qccHunkAlloc(sizeof(bucket_t)));
}
QCC_FreeTemp(sref); QCC_FreeTemp(sref);
if (flags) if (flags)
{ {
next_f *= 2; next_f *= 2;
next_i *= 2; next_i <<= 1;
if (!next_i) if (!next_i)
next_f = next_i = 1; //so you can start with an explicit =0 without needing an =1. next_f = next_i = 1; //so you can start with an explicit =0 without needing an =1.

7
engine/qclib/qcc_pr_lex.c
View File

@ -2796,6 +2796,13 @@ static void QCC_PR_LexGrab (void)
; ;
QCC_PR_Lex (); QCC_PR_Lex ();
} }
else if (!STRCMP (pr_token, "frame_reset"))
{ //for compat with qfcc. full reset of all frame macros.
QCC_PR_ClearGrabMacros(false);
while (QCC_PR_LexMacroName ())
;
QCC_PR_Lex ();
}
else if (!STRCMP (pr_token, "framevalue")) else if (!STRCMP (pr_token, "framevalue"))
{ {
QCC_PR_LexMacroName (); QCC_PR_LexMacroName ();