X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ast.c;h=e5d7362d56f950ccb5c387b241fa36298b97c8b8;hb=c053f36e1a184b7b8c9fc73b4a240334dbe7dcf4;hp=6a4f111df8bf54eec12ea8466e7658c8c443aa48;hpb=f6c1ead779c365453da484355686e5e23ab0023d;p=cparser diff --git a/ast.c b/ast.c index 6a4f111..e5d7362 100644 --- a/ast.c +++ b/ast.c @@ -14,6 +14,7 @@ struct obstack ast_obstack; static FILE *out; static int indent; +static int print_implicit_casts = 1; static void print_statement(const statement_t *statement); @@ -31,20 +32,21 @@ void print_indent(void) 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; @@ -58,7 +60,7 @@ static void print_quoted_string(const char *string) case '\?': fputs("\\?", out); break; default: if(!isprint(*c)) { - fprintf(out, "\\x%x", *c); + fprintf(out, "\\%03o", *c); break; } fputc(*c, out); @@ -71,7 +73,7 @@ static void print_quoted_string(const char *string) 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( @@ -140,7 +142,7 @@ static void print_call_expression(const call_expression_t *call) 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); @@ -152,7 +154,7 @@ static void print_binary_expression(const binary_expression_t *binexpr) 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; @@ -193,7 +195,7 @@ static void print_binary_expression(const binary_expression_t *binexpr) 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; @@ -203,6 +205,10 @@ static void print_unary_expression(const unary_expression_t *unexpr) 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); @@ -215,14 +221,17 @@ static void print_unary_expression(const unary_expression_t *unexpr) 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; @@ -256,12 +265,17 @@ static void print_array_expression(const array_access_expression_t *expression) } } -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); @@ -270,13 +284,6 @@ static void print_sizeof_expression(const sizeof_expression_t *expression) } } -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); @@ -329,15 +336,15 @@ static void print_va_arg(const va_arg_expression_t *expression) 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); @@ -419,10 +426,8 @@ void print_expression(const expression_t *expression) 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); @@ -482,8 +487,8 @@ static void print_compound_statement(const compound_statement_t *block) 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); } @@ -505,8 +510,8 @@ static void print_label_statement(const label_statement_t *statement) { 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); } } @@ -543,7 +548,9 @@ static void print_case_label(const case_label_statement_t *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( @@ -584,10 +591,10 @@ static void print_do_while_statement(const do_while_statement_t *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); @@ -618,7 +625,7 @@ static void print_asm_constraints(asm_constraint_t *constraints) 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); @@ -632,7 +639,7 @@ static void print_asm_clobbers(asm_clobber_t *clobbers) if(clobber != clobbers) fputs(", ", out); - print_quoted_string(clobber->clobber); + print_quoted_string(&clobber->clobber); } } @@ -643,7 +650,7 @@ static void print_asm_statement(const asm_statement_t *statement) 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; @@ -767,7 +774,7 @@ static void print_normal_declaration(const declaration_t *declaration) 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) { @@ -820,7 +827,7 @@ void print_ast(const translation_unit_t *unit) { 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; @@ -861,6 +868,7 @@ bool is_constant_expression(const expression_t *expression) 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: