static FILE *out;
static int indent;
+static int print_implicit_casts = 1;
static void print_statement(const statement_t *statement);
static void print_const(const const_expression_t *cnst)
{
- if(cnst->expression.datatype == NULL)
+ if(cnst->base.type == NULL)
return;
- if(is_type_integer(cnst->expression.datatype)) {
+ if(is_type_integer(cnst->base.type)) {
fprintf(out, "%lld", cnst->v.int_value);
- } else if(is_type_floating(cnst->expression.datatype)) {
+ } else if(is_type_float(cnst->base.type)) {
fprintf(out, "%Lf", cnst->v.float_value);
}
}
-static void print_quoted_string(const char *string)
+static void print_quoted_string(const string_t *const string)
{
fputc('"', out);
- for(const char *c = string; *c != '\0'; ++c) {
+ const char *end = string->begin + string->size;
+ for (const char *c = string->begin; c != end; ++c) {
switch(*c) {
case '\"': fputs("\\\"", out); break;
case '\\': fputs("\\\\", out); break;
case '\?': fputs("\\?", out); break;
default:
if(!isprint(*c)) {
- fprintf(out, "\\x%x", *c);
+ fprintf(out, "\\%03o", *c);
break;
}
fputc(*c, out);
static void print_string_literal(
const string_literal_expression_t *string_literal)
{
- print_quoted_string(string_literal->value);
+ print_quoted_string(&string_literal->value);
}
static void print_wide_string_literal(
static void print_binary_expression(const binary_expression_t *binexpr)
{
- if(binexpr->expression.kind == EXPR_BINARY_BUILTIN_EXPECT) {
+ if(binexpr->base.kind == EXPR_BINARY_BUILTIN_EXPECT) {
fputs("__builtin_expect(", out);
print_expression(binexpr->left);
fputs(", ", out);
fprintf(out, "(");
print_expression(binexpr->left);
fprintf(out, " ");
- switch(binexpr->expression.kind) {
+ switch(binexpr->base.kind) {
case EXPR_BINARY_COMMA: fputs(",", out); break;
case EXPR_BINARY_ASSIGN: fputs("=", out); break;
case EXPR_BINARY_ADD: fputs("+", out); break;
static void print_unary_expression(const unary_expression_t *unexpr)
{
- switch(unexpr->expression.kind) {
+ switch(unexpr->base.kind) {
case EXPR_UNARY_NEGATE: fputs("-", out); break;
case EXPR_UNARY_PLUS: fputs("+", out); break;
case EXPR_UNARY_NOT: fputs("!", out); break;
case EXPR_UNARY_DEREFERENCE: fputs("*", out); break;
case EXPR_UNARY_TAKE_ADDRESS: fputs("&", out); break;
+ case EXPR_UNARY_BITFIELD_EXTRACT:
+ print_expression(unexpr->value);
+ return;
+
case EXPR_UNARY_POSTFIX_INCREMENT:
fputs("(", out);
print_expression(unexpr->value);
fputs(")", out);
fputs("--", out);
return;
+ case EXPR_UNARY_CAST_IMPLICIT:
+ if(!print_implicit_casts) {
+ print_expression(unexpr->value);
+ return;
+ }
+ /* fallthrough */
case EXPR_UNARY_CAST:
fputs("(", out);
- print_type(unexpr->expression.datatype);
+ print_type(unexpr->base.type);
fputs(")", out);
break;
- case EXPR_UNARY_CAST_IMPLICIT:
- print_expression(unexpr->value);
- return;
case EXPR_UNARY_ASSUME:
fputs("__assume", out);
break;
}
}
-static void print_sizeof_expression(const sizeof_expression_t *expression)
+static void print_typeprop_expression(const typeprop_expression_t *expression)
{
- fputs("sizeof", out);
- if(expression->size_expression != NULL) {
+ if (expression->base.kind == EXPR_SIZEOF) {
+ fputs("sizeof", out);
+ } else {
+ assert(expression->base.kind == EXPR_ALIGNOF);
+ fputs("__alignof__", out);
+ }
+ if(expression->tp_expression != NULL) {
fputc('(', out);
- print_expression(expression->size_expression);
+ print_expression(expression->tp_expression);
fputc(')', out);
} else {
fputc('(', out);
}
}
-static void print_alignof_expression(const alignof_expression_t *expression)
-{
- fputs("__alignof__(", out);
- print_type(expression->type);
- fputc(')', out);
-}
-
static void print_builtin_symbol(const builtin_symbol_expression_t *expression)
{
fputs(expression->symbol->string, out);
fputs("__builtin_va_arg(", out);
print_expression(expression->ap);
fputs(", ", out);
- print_type(expression->expression.datatype);
+ print_type(expression->base.type);
fputs(")", out);
}
static void print_select(const select_expression_t *expression)
{
print_expression(expression->compound);
- if(expression->compound->base.datatype == NULL ||
- expression->compound->base.datatype->kind == TYPE_POINTER) {
+ if(expression->compound->base.type == NULL ||
+ expression->compound->base.type->kind == TYPE_POINTER) {
fputs("->", out);
} else {
fputc('.', out);
print_unary_expression(&expression->unary);
break;
case EXPR_SIZEOF:
- print_sizeof_expression(&expression->sizeofe);
- break;
case EXPR_ALIGNOF:
- print_alignof_expression(&expression->alignofe);
+ print_typeprop_expression(&expression->typeprop);
break;
case EXPR_BUILTIN_SYMBOL:
print_builtin_symbol(&expression->builtin_symbol);
static void print_return_statement(const return_statement_t *statement)
{
fprintf(out, "return ");
- if(statement->return_value != NULL)
- print_expression(statement->return_value);
+ if(statement->value != NULL)
+ print_expression(statement->value);
fputs(";\n", out);
}
{
fprintf(stderr, "(%p)", (void*) statement->label);
fprintf(out, "%s:\n", statement->label->symbol->string);
- if(statement->label_statement != NULL) {
- print_statement(statement->label_statement);
+ if(statement->statement != NULL) {
+ print_statement(statement->statement);
}
}
print_expression(statement->expression);
fputs(":\n", out);
}
- print_statement(statement->label_statement);
+ if(statement->statement != NULL) {
+ print_statement(statement->statement);
+ }
}
static void print_declaration_statement(
static void print_for_statement(const for_statement_t *statement)
{
fputs("for(", out);
- if(statement->context.declarations != NULL) {
+ if(statement->scope.declarations != NULL) {
assert(statement->initialisation == NULL);
- print_declaration(statement->context.declarations);
- if(statement->context.declarations->next != NULL) {
+ print_declaration(statement->scope.declarations);
+ if(statement->scope.declarations->next != NULL) {
panic("multiple declarations in for statement not supported yet");
}
fputc(' ', out);
if(constraint->symbol) {
fprintf(out, "[%s] ", constraint->symbol->string);
}
- print_quoted_string(constraint->constraints);
+ print_quoted_string(&constraint->constraints);
fputs(" (", out);
print_expression(constraint->expression);
fputs(")", out);
if(clobber != clobbers)
fputs(", ", out);
- print_quoted_string(clobber->clobber);
+ print_quoted_string(&clobber->clobber);
}
}
fputs("volatile ", out);
}
fputs("(", out);
- print_quoted_string(statement->asm_text);
+ print_quoted_string(&statement->asm_text);
if(statement->inputs == NULL && statement->outputs == NULL
&& statement->clobbers == NULL)
goto end_of_print_asm_statement;
fputs("inline ", out);
}
print_type_ext(declaration->type, declaration->symbol,
- &declaration->context);
+ &declaration->scope);
if(declaration->type->kind == TYPE_FUNCTION) {
if(declaration->init.statement != NULL) {
{
inc_type_visited();
- declaration_t *declaration = unit->context.declarations;
+ declaration_t *declaration = unit->scope.declarations;
for( ; declaration != NULL; declaration = declaration->next) {
if(declaration->storage_class == STORAGE_CLASS_ENUM_ENTRY)
continue;
case EXPR_UNARY_POSTFIX_DECREMENT:
case EXPR_UNARY_PREFIX_INCREMENT:
case EXPR_UNARY_PREFIX_DECREMENT:
+ case EXPR_UNARY_BITFIELD_EXTRACT:
case EXPR_UNARY_ASSUME: /* has VOID type */
case EXPR_BINARY_ASSIGN:
case EXPR_BINARY_MUL_ASSIGN: