qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2025-02-25 05:01:24 +00:00
Code Issues Projects Releases Packages Wiki Activity

[qfcc] Clean up some bool types

Browse source 
It's true that true is more meaningful than 1.
This commit is contained in:
Bill Currie 2024-05-13 12:19:16 +09:00
parent e295a62050
commit 38b1d2d238
3 changed files with 30 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
tools/qfcc/include/specifier.h
View file

@ -57,18 +57,18 @@ typedef struct specifier_s {
storage_class_t storage;
union {
struct {
unsigned multi_type:1;
unsigned multi_store:1;
unsigned is_signed:1;
unsigned is_unsigned:1;
unsigned is_short:1;
unsigned is_long:1;
unsigned is_typedef:1;
unsigned is_overload:1;
unsigned is_function:1;//FIXME do proper void(*)() -> ev_func
unsigned nosave:1;
unsigned no_va_list:1;
unsigned void_return:1;
bool multi_type:1;
bool multi_store:1;
bool is_signed:1;
bool is_unsigned:1;
bool is_short:1;
bool is_long:1;
bool is_typedef:1;
bool is_overload:1;
bool is_function:1;//FIXME do proper void(*)() -> ev_func
bool nosave:1;
bool no_va_list:1;
bool void_return:1;
};
unsigned spec_bits;
};

22
tools/qfcc/source/qc-parse.y
View file

@ -267,11 +267,11 @@ parse_attributes (attribute_t *attr_list)
specifier_t spec = {};
for (attribute_t *attr = attr_list; attr; attr = attr->next) {
if (!strcmp (attr->name, "no_va_list")) {
spec.no_va_list = 1;
spec.no_va_list = true;
} else if (!strcmp (attr->name, "nosave")) {
spec.nosave = 1;
spec.nosave = true;
} else if (!strcmp (attr->name, "void_return")) {
spec.void_return = 1;
spec.void_return = true;
} else {
warning (0, "skipping unknown attribute '%s'", attr->name);
}
@ -304,13 +304,13 @@ spec_merge (specifier_t spec, specifier_t new)
}
} else if (!spec.multi_type) {
error (0, "two or more data types in declaration specifiers");
spec.multi_type = 1;
spec.multi_type = true;
}
}
if (new.is_typedef || !storage_auto (new)) {
if ((spec.is_typedef || !storage_auto (spec)) && !spec.multi_store) {
error (0, "multiple storage classes in declaration specifiers");
spec.multi_store = 1;
spec.multi_store = true;
}
spec.storage = new.storage;
spec.is_typedef = new.is_typedef;
@ -319,13 +319,13 @@ spec_merge (specifier_t spec, specifier_t new)
|| (new.is_signed && spec.is_unsigned)) {
if (!spec.multi_type) {
error (0, "both signed and unsigned in declaration specifiers");
spec.multi_type = 1;
spec.multi_type = true;
}
}
if ((new.is_long && spec.is_short) || (new.is_short && spec.is_long)) {
if (!spec.multi_store) {
error (0, "both long and short in declaration specifiers");
spec.multi_store = 1;
spec.multi_store = true;
}
}
spec.sym = new.sym;
@ -2677,10 +2677,10 @@ static keyword_t qf_keywords[] = {
{"quaternion", QC_TYPE_SPEC, .spec = { .type = &type_quaternion } },
{"double", QC_TYPE_SPEC, .spec = { .type = &type_double } },
{"int", QC_TYPE_SPEC, .spec = { .type = &type_int } },
{"unsigned", QC_TYPE_SPEC, .spec = { .is_unsigned = 1 } },
{"signed", QC_TYPE_SPEC, .spec = { .is_signed = 1 } },
{"long", QC_TYPE_SPEC, .spec = { .is_long = 1 } },
{"short", QC_TYPE_SPEC, .spec = { .is_short = 1 } },
{"unsigned", QC_TYPE_SPEC, .spec = { .is_unsigned = true } },
{"signed", QC_TYPE_SPEC, .spec = { .is_signed = true } },
{"long", QC_TYPE_SPEC, .spec = { .is_long = true } },
{"short", QC_TYPE_SPEC, .spec = { .is_short = true } },
{"@function", QC_TYPE_SPEC, .spec = { .type = &type_func } },
{"@args", QC_ARGS, },

14
tools/qfcc/source/type.c
View file

@ -465,29 +465,29 @@ default_type (specifier_t spec, symbol_t *sym)
if (is_float (spec.type) && !spec.multi_type) {
// no modifieres allowed
if (spec.is_unsigned) {
spec.multi_type = 1;
spec.multi_type = true;
error (0, "both unsigned and float in declaration specifiers");
} else if (spec.is_signed) {
spec.multi_type = 1;
spec.multi_type = true;
error (0, "both signed and float in declaration specifiers");
} else if (spec.is_short) {
spec.multi_type = 1;
spec.multi_type = true;
error (0, "both short and float in declaration specifiers");
} else if (spec.is_long) {
spec.multi_type = 1;
spec.multi_type = true;
error (0, "both long and float in declaration specifiers");
}
}
if (is_double (spec.type)) {
// long is allowed but ignored
if (spec.is_unsigned) {
spec.multi_type = 1;
spec.multi_type = true;
error (0, "both unsigned and double in declaration specifiers");
} else if (spec.is_signed) {
spec.multi_type = 1;
spec.multi_type = true;
error (0, "both signed and double in declaration specifiers");
} else if (spec.is_short) {
spec.multi_type = 1;
spec.multi_type = true;
error (0, "both short and double in declaration specifiers");
}
}