projects
/
cparser
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
typedef token_kind_t as int
[cparser]
/
ast.c
diff --git
a/ast.c
b/ast.c
index
2daa235
..
cb40c3f
100644
(file)
--- a/
ast.c
+++ b/
ast.c
@@
-67,13
+67,6
@@
void print_indent(void)
print_char('\t');
}
print_char('\t');
}
-static void print_stringrep(const string_t *string)
-{
- for (size_t i = 0; i < string->size; ++i) {
- print_char(string->begin[i]);
- }
-}
-
/**
* Returns 1 if a given precedence level has right-to-left
* associativity, else 0.
/**
* Returns 1 if a given precedence level has right-to-left
* associativity, else 0.
@@
-107,7
+100,6
@@
static unsigned get_expression_precedence(expression_kind_t kind)
[EXPR_LITERAL_INTEGER] = PREC_PRIMARY,
[EXPR_LITERAL_FLOATINGPOINT] = PREC_PRIMARY,
[EXPR_LITERAL_CHARACTER] = PREC_PRIMARY,
[EXPR_LITERAL_INTEGER] = PREC_PRIMARY,
[EXPR_LITERAL_FLOATINGPOINT] = PREC_PRIMARY,
[EXPR_LITERAL_CHARACTER] = PREC_PRIMARY,
- [EXPR_LITERAL_WIDE_CHARACTER] = PREC_PRIMARY,
[EXPR_LITERAL_MS_NOOP] = PREC_PRIMARY,
[EXPR_STRING_LITERAL] = PREC_PRIMARY,
[EXPR_COMPOUND_LITERAL] = PREC_UNARY,
[EXPR_LITERAL_MS_NOOP] = PREC_PRIMARY,
[EXPR_STRING_LITERAL] = PREC_PRIMARY,
[EXPR_COMPOUND_LITERAL] = PREC_UNARY,
@@
-198,6
+190,8
@@
static unsigned get_expression_precedence(expression_kind_t kind)
*/
static void print_quoted_string(const string_t *const string, char border)
{
*/
static void print_quoted_string(const string_t *const string, char border)
{
+ print_string(get_string_encoding_prefix(string->encoding));
+
print_char(border);
const char *end = string->begin + string->size;
for (const char *c = string->begin; c != end; ++c) {
print_char(border);
const char *end = string->begin + string->size;
for (const char *c = string->begin; c != end; ++c) {
@@
-232,10
+226,9
@@
static void print_quoted_string(const string_t *const string, char border)
print_char(border);
}
print_char(border);
}
-static void print_string_literal(
const string_literal_expression_t *literal
)
+static void print_string_literal(
string_literal_expression_t const *const literal, char const delimiter
)
{
{
- print_string(get_string_encoding_prefix(literal->encoding));
- print_quoted_string(&literal->value, '"');
+ print_quoted_string(&literal->value, delimiter);
}
static void print_literal(const literal_expression_t *literal)
}
static void print_literal(const literal_expression_t *literal)
@@
-248,16
+241,9
@@
static void print_literal(const literal_expression_t *literal)
case EXPR_LITERAL_BOOLEAN:
case EXPR_LITERAL_FLOATINGPOINT:
case EXPR_LITERAL_INTEGER:
case EXPR_LITERAL_BOOLEAN:
case EXPR_LITERAL_FLOATINGPOINT:
case EXPR_LITERAL_INTEGER:
- print_stringrep(&literal->value);
- print_stringrep(&literal->suffix);
+ print_string(literal->value.begin);
return;
return;
- case EXPR_LITERAL_WIDE_CHARACTER:
- print_char('L');
- /* FALLTHROUGH */
- case EXPR_LITERAL_CHARACTER:
- print_quoted_string(&literal->value, '\'');
- return;
default:
break;
}
default:
break;
}
@@
-461,11
+447,10
@@
static void print_array_expression(const array_access_expression_t *expression)
*/
static void print_typeprop_expression(const typeprop_expression_t *expression)
{
*/
static void print_typeprop_expression(const typeprop_expression_t *expression)
{
- if (expression->base.kind == EXPR_SIZEOF) {
- print_string("sizeof");
- } else {
- assert(expression->base.kind == EXPR_ALIGNOF);
- print_string("__alignof__");
+ switch (expression->base.kind) {
+ case EXPR_SIZEOF: print_string("sizeof"); break;
+ case EXPR_ALIGNOF: print_string("__alignof__"); break;
+ default: panic("invalid typeprop kind");
}
if (expression->tp_expression != NULL) {
/* PREC_TOP: always print the '()' here, sizeof x is right but unusual */
}
if (expression->tp_expression != NULL) {
/* PREC_TOP: always print the '()' here, sizeof x is right but unusual */
@@
-658,6
+643,7
@@
static bool needs_parentheses(expression_t const *const expr, unsigned const top
case EXPR_ENUM_CONSTANT:
case EXPR_FUNCNAME:
case EXPR_LITERAL_CASES:
case EXPR_ENUM_CONSTANT:
case EXPR_FUNCNAME:
case EXPR_LITERAL_CASES:
+ case EXPR_LITERAL_CHARACTER:
case EXPR_REFERENCE:
case EXPR_STRING_LITERAL:
/* Do not print () around subexpressions consisting of a single token. */
case EXPR_REFERENCE:
case EXPR_STRING_LITERAL:
/* Do not print () around subexpressions consisting of a single token. */
@@
-702,12
+688,13
@@
static void print_expression_prec(expression_t const *expr, unsigned const top_p
case EXPR_FUNCNAME: print_funcname( &expr->funcname); break;
case EXPR_LABEL_ADDRESS: print_label_address_expression(&expr->label_address); break;
case EXPR_LITERAL_CASES: print_literal( &expr->literal); break;
case EXPR_FUNCNAME: print_funcname( &expr->funcname); break;
case EXPR_LABEL_ADDRESS: print_label_address_expression(&expr->label_address); break;
case EXPR_LITERAL_CASES: print_literal( &expr->literal); break;
+ case EXPR_LITERAL_CHARACTER: print_string_literal( &expr->string_literal, '\''); break;
case EXPR_OFFSETOF: print_offsetof_expression( &expr->offsetofe); break;
case EXPR_REFERENCE:
case EXPR_ENUM_CONSTANT: print_reference_expression( &expr->reference); break;
case EXPR_SELECT: print_select( &expr->select); break;
case EXPR_STATEMENT: print_statement_expression( &expr->statement); break;
case EXPR_OFFSETOF: print_offsetof_expression( &expr->offsetofe); break;
case EXPR_REFERENCE:
case EXPR_ENUM_CONSTANT: print_reference_expression( &expr->reference); break;
case EXPR_SELECT: print_select( &expr->select); break;
case EXPR_STATEMENT: print_statement_expression( &expr->statement); break;
- case EXPR_STRING_LITERAL: print_string_literal( &expr->string_literal
);
break;
+ case EXPR_STRING_LITERAL: print_string_literal( &expr->string_literal
, '"');
break;
case EXPR_UNARY_CASES: print_unary_expression( &expr->unary); break;
case EXPR_VA_ARG: print_va_arg( &expr->va_arge); break;
case EXPR_VA_COPY: print_va_copy( &expr->va_copye); break;
case EXPR_UNARY_CASES: print_unary_expression( &expr->unary); break;
case EXPR_VA_ARG: print_va_arg( &expr->va_arge); break;
case EXPR_VA_COPY: print_va_copy( &expr->va_copye); break;
@@
-1187,13
+1174,12
@@
void print_initializer(const initializer_t *initializer)
}
switch (initializer->kind) {
}
switch (initializer->kind) {
- case INITIALIZER_
VALUE: {
- const initializer_value_t *value = &initializer->value;
- print_assignment_expression(
value->
value);
+ case INITIALIZER_
STRING:
+ case INITIALIZER_VALUE:
+ print_assignment_expression(
initializer->value.
value);
return;
return;
- }
+
case INITIALIZER_LIST: {
case INITIALIZER_LIST: {
- assert(initializer->kind == INITIALIZER_LIST);
print_string("{ ");
const initializer_list_t *list = &initializer->list;
print_string("{ ");
const initializer_list_t *list = &initializer->list;
@@
-1208,12
+1194,7
@@
void print_initializer(const initializer_t *initializer)
print_string(" }");
return;
}
print_string(" }");
return;
}
- case INITIALIZER_STRING:
- print_quoted_string(&initializer->string.string, '"');
- return;
- case INITIALIZER_WIDE_STRING:
- print_quoted_string(&initializer->string.string, '"');
- return;
+
case INITIALIZER_DESIGNATOR:
print_designator(initializer->designator.designator);
print_string(" = ");
case INITIALIZER_DESIGNATOR:
print_designator(initializer->designator.designator);
print_string(" = ");
@@
-1502,7
+1483,6
@@
expression_classification_t is_constant_initializer(const initializer_t *initial
{
switch (initializer->kind) {
case INITIALIZER_STRING:
{
switch (initializer->kind) {
case INITIALIZER_STRING:
- case INITIALIZER_WIDE_STRING:
case INITIALIZER_DESIGNATOR:
return EXPR_CLASS_CONSTANT;
case INITIALIZER_DESIGNATOR:
return EXPR_CLASS_CONSTANT;
@@
-1782,6
+1762,7
@@
expression_classification_t is_constant_expression(const expression_t *expressio
{
switch (expression->kind) {
case EXPR_LITERAL_CASES:
{
switch (expression->kind) {
case EXPR_LITERAL_CASES:
+ case EXPR_LITERAL_CHARACTER:
case EXPR_CLASSIFY_TYPE:
case EXPR_OFFSETOF:
case EXPR_ALIGNOF:
case EXPR_CLASSIFY_TYPE:
case EXPR_OFFSETOF:
case EXPR_ALIGNOF: