qf
/
quakeforge
mirror of https://git.code.sf.net/p/quake/quakeforge
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[util] Expose plist type check support functions

This commit is contained in:
Bill Currie 2021-01-05 23:39:52 +09:00
parent a45f8f98b6
commit b493e6ac32
2 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/QF/qfplist.h
View File

@ -310,6 +310,11 @@ plitem_t *PL_NewString (const char *str);
*/ */
void PL_Free (plitem_t *item); void PL_Free (plitem_t *item);
int PL_CheckType (pltype_t field_type, pltype_t item_type);
void PL_TypeMismatch (plitem_t *messages, const plitem_t *item,
const char *name, pltype_t field_type,
pltype_t item_type);
/** Parse a dictionary object into a structure. /** Parse a dictionary object into a structure.
For each key in the dictionary, the corresponding field item is used to For each key in the dictionary, the corresponding field item is used to

24
libs/util/qfplist.c
View File

@ -1147,8 +1147,8 @@ pl_default_parser (const plfield_t *field, const plitem_t *item, void *data,
return 0; return 0;
} }
static int VISIBLE int
types_match (pltype_t field_type, pltype_t item_type) PL_CheckType (pltype_t field_type, pltype_t item_type)
{ {
if (field_type & QFMultiType) { if (field_type & QFMultiType) {
// field_type is a mask of allowed types // field_type is a mask of allowed types
@ -1159,9 +1159,9 @@ types_match (pltype_t field_type, pltype_t item_type)
} }
} }
static void VISIBLE void
type_mismatch (plitem_t *messages, const plitem_t *item, const char *name, PL_TypeMismatch (plitem_t *messages, const plitem_t *item, const char *name,
pltype_t field_type, pltype_t item_type) pltype_t field_type, pltype_t item_type)
{ {
const int num_types = sizeof (pl_types) / sizeof (pl_types[0]); const int num_types = sizeof (pl_types) / sizeof (pl_types[0]);
if (field_type & QFMultiType) { if (field_type & QFMultiType) {
@ -1213,9 +1213,9 @@ PL_ParseStruct (const plfield_t *fields, const plitem_t *dict, void *data,
} else { } else {
parser = pl_default_parser; parser = pl_default_parser;
} }
if (!types_match (f->type, item->type)) { if (!PL_CheckType (f->type, item->type)) {
type_mismatch (messages, item, current->key, PL_TypeMismatch (messages, item, current->key,
f->type, item->type); f->type, item->type);
result = 0; result = 0;
} else { } else {
if (!parser (f, item, flddata, messages, context)) { if (!parser (f, item, flddata, messages, context)) {
@ -1268,11 +1268,11 @@ PL_ParseArray (const plfield_t *field, const plitem_t *array, void *data,
plitem_t *item = plarray->values[i]; plitem_t *item = plarray->values[i];
void *eledata = &arr->a[i * element->stride]; void *eledata = &arr->a[i * element->stride];
if (!types_match (element->type, item->type)) { if (!PL_CheckType (element->type, item->type)) {
char index[16]; char index[16];
snprintf (index, sizeof(index) - 1, "%d", i); snprintf (index, sizeof(index) - 1, "%d", i);
index[15] = 0; index[15] = 0;
type_mismatch (messages, item, index, element->type, item->type); PL_TypeMismatch (messages, item, index, element->type, item->type);
result = 0; result = 0;
} else { } else {
if (!parser (&f, item, eledata, messages, context)) { if (!parser (&f, item, eledata, messages, context)) {
@ -1320,8 +1320,8 @@ PL_ParseSymtab (const plfield_t *field, const plitem_t *dict, void *data,
const char *key = current->key; const char *key = current->key;
plitem_t *item = current->value; plitem_t *item = current->value;
if (!types_match (element->type, item->type)) { if (!PL_CheckType (element->type, item->type)) {
type_mismatch (messages, item, key, element->type, item->type); PL_TypeMismatch (messages, item, key, element->type, item->type);
result = 0; result = 0;
continue; continue;
} }