projects
/
cparser
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
- implemented -Wsign-compare
[cparser]
/
ast.c
diff --git
a/ast.c
b/ast.c
index
a8b66e0
..
a35a73a
100644
(file)
--- a/
ast.c
+++ b/
ast.c
@@
-14,6
+14,7
@@
struct obstack ast_obstack;
static FILE *out;
static int indent;
static FILE *out;
static int indent;
+static int print_implicit_casts = 1;
static void print_statement(const statement_t *statement);
static void print_statement(const statement_t *statement);
@@
-36,15
+37,15
@@
static void print_const(const const_expression_t *cnst)
if(is_type_integer(cnst->expression.datatype)) {
fprintf(out, "%lld", cnst->v.int_value);
if(is_type_integer(cnst->expression.datatype)) {
fprintf(out, "%lld", cnst->v.int_value);
- } else if(is_type_float
ing
(cnst->expression.datatype)) {
+ } else if(is_type_float(cnst->expression.datatype)) {
fprintf(out, "%Lf", cnst->v.float_value);
}
}
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);
{
fputc('"', out);
- for
(const char *c = string; *c != '\0'
; ++c) {
+ for
(const char *c = string->begin, *const end = c + string->size; c != end
; ++c) {
switch(*c) {
case '\"': fputs("\\\"", out); break;
case '\\': fputs("\\\\", out); break;
switch(*c) {
case '\"': fputs("\\\"", out); break;
case '\\': fputs("\\\\", out); break;
@@
-58,7
+59,7
@@
static void print_quoted_string(const char *string)
case '\?': fputs("\\?", out); break;
default:
if(!isprint(*c)) {
case '\?': fputs("\\?", out); break;
default:
if(!isprint(*c)) {
- fprintf(out, "\\
x%x
", *c);
+ fprintf(out, "\\
%03o
", *c);
break;
}
fputc(*c, out);
break;
}
fputc(*c, out);
@@
-71,7
+72,7
@@
static void print_quoted_string(const char *string)
static void print_string_literal(
const string_literal_expression_t *string_literal)
{
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_wide_string_literal(
@@
-203,6
+204,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_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);
case EXPR_UNARY_POSTFIX_INCREMENT:
fputs("(", out);
print_expression(unexpr->value);
@@
-215,14
+220,17
@@
static void print_unary_expression(const unary_expression_t *unexpr)
fputs(")", out);
fputs("--", out);
return;
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);
fputs(")", out);
break;
case EXPR_UNARY_CAST:
fputs("(", out);
print_type(unexpr->expression.datatype);
fputs(")", out);
break;
- case EXPR_UNARY_CAST_IMPLICIT:
- print_expression(unexpr->value);
- return;
case EXPR_UNARY_ASSUME:
fputs("__assume", out);
break;
case EXPR_UNARY_ASSUME:
fputs("__assume", out);
break;
@@
-256,12
+264,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->expression.kind == EXPR_SIZEOF) {
+ fputs("sizeof", out);
+ } else {
+ assert(expression->expression.kind == EXPR_ALIGNOF);
+ fputs("__alignof__", out);
+ }
+ if(expression->tp_expression != NULL) {
fputc('(', out);
fputc('(', out);
- print_expression(expression->
size
_expression);
+ print_expression(expression->
tp
_expression);
fputc(')', out);
} else {
fputc('(', out);
fputc(')', out);
} else {
fputc('(', out);
@@
-270,13
+283,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);
static void print_builtin_symbol(const builtin_symbol_expression_t *expression)
{
fputs(expression->symbol->string, out);
@@
-419,10
+425,8
@@
void print_expression(const expression_t *expression)
print_unary_expression(&expression->unary);
break;
case EXPR_SIZEOF:
print_unary_expression(&expression->unary);
break;
case EXPR_SIZEOF:
- print_sizeof_expression(&expression->sizeofe);
- break;
case EXPR_ALIGNOF:
case EXPR_ALIGNOF:
- print_
alignof_expression(&expression->alignofe
);
+ print_
typeprop_expression(&expression->typeprop
);
break;
case EXPR_BUILTIN_SYMBOL:
print_builtin_symbol(&expression->builtin_symbol);
break;
case EXPR_BUILTIN_SYMBOL:
print_builtin_symbol(&expression->builtin_symbol);
@@
-584,10
+588,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);
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);
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);
panic("multiple declarations in for statement not supported yet");
}
fputc(' ', out);
@@
-618,7
+622,7
@@
static void print_asm_constraints(asm_constraint_t *constraints)
if(constraint->symbol) {
fprintf(out, "[%s] ", constraint->symbol->string);
}
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);
fputs(" (", out);
print_expression(constraint->expression);
fputs(")", out);
@@
-632,7
+636,7
@@
static void print_asm_clobbers(asm_clobber_t *clobbers)
if(clobber != clobbers)
fputs(", ", out);
if(clobber != clobbers)
fputs(", ", out);
- print_quoted_string(clobber->clobber);
+ print_quoted_string(
&
clobber->clobber);
}
}
}
}
@@
-643,7
+647,7
@@
static void print_asm_statement(const asm_statement_t *statement)
fputs("volatile ", out);
}
fputs("(", out);
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;
if(statement->inputs == NULL && statement->outputs == NULL
&& statement->clobbers == NULL)
goto end_of_print_asm_statement;
@@
-761,13
+765,13
@@
static void print_normal_declaration(const declaration_t *declaration)
{
print_storage_class(declaration->storage_class);
if(declaration->is_inline) {
{
print_storage_class(declaration->storage_class);
if(declaration->is_inline) {
- if (declaration->
decl_
modifiers & DM_FORCEINLINE)
+ if (declaration->modifiers & DM_FORCEINLINE)
fputs("__forceinline ", out);
else
fputs("inline ", out);
}
print_type_ext(declaration->type, declaration->symbol,
fputs("__forceinline ", out);
else
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) {
if(declaration->type->kind == TYPE_FUNCTION) {
if(declaration->init.statement != NULL) {
@@
-820,7
+824,7
@@
void print_ast(const translation_unit_t *unit)
{
inc_type_visited();
{
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;
for( ; declaration != NULL; declaration = declaration->next) {
if(declaration->storage_class == STORAGE_CLASS_ENUM_ENTRY)
continue;
@@
-861,6
+865,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_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:
case EXPR_UNARY_ASSUME: /* has VOID type */
case EXPR_BINARY_ASSIGN:
case EXPR_BINARY_MUL_ASSIGN: