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.
[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_WIDE_STRING_LITERAL] = PREC_PRIMARY,
[EXPR_COMPOUND_LITERAL] = PREC_UNARY,
[EXPR_CALL] = PREC_POSTFIX,
[EXPR_CONDITIONAL] = PREC_CONDITIONAL,
*
* @param string the string constant
* @param border the border char
- * @param skip number of chars to skip at the end
*/
-static void print_quoted_string(const string_t *const string, char border,
- int skip)
+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 - skip;
+ const char *end = string->begin + string->size;
for (const char *c = string->begin; c != end; ++c) {
const char tc = *c;
if (tc == 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)
{
- if (literal->base.kind == EXPR_WIDE_STRING_LITERAL) {
- print_char('L');
- }
- print_quoted_string(&literal->value, '"', 1);
+ print_quoted_string(&literal->value, delimiter);
}
static void print_literal(const literal_expression_t *literal)
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;
- case EXPR_LITERAL_WIDE_CHARACTER:
- print_char('L');
- /* FALLTHROUGH */
- case EXPR_LITERAL_CHARACTER:
- print_quoted_string(&literal->value, '\'', 0);
- return;
default:
break;
}
*/
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 */
print_string("__builtin_va_start(");
print_assignment_expression(expression->ap);
print_string(", ");
- print_string(expression->parameter->base.base.symbol->string);
+ print_assignment_expression(expression->parameter);
print_char(')');
}
print_char(')');
}
+static bool needs_parentheses(expression_t const *const expr, unsigned const top_prec)
+{
+ if (expr->base.parenthesized)
+ return true;
+
+ if (top_prec > get_expression_precedence(expr->base.kind))
+ return true;
+
+ if (print_parenthesis && top_prec != PREC_BOTTOM) {
+ switch (expr->kind) {
+ 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. */
+ return false;
+
+ default:
+ return true;
+ }
+ }
+
+ return false;
+}
+
/**
* Prints an expression with parenthesis if needed.
*
expr = expr->unary.value;
}
- bool parenthesized =
- expr->base.parenthesized ||
- (print_parenthesis && top_prec != PREC_BOTTOM) ||
- top_prec > get_expression_precedence(expr->base.kind);
+ bool const parenthesized = needs_parentheses(expr, top_prec);
if (parenthesized)
print_char('(');
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_STRING_LITERAL:
- case EXPR_WIDE_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;
if (argument->symbol) {
print_format("[%s] ", argument->symbol->string);
}
- print_quoted_string(&argument->constraints, '"', 1);
+ print_quoted_string(&argument->constraints, '"');
print_string(" (");
print_expression(argument->expression);
print_char(')');
if (clobber != clobbers)
print_string(", ");
- print_quoted_string(&clobber->clobber, '"', 1);
+ print_quoted_string(&clobber->clobber, '"');
}
}
print_string("volatile ");
}
print_char('(');
- print_quoted_string(&statement->asm_text, '"', 1);
+ print_quoted_string(&statement->asm_text, '"');
if (statement->outputs == NULL &&
statement->inputs == NULL &&
statement->clobbers == NULL)
}
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;
- }
+
case INITIALIZER_LIST: {
- assert(initializer->kind == INITIALIZER_LIST);
print_string("{ ");
const initializer_list_t *list = &initializer->list;
print_string(" }");
return;
}
- case INITIALIZER_STRING:
- print_quoted_string(&initializer->string.string, '"', 1);
- return;
- case INITIALIZER_WIDE_STRING:
- print_quoted_string(&initializer->string.string, '"', 1);
- return;
+
case INITIALIZER_DESIGNATOR:
print_designator(initializer->designator.designator);
print_string(" = ");
{
switch (initializer->kind) {
case INITIALIZER_STRING:
- case INITIALIZER_WIDE_STRING:
case INITIALIZER_DESIGNATOR:
return EXPR_CLASS_CONSTANT;
{
switch (expression->kind) {
case EXPR_STRING_LITERAL:
- case EXPR_WIDE_STRING_LITERAL:
case EXPR_FUNCNAME:
case EXPR_LABEL_ADDRESS:
return EXPR_CLASS_CONSTANT;
{
switch (expression->kind) {
case EXPR_LITERAL_CASES:
+ case EXPR_LITERAL_CHARACTER:
case EXPR_CLASSIFY_TYPE:
case EXPR_OFFSETOF:
case EXPR_ALIGNOF:
}
case EXPR_STRING_LITERAL:
- case EXPR_WIDE_STRING_LITERAL:
case EXPR_FUNCNAME:
case EXPR_LABEL_ADDRESS:
case EXPR_SELECT:
projects / cparser / blobdiff