projects
/
cparser
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update NEWS.
[cparser]
/
type.c
diff --git
a/type.c
b/type.c
index
6640145
..
5134fd5
100644
(file)
--- a/
type.c
+++ b/
type.c
@@
-52,6
+52,12
@@
static atomic_type_properties_t atomic_type_properties[ATOMIC_TYPE_LAST+1] = {
.alignment = 0,
.flags = ATOMIC_TYPE_FLAG_NONE
},
.alignment = 0,
.flags = ATOMIC_TYPE_FLAG_NONE
},
+ [ATOMIC_TYPE_WCHAR_T] = {
+ .size = (unsigned)-1,
+ .alignment = (unsigned)-1,
+ /* signed flag will be set when known */
+ .flags = ATOMIC_TYPE_FLAG_INTEGER | ATOMIC_TYPE_FLAG_ARITHMETIC,
+ },
[ATOMIC_TYPE_CHAR] = {
.size = 1,
.alignment = 1,
[ATOMIC_TYPE_CHAR] = {
.size = 1,
.alignment = 1,
@@
-177,6
+183,8
@@
void init_types(void)
/* TODO: make this configurable for platforms which do not use byte sized
* bools. */
props[ATOMIC_TYPE_BOOL] = props[ATOMIC_TYPE_UCHAR];
/* TODO: make this configurable for platforms which do not use byte sized
* bools. */
props[ATOMIC_TYPE_BOOL] = props[ATOMIC_TYPE_UCHAR];
+
+ props[ATOMIC_TYPE_WCHAR_T] = props[wchar_atomic_kind];
}
void exit_types(void)
}
void exit_types(void)
@@
-216,6
+224,7
@@
const char *get_atomic_kind_name(atomic_type_kind_t kind)
switch(kind) {
case ATOMIC_TYPE_INVALID: break;
case ATOMIC_TYPE_VOID: return "void";
switch(kind) {
case ATOMIC_TYPE_INVALID: break;
case ATOMIC_TYPE_VOID: return "void";
+ case ATOMIC_TYPE_WCHAR_T: return "wchar_t";
case ATOMIC_TYPE_BOOL: return c_mode & _CXX ? "bool" : "_Bool";
case ATOMIC_TYPE_CHAR: return "char";
case ATOMIC_TYPE_SCHAR: return "signed char";
case ATOMIC_TYPE_BOOL: return c_mode & _CXX ? "bool" : "_Bool";
case ATOMIC_TYPE_CHAR: return "char";
case ATOMIC_TYPE_SCHAR: return "signed char";
@@
-356,15
+365,19
@@
static void print_function_type_post(const function_type_t *type,
}
} else {
entity_t *parameter = parameters->entities;
}
} else {
entity_t *parameter = parameters->entities;
- for
(
; parameter != NULL; parameter = parameter->base.next) {
+ for
(
; parameter != NULL; parameter = parameter->base.next) {
if (first) {
first = false;
} else {
fputs(", ", out);
}
assert(is_declaration(parameter));
if (first) {
first = false;
} else {
fputs(", ", out);
}
assert(is_declaration(parameter));
- print_type_ext(parameter->declaration.type, parameter->base.symbol,
- NULL);
+ const type_t *const type = parameter->declaration.type;
+ if (type == NULL) {
+ fputs(parameter->base.symbol->string, out);
+ } else {
+ print_type_ext(type, parameter->base.symbol, NULL);
+ }
}
}
if (type->variadic) {
}
}
if (type->variadic) {
@@
-397,10
+410,11
@@
static void print_pointer_type_pre(const pointer_type_t *type)
fputs(variable->base.base.symbol->string, out);
fputs(") ", out);
}
fputs(variable->base.base.symbol->string, out);
fputs(") ", out);
}
- fput
s("*"
, out);
-
print_type_qualifiers(type->base.qualifiers)
;
- if (
type->base.qualifiers
!= 0)
+ fput
c('*'
, out);
+
type_qualifiers_t const qual = type->base.qualifiers
;
+ if (
qual
!= 0)
fputc(' ', out);
fputc(' ', out);
+ print_type_qualifiers(qual);
}
/**
}
/**
@@
-494,9
+508,9
@@
void print_enum_definition(const enum_t *enume)
entry = entry->base.next) {
print_indent();
entry = entry->base.next) {
print_indent();
- fp
rintf(out, "%s", entry->base.symbol->string
);
+ fp
uts(entry->base.symbol->string, out
);
if (entry->enum_value.value != NULL) {
if (entry->enum_value.value != NULL) {
- fp
rintf(out, " = "
);
+ fp
uts(" = ", out
);
/* skip the implicit cast */
expression_t *expression = entry->enum_value.value;
/* skip the implicit cast */
expression_t *expression = entry->enum_value.value;
@@
-505,12
+519,12
@@
void print_enum_definition(const enum_t *enume)
}
print_expression(expression);
}
}
print_expression(expression);
}
- fp
rintf(out, ",\n"
);
+ fp
uts(",\n", out
);
}
change_indent(-1);
print_indent();
}
change_indent(-1);
print_indent();
- fput
s("}"
, out);
+ fput
c('}'
, out);
}
/**
}
/**
@@
-553,7
+567,7
@@
void print_compound_definition(const compound_t *compound)
change_indent(-1);
print_indent();
change_indent(-1);
print_indent();
- fput
s("}"
, out);
+ fput
c('}'
, out);
if (compound->modifiers & DM_TRANSPARENT_UNION) {
fputs("__attribute__((__transparent_union__))", out);
}
if (compound->modifiers & DM_TRANSPARENT_UNION) {
fputs("__attribute__((__transparent_union__))", out);
}