projects
/
cparser
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
change back union stuff and expriment with new union mode for initializers
[cparser]
/
ast.c
diff --git
a/ast.c
b/ast.c
index
3d8c045
..
984df78
100644
(file)
--- a/
ast.c
+++ b/
ast.c
@@
-35,7
+35,7
@@
static void print_const(const const_t *cnst)
return;
if(is_type_integer(cnst->expression.datatype)) {
return;
if(is_type_integer(cnst->expression.datatype)) {
- fprintf(out, "%d", cnst->v.int_value);
+ fprintf(out, "%
ll
d", cnst->v.int_value);
} else if(is_type_floating(cnst->expression.datatype)) {
fprintf(out, "%Lf", cnst->v.float_value);
}
} else if(is_type_floating(cnst->expression.datatype)) {
fprintf(out, "%Lf", cnst->v.float_value);
}
@@
-161,7
+161,7
@@
static void print_unary_expression(const unary_expression_t *unexpr)
fputs(")", out);
break;
case UNEXPR_INVALID:
fputs(")", out);
break;
case UNEXPR_INVALID:
- fprintf(out, "unop%d", unexpr->type);
+ fprintf(out, "unop%d",
(int)
unexpr->type);
break;
}
fputs("(", out);
break;
}
fputs("(", out);
@@
-234,9
+234,18
@@
static void print_select(const select_expression_t *expression)
fputs(expression->symbol->string, out);
}
fputs(expression->symbol->string, out);
}
+static void print_classify_type_expression(
+ const classify_type_expression_t *const expr)
+{
+ fputs("__builtin_classify_type(", out);
+ print_expression(expr->type_expression);
+ fputc(')', out);
+}
+
void print_expression(const expression_t *expression)
{
switch(expression->type) {
void print_expression(const expression_t *expression)
{
switch(expression->type) {
+ case EXPR_UNKNOWN:
case EXPR_INVALID:
fprintf(out, "*invalid expression*");
break;
case EXPR_INVALID:
fprintf(out, "*invalid expression*");
break;
@@
-278,11
+287,14
@@
void print_expression(const expression_t *expression)
case EXPR_SELECT:
print_select((const select_expression_t*) expression);
break;
case EXPR_SELECT:
print_select((const select_expression_t*) expression);
break;
+ case EXPR_CLASSIFY_TYPE:
+ print_classify_type_expression((const classify_type_expression_t*)expression);
+ break;
case EXPR_OFFSETOF:
case EXPR_STATEMENT:
/* TODO */
case EXPR_OFFSETOF:
case EXPR_STATEMENT:
/* TODO */
- fprintf(out, "some expression of type %d", expression->type);
+ fprintf(out, "some expression of type %d",
(int)
expression->type);
break;
}
}
break;
}
}
@@
-368,6
+380,7
@@
static void print_case_label(const case_label_statement_t *statement)
print_expression(statement->expression);
fputs(":\n", out);
}
print_expression(statement->expression);
fputs(":\n", out);
}
+ print_statement(statement->label_statement);
}
static void print_declaration_statement(
}
static void print_declaration_statement(
@@
-500,27
+513,33
@@
static void print_storage_class(storage_class_t storage_class)
void print_initializer(const initializer_t *initializer)
{
if(initializer->type == INITIALIZER_VALUE) {
void print_initializer(const initializer_t *initializer)
{
if(initializer->type == INITIALIZER_VALUE) {
- print_expression(initializer->v.value);
+ const initializer_value_t *value = &initializer->value;
+ print_expression(value->value);
return;
}
assert(initializer->type == INITIALIZER_LIST);
fputs("{ ", out);
return;
}
assert(initializer->type == INITIALIZER_LIST);
fputs("{ ", out);
-
initializer_t *iter = initializer->v.
list;
- for( ; iter != NULL; iter = iter->next) {
- print_initializer(iter);
- if(i
ter->next != NULL
) {
+
const initializer_list_t *list = &initializer->
list;
+
+ for(size_t i = 0 ; i < list->len; ++i) {
+ if(i
> 0
) {
fputs(", ", out);
}
fputs(", ", out);
}
+ print_initializer(list->initializers[i]);
}
fputs("}", out);
}
static void print_normal_declaration(const declaration_t *declaration)
{
}
fputs("}", out);
}
static void print_normal_declaration(const declaration_t *declaration)
{
- print_storage_class(declaration->storage_class);
+ print_storage_class(
(storage_class_t)
declaration->storage_class);
print_type_ext(declaration->type, declaration->symbol,
&declaration->context);
print_type_ext(declaration->type, declaration->symbol,
&declaration->context);
+ if(declaration->is_inline) {
+ fputs("inline ", out);
+ }
+
if(declaration->type->type == TYPE_FUNCTION) {
if(declaration->init.statement != NULL) {
fputs("\n", out);
if(declaration->type->type == TYPE_FUNCTION) {
if(declaration->init.statement != NULL) {
fputs("\n", out);
@@
-536,11
+555,11
@@
static void print_normal_declaration(const declaration_t *declaration)
void print_declaration(const declaration_t *declaration)
{
void print_declaration(const declaration_t *declaration)
{
- if(declaration->namesp
ace
!= NAMESPACE_NORMAL &&
+ if(declaration->namesp
c
!= NAMESPACE_NORMAL &&
declaration->symbol == NULL)
return;
declaration->symbol == NULL)
return;
- switch(declaration->namesp
ace
) {
+ switch(declaration->namesp
c
) {
case NAMESPACE_NORMAL:
print_normal_declaration(declaration);
break;
case NAMESPACE_NORMAL:
print_normal_declaration(declaration);
break;
@@
-577,7
+596,7
@@
void print_ast(const translation_unit_t *unit)
for( ; declaration != NULL; declaration = declaration->next) {
if(declaration->storage_class == STORAGE_CLASS_ENUM_ENTRY)
continue;
for( ; declaration != NULL; declaration = declaration->next) {
if(declaration->storage_class == STORAGE_CLASS_ENUM_ENTRY)
continue;
- if(declaration->namesp
ace
!= NAMESPACE_NORMAL &&
+ if(declaration->namesp
c
!= NAMESPACE_NORMAL &&
declaration->symbol == NULL)
continue;
declaration->symbol == NULL)
continue;