projects
/
cparser
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
tests for __func__ and friends
[cparser]
/
ast.c
diff --git
a/ast.c
b/ast.c
index
9e90ee3
..
50eaec3
100644
(file)
--- a/
ast.c
+++ b/
ast.c
@@
-22,6
+22,8
@@
#include "ast_t.h"
#include "symbol_t.h"
#include "type_t.h"
#include "ast_t.h"
#include "symbol_t.h"
#include "type_t.h"
+#include "parser.h"
+#include "lang_features.h"
#include <assert.h>
#include <stdio.h>
#include <assert.h>
#include <stdio.h>
@@
-705,7
+707,7
@@
static void print_expression_prec(const expression_t *expression, unsigned top_p
switch(expression->kind) {
case EXPR_UNKNOWN:
case EXPR_INVALID:
switch(expression->kind) {
case EXPR_UNKNOWN:
case EXPR_INVALID:
- fprintf(out, "
*invalid expression*
");
+ fprintf(out, "
$invalid expression$
");
break;
case EXPR_CHARACTER_CONSTANT:
print_character_constant(&expression->conste);
break;
case EXPR_CHARACTER_CONSTANT:
print_character_constant(&expression->conste);
@@
-856,9
+858,7
@@
static void print_label_statement(const label_statement_t *statement)
{
fprintf(stderr, "(%p)", (void*) statement->label);
fprintf(out, "%s:\n", statement->label->symbol->string);
{
fprintf(stderr, "(%p)", (void*) statement->label);
fprintf(out, "%s:\n", statement->label->symbol->string);
- if(statement->statement != NULL) {
- print_statement(statement->statement);
- }
+ print_statement(statement->statement);
}
/**
}
/**
@@
-868,12
+868,10
@@
static void print_label_statement(const label_statement_t *statement)
*/
static void print_if_statement(const if_statement_t *statement)
{
*/
static void print_if_statement(const if_statement_t *statement)
{
- fputs("if(", out);
+ fputs("if
(", out);
print_expression(statement->condition);
fputs(") ", out);
print_expression(statement->condition);
fputs(") ", out);
- if(statement->true_statement != NULL) {
- print_statement(statement->true_statement);
- }
+ print_statement(statement->true_statement);
if(statement->false_statement != NULL) {
print_indent();
if(statement->false_statement != NULL) {
print_indent();
@@
-889,7
+887,7
@@
static void print_if_statement(const if_statement_t *statement)
*/
static void print_switch_statement(const switch_statement_t *statement)
{
*/
static void print_switch_statement(const switch_statement_t *statement)
{
- fputs("switch(", out);
+ fputs("switch
(", out);
print_expression(statement->expression);
fputs(") ", out);
print_statement(statement->body);
print_expression(statement->expression);
fputs(") ", out);
print_statement(statement->body);
@@
-935,6
+933,9
@@
static void print_declaration_statement(
declaration_t *declaration = statement->declarations_begin;
for( ; declaration != statement->declarations_end->next;
declaration = declaration->next) {
declaration_t *declaration = statement->declarations_begin;
for( ; declaration != statement->declarations_end->next;
declaration = declaration->next) {
+ if(declaration->storage_class == STORAGE_CLASS_ENUM_ENTRY)
+ continue;
+
if(!first) {
print_indent();
} else {
if(!first) {
print_indent();
} else {
@@
-952,7
+953,7
@@
static void print_declaration_statement(
*/
static void print_while_statement(const while_statement_t *statement)
{
*/
static void print_while_statement(const while_statement_t *statement)
{
- fputs("while(", out);
+ fputs("while
(", out);
print_expression(statement->condition);
fputs(") ", out);
print_statement(statement->body);
print_expression(statement->condition);
fputs(") ", out);
print_statement(statement->body);
@@
-968,7
+969,7
@@
static void print_do_while_statement(const do_while_statement_t *statement)
fputs("do ", out);
print_statement(statement->body);
print_indent();
fputs("do ", out);
print_statement(statement->body);
print_indent();
- fputs("while(", out);
+ fputs("while
(", out);
print_expression(statement->condition);
fputs(");\n", out);
}
print_expression(statement->condition);
fputs(");\n", out);
}
@@
-980,7
+981,7
@@
static void print_do_while_statement(const do_while_statement_t *statement)
*/
static void print_for_statement(const for_statement_t *statement)
{
*/
static void print_for_statement(const for_statement_t *statement)
{
- fputs("for(", out);
+ fputs("for
(", out);
if(statement->scope.declarations != NULL) {
assert(statement->initialisation == NULL);
print_declaration(statement->scope.declarations);
if(statement->scope.declarations != NULL) {
assert(statement->initialisation == NULL);
print_declaration(statement->scope.declarations);
@@
-1085,6
+1086,9
@@
end_of_print_asm_statement:
void print_statement(const statement_t *statement)
{
switch(statement->kind) {
void print_statement(const statement_t *statement)
{
switch(statement->kind) {
+ case STATEMENT_EMPTY:
+ fputs(";\n", out);
+ break;
case STATEMENT_COMPOUND:
print_compound_statement(&statement->compound);
break;
case STATEMENT_COMPOUND:
print_compound_statement(&statement->compound);
break;
@@
-1131,7
+1135,7
@@
void print_statement(const statement_t *statement)
print_asm_statement(&statement->asms);
break;
case STATEMENT_INVALID:
print_asm_statement(&statement->asms);
break;
case STATEMENT_INVALID:
- fprintf(out, "
*invalid statement*
");
+ fprintf(out, "
$invalid statement$
");
break;
}
}
break;
}
}
@@
-1166,7
+1170,7
@@
static void print_storage_class(storage_class_tag_t storage_class)
void print_initializer(const initializer_t *initializer)
{
if(initializer == NULL) {
void print_initializer(const initializer_t *initializer)
{
if(initializer == NULL) {
- fputs("{
NIL-INITIALIZER
}", out);
+ fputs("{}", out);
return;
}
return;
}
@@
-1184,8
+1188,9
@@
void print_initializer(const initializer_t *initializer)
for(size_t i = 0 ; i < list->len; ++i) {
const initializer_t *sub_init = list->initializers[i];
print_initializer(list->initializers[i]);
for(size_t i = 0 ; i < list->len; ++i) {
const initializer_t *sub_init = list->initializers[i];
print_initializer(list->initializers[i]);
- if(i < list->len-1 && sub_init->kind != INITIALIZER_DESIGNATOR) {
- fputs(", ", out);
+ if(i < list->len-1) {
+ if(sub_init == NULL || sub_init->kind != INITIALIZER_DESIGNATOR)
+ fputs(", ", out);
}
}
fputs(" }", out);
}
}
fputs(" }", out);
@@
-1210,10
+1215,14
@@
void print_initializer(const initializer_t *initializer)
* Print microsoft extended declaration modifiers.
*/
static void print_ms_modifiers(const declaration_t *declaration) {
* Print microsoft extended declaration modifiers.
*/
static void print_ms_modifiers(const declaration_t *declaration) {
+ if((c_mode & _MS) == 0)
+ return;
+
decl_modifiers_t modifiers = declaration->modifiers;
/* DM_FORCEINLINE handled outside. */
decl_modifiers_t modifiers = declaration->modifiers;
/* DM_FORCEINLINE handled outside. */
- if((modifiers & ~DM_FORCEINLINE) != 0 || declaration->alignment != 0 ||
+ if((modifiers & ~DM_FORCEINLINE) != 0 ||
+ declaration->alignment != 0 || declaration->deprecated != 0 ||
declaration->get_property_sym != NULL || declaration->put_property_sym != NULL) {
char *next = "(";
declaration->get_property_sym != NULL || declaration->put_property_sym != NULL) {
char *next = "(";
@@
-1245,7
+1254,7
@@
static void print_ms_modifiers(const declaration_t *declaration) {
if(modifiers & DM_NOINLINE) {
fputs(next, out); next = ", "; fputs("noinline", out);
}
if(modifiers & DM_NOINLINE) {
fputs(next, out); next = ", "; fputs("noinline", out);
}
- if(
modifiers & DM_DEPRECATED
) {
+ if(
declaration->deprecated != 0
) {
fputs(next, out); next = ", "; fputs("deprecated", out);
if(declaration->deprecated_string != NULL)
fprintf(out, "(\"%s\")", declaration->deprecated_string);
fputs(next, out); next = ", "; fputs("deprecated", out);
if(declaration->deprecated_string != NULL)
fprintf(out, "(\"%s\")", declaration->deprecated_string);
@@
-1253,6
+1262,12
@@
static void print_ms_modifiers(const declaration_t *declaration) {
if(declaration->alignment != 0) {
fputs(next, out); next = ", "; fprintf(out, "align(%u)", declaration->alignment);
}
if(declaration->alignment != 0) {
fputs(next, out); next = ", "; fprintf(out, "align(%u)", declaration->alignment);
}
+ if(modifiers & DM_RESTRICT) {
+ fputs(next, out); next = ", "; fputs("restrict", out);
+ }
+ if(modifiers & DM_NOALIAS) {
+ fputs(next, out); next = ", "; fputs("noalias", out);
+ }
if(declaration->get_property_sym != NULL || declaration->put_property_sym != NULL) {
char *comma = "";
fputs(next, out); next = ", "; fprintf(out, "property(");
if(declaration->get_property_sym != NULL || declaration->put_property_sym != NULL) {
char *comma = "";
fputs(next, out); next = ", "; fprintf(out, "property(");
@@
-1385,7
+1400,7
@@
bool is_constant_initializer(const initializer_t *initializer)
case INITIALIZER_VALUE:
return is_constant_expression(initializer->value.value);
case INITIALIZER_VALUE:
return is_constant_expression(initializer->value.value);
- case INITIALIZER_LIST:
{
+ case INITIALIZER_LIST:
for(size_t i = 0; i < initializer->list.len; ++i) {
initializer_t *sub_initializer = initializer->list.initializers[i];
if(!is_constant_initializer(sub_initializer))
for(size_t i = 0; i < initializer->list.len; ++i) {
initializer_t *sub_initializer = initializer->list.initializers[i];
if(!is_constant_initializer(sub_initializer))
@@
-1393,7
+1408,6
@@
bool is_constant_initializer(const initializer_t *initializer)
}
return true;
}
}
return true;
}
- }
panic("invalid initializer kind found");
}
panic("invalid initializer kind found");
}
@@
-1439,6
+1453,14
@@
bool is_address_constant(const expression_t *expression)
case EXPR_UNARY_TAKE_ADDRESS:
return is_object_with_constant_address(expression->unary.value);
case EXPR_UNARY_TAKE_ADDRESS:
return is_object_with_constant_address(expression->unary.value);
+ case EXPR_UNARY_DEREFERENCE: {
+ type_t *real_type = revert_automatic_type_conversion(expression->unary.value);
+ /* dereferencing a function is a NOP */
+ if(is_type_function(real_type)) {
+ return is_address_constant(expression->unary.value);
+ }
+ }
+
case EXPR_UNARY_CAST:
return is_type_pointer(skip_typeref(expression->base.type))
&& (is_constant_expression(expression->unary.value)
case EXPR_UNARY_CAST:
return is_type_pointer(skip_typeref(expression->base.type))
&& (is_constant_expression(expression->unary.value)
@@
-1486,6
+1508,8
@@
bool is_constant_expression(const expression_t *expression)
case EXPR_SIZEOF:
case EXPR_CLASSIFY_TYPE:
case EXPR_FUNCTION:
case EXPR_SIZEOF:
case EXPR_CLASSIFY_TYPE:
case EXPR_FUNCTION:
+ case EXPR_FUNCSIG:
+ case EXPR_FUNCDNAME:
case EXPR_PRETTY_FUNCTION:
case EXPR_OFFSETOF:
case EXPR_ALIGNOF:
case EXPR_PRETTY_FUNCTION:
case EXPR_OFFSETOF:
case EXPR_ALIGNOF:
@@
-1505,8
+1529,8
@@
bool is_constant_expression(const expression_t *expression)
case EXPR_UNARY_PREFIX_DECREMENT:
case EXPR_UNARY_BITFIELD_EXTRACT:
case EXPR_UNARY_ASSUME: /* has VOID type */
case EXPR_UNARY_PREFIX_DECREMENT:
case EXPR_UNARY_BITFIELD_EXTRACT:
case EXPR_UNARY_ASSUME: /* has VOID type */
- case EXPR_UNARY_DEREFERENCE:
case EXPR_UNARY_TAKE_ADDRESS:
case EXPR_UNARY_TAKE_ADDRESS:
+ case EXPR_UNARY_DEREFERENCE:
case EXPR_BINARY_ASSIGN:
case EXPR_BINARY_MUL_ASSIGN:
case EXPR_BINARY_DIV_ASSIGN:
case EXPR_BINARY_ASSIGN:
case EXPR_BINARY_MUL_ASSIGN:
case EXPR_BINARY_DIV_ASSIGN: