#include "adt/error.h"
#include "adt/array.h"
+/** if wchar_t is equal to unsigned short. */
+bool opt_short_wchar_t =
+#ifdef _WIN32
+ true;
+#else
+ false;
+#endif
+
//#define PRINT_TOKENS
#define MAX_LOOKAHEAD 2
stack_pop_to(&label_stack, new_top);
}
+static int get_akind_rank(atomic_type_kind_t akind)
+{
+ return (int) akind;
+}
static int get_rank(const type_t *type)
{
* (unsigned int would be preferable when possible... for stuff like
* struct { enum { ... } bla : 4; } ) */
if (type->kind == TYPE_ENUM)
- return ATOMIC_TYPE_INT;
+ return get_akind_rank(ATOMIC_TYPE_INT);
assert(type->kind == TYPE_ATOMIC);
- return type->atomic.akind;
+ return get_akind_rank(type->atomic.akind);
}
static type_t *promote_integer(type_t *type)
if (type->kind == TYPE_BITFIELD)
type = type->bitfield.base_type;
- if (get_rank(type) < ATOMIC_TYPE_INT)
+ if (get_rank(type) < get_akind_rank(ATOMIC_TYPE_INT))
type = type_int;
return type;
/* the left type has all qualifiers from the right type */
unsigned missing_qualifiers
= points_to_right->base.qualifiers & ~points_to_left->base.qualifiers;
- errorf(source_position,
- "destination type '%T' in %s from type '%T' lacks qualifiers '%Q' in pointed-to type",
- orig_type_left, context, orig_type_right, missing_qualifiers);
+ warningf(source_position,
+ "destination type '%T' in %s from type '%T' lacks qualifiers '%Q' in pointer target type",
+ orig_type_left, context, orig_type_right, missing_qualifiers);
return;
}
= skip_typeref(type_left->pointer.points_to);
type_t *points_to_right
= skip_typeref(type_right->pointer.points_to);
+ assign_error_t res = ASSIGN_SUCCESS;
/* the left type has all qualifiers from the right type */
unsigned missing_qualifiers
= points_to_right->base.qualifiers & ~points_to_left->base.qualifiers;
if (missing_qualifiers != 0) {
- return ASSIGN_ERROR_POINTER_QUALIFIER_MISSING;
+ res = ASSIGN_ERROR_POINTER_QUALIFIER_MISSING;
}
points_to_left = get_unqualified_type(points_to_left);
if (is_type_atomic(points_to_left, ATOMIC_TYPE_VOID) ||
is_type_atomic(points_to_right, ATOMIC_TYPE_VOID)) {
- return ASSIGN_SUCCESS;
+ return res;
}
if (!types_compatible(points_to_left, points_to_right)) {
return ASSIGN_WARNING_POINTER_INCOMPATIBLE;
}
- return ASSIGN_SUCCESS;
+ return res;
} else if (is_type_integer(type_right)) {
return ASSIGN_WARNING_POINTER_FROM_INT;
}
declaration->type = type;
declaration->symbol = symbol;
declaration->source_position = builtin_source_position;
+ declaration->implicit = true;
record_declaration(declaration);
return;
}
+static declaration_t *create_error_declaration(symbol_t *symbol, storage_class_tag_t storage_class)
+{
+ declaration_t *const decl = allocate_declaration_zero();
+ decl->source_position = *HERE;
+ decl->storage_class =
+ storage_class != STORAGE_CLASS_NONE || scope == global_scope ?
+ storage_class : STORAGE_CLASS_AUTO;
+ decl->declared_storage_class = decl->storage_class;
+ decl->symbol = symbol;
+ decl->implicit = true;
+ record_declaration(decl);
+ return decl;
+}
+
static void parse_declaration_specifiers(declaration_specifiers_t *specifiers)
{
type_t *type = NULL;
type_modifiers_t modifiers = TYPE_MODIFIER_NONE;
unsigned type_specifiers = 0;
bool newtype = false;
+ bool saw_error = false;
specifiers->source_position = token.source_position;
case T_IDENTIFIER: {
/* only parse identifier if we haven't found a type yet */
- if (type != NULL || type_specifiers != 0)
- goto finish_specifiers;
+ if (type != NULL || type_specifiers != 0) {
+ /* Be somewhat resilient to typos like 'unsigned lng* f()' in a
+ * declaration, so it doesn't generate errors about expecting '(' or
+ * '{' later on. */
+ switch (look_ahead(1)->type) {
+ STORAGE_CLASSES
+ TYPE_SPECIFIERS
+ case T_const:
+ case T_restrict:
+ case T_volatile:
+ case T_inline:
+ case T__forceinline: /* ^ DECLARATION_START except for __attribute__ */
+ case T_IDENTIFIER:
+ case '*':
+ errorf(HERE, "discarding stray %K in declaration specifier", &token);
+ next_token();
+ continue;
+
+ default:
+ goto finish_specifiers;
+ }
+ }
+
+ type_t *const typedef_type = get_typedef_type(token.v.symbol);
+ if (typedef_type == NULL) {
+ /* Be somewhat resilient to typos like 'vodi f()' at the beginning of a
+ * declaration, so it doesn't generate 'implicit int' followed by more
+ * errors later on. */
+ token_type_t const la1_type = (token_type_t)look_ahead(1)->type;
+ switch (la1_type) {
+ DECLARATION_START
+ case T_IDENTIFIER:
+ case '*': {
+ errorf(HERE, "%K does not name a type", &token);
+
+ declaration_t *const decl =
+ create_error_declaration(token.v.symbol, STORAGE_CLASS_TYPEDEF);
- type_t *typedef_type = get_typedef_type(token.v.symbol);
+ type = allocate_type_zero(TYPE_TYPEDEF, HERE);
+ type->typedeft.declaration = decl;
- if (typedef_type == NULL)
- goto finish_specifiers;
+ next_token();
+ saw_error = true;
+ if (la1_type == '*')
+ goto finish_specifiers;
+ continue;
+ }
+
+ default:
+ goto finish_specifiers;
+ }
+ }
next_token();
type = typedef_type;
}
finish_specifiers:
-
- if (type == NULL) {
+ if (type == NULL || (saw_error && type_specifiers != 0)) {
atomic_type_kind_t atomic_type;
/* match valid basic types */
default:
/* invalid specifier combination, give an error message */
if (type_specifiers == 0) {
- if (! strict_mode) {
+ if (saw_error) {
+ specifiers->type = type_error_type;
+ return;
+ }
+
+ if (!strict_mode) {
if (warning.implicit_int) {
warningf(HERE, "no type specifiers in declaration, using 'int'");
}
add_anchor_token(')');
int saved_comma_state = save_and_reset_anchor_state(',');
- if (token.type == T_IDENTIFIER) {
- symbol_t *symbol = token.v.symbol;
- if (!is_typedef_symbol(symbol)) {
+ if (token.type == T_IDENTIFIER &&
+ !is_typedef_symbol(token.v.symbol)) {
+ token_type_t la1_type = look_ahead(1)->type;
+ if (la1_type == ',' || la1_type == ')') {
type->kr_style_parameters = true;
declarations = parse_identifier_list();
goto parameters_finished;
if (warning.unused_parameter) {
const scope_t *scope = ¤t_function->scope;
+ if (is_sym_main(current_function->symbol)) {
+ /* do not issue unused warnings for main */
+ return;
+ }
const declaration_t *parameter = scope->declarations;
for (; parameter != NULL; parameter = parameter->next) {
if (! parameter->used) {
continue;
}
- expression_t *const case_expr = i->expression;
- if (is_constant_expression(case_expr) &&
- fold_constant(case_expr) == val) {
+ if (i->first_case <= val && val <= i->last_case) {
check_reachable((statement_t*)i);
return;
}
type_t *const ret = skip_typeref(type->function.return_type);
if (warning.return_type &&
!is_type_atomic(ret, ATOMIC_TYPE_VOID) &&
+ is_type_valid(ret) &&
!is_sym_main(current_function->symbol)) {
warningf(&stmt->base.source_position,
"control reaches end of non-void function");
static void check_unreachable(statement_t const* const stmt)
{
if (!stmt->base.reachable &&
- stmt->kind != STATEMENT_COMPOUND &&
stmt->kind != STATEMENT_DO_WHILE &&
- stmt->kind != STATEMENT_FOR) {
+ stmt->kind != STATEMENT_FOR &&
+ (stmt->kind != STATEMENT_COMPOUND || stmt->compound.statements == NULL)) {
warningf(&stmt->base.source_position, "statement is unreachable");
}
return;
}
+ if (warning.aggregate_return &&
+ is_type_compound(skip_typeref(type->function.return_type))) {
+ warningf(HERE, "function '%Y' returns an aggregate",
+ ndeclaration->symbol);
+ }
+
/* ยง 6.7.5.3 (14) a function definition with () means no
* parameters (and not unspecified parameters) */
if (type->function.unspecified_parameters
/* note: that we use type_char_ptr here, which is already the
* automatic converted type. revert_automatic_type_conversion
* will construct the array type */
- cnst->base.type = type_char_ptr;
+ cnst->base.type = warning.write_strings ? type_const_char_ptr : type_char_ptr;
cnst->string.value = res;
return cnst;
}
default: {
expression_t *const cnst = allocate_expression_zero(EXPR_WIDE_STRING_LITERAL);
- cnst->base.type = type_wchar_t_ptr;
+ cnst->base.type = warning.write_strings ? type_const_wchar_t_ptr : type_wchar_t_ptr;
cnst->wide_string.value = wres;
return cnst;
}
declaration->type = type;
declaration->symbol = symbol;
declaration->source_position = *source_position;
+ declaration->implicit = true;
bool strict_prototypes_old = warning.strict_prototypes;
warning.strict_prototypes = false;
next_token();
if (declaration == NULL) {
- if (! strict_mode && token.type == '(') {
- /* an implicitly defined function */
- if (warning.implicit_function_declaration) {
+ if (token.type == '(') {
+ /* an implicitly declared function */
+ if (strict_mode) {
+ errorf(HERE, "unknown symbol '%Y' found.", symbol);
+ } else if (warning.implicit_function_declaration) {
warningf(HERE, "implicit declaration of function '%Y'",
symbol);
}
&source_position);
} else {
errorf(HERE, "unknown symbol '%Y' found.", symbol);
- return create_invalid_expression();
+ declaration = create_error_declaration(symbol, STORAGE_CLASS_NONE);
}
}
- type_t *type = declaration->type;
+ type_t *type = declaration->type;
/* we always do the auto-type conversions; the & and sizeof parser contains
* code to revert this! */
return expression;
}
-static void check_cast_allowed(expression_t *expression, type_t *dest_type)
+static bool semantic_cast(expression_t *cast)
{
- (void) expression;
- (void) dest_type;
- /* TODO check if explicit cast is allowed and issue warnings/errors */
+ expression_t *expression = cast->unary.value;
+ type_t *orig_dest_type = cast->base.type;
+ type_t *orig_type_right = expression->base.type;
+ type_t const *dst_type = skip_typeref(orig_dest_type);
+ type_t const *src_type = skip_typeref(orig_type_right);
+ source_position_t const *pos = &cast->base.source_position;
+
+ /* ยง6.5.4 A (void) cast is explicitly permitted, more for documentation than for utility. */
+ if (dst_type == type_void)
+ return true;
+
+ /* only integer and pointer can be casted to pointer */
+ if (is_type_pointer(dst_type) &&
+ !is_type_pointer(src_type) &&
+ !is_type_integer(src_type) &&
+ is_type_valid(src_type)) {
+ errorf(pos, "cannot convert type '%T' to a pointer type", orig_type_right);
+ return false;
+ }
+
+ if (!is_type_scalar(dst_type) && is_type_valid(dst_type)) {
+ errorf(pos, "conversion to non-scalar type '%T' requested", orig_dest_type);
+ return false;
+ }
+
+ if (!is_type_scalar(src_type) && is_type_valid(src_type)) {
+ errorf(pos, "conversion from non-scalar type '%T' requested", orig_type_right);
+ return false;
+ }
+
+ if (warning.cast_qual &&
+ is_type_pointer(src_type) &&
+ is_type_pointer(dst_type)) {
+ type_t *src = skip_typeref(src_type->pointer.points_to);
+ type_t *dst = skip_typeref(dst_type->pointer.points_to);
+ unsigned missing_qualifiers =
+ src->base.qualifiers & ~dst->base.qualifiers;
+ if (missing_qualifiers != 0) {
+ warningf(pos,
+ "cast discards qualifiers '%Q' in pointer target type of '%T'",
+ missing_qualifiers, orig_type_right);
+ }
+ }
+ return true;
}
static expression_t *parse_compound_literal(type_t *type)
cast->base.source_position = source_position;
expression_t *value = parse_sub_expression(20);
-
- check_cast_allowed(value, type);
-
cast->base.type = type;
cast->unary.value = value;
+ if (! semantic_cast(cast)) {
+ /* TODO: record the error in the AST. else it is impossible to detect it */
+ }
+
return cast;
end_error:
return create_invalid_expression();
}
/**
- * Parse a braced expression.
+ * Parse a parenthesized expression.
*/
-static expression_t *parse_brace_expression(void)
+static expression_t *parse_parenthesized_expression(void)
{
eat('(');
add_anchor_token(')');
case T___builtin_prefetch: return parse_builtin_prefetch();
case T__assume: return parse_assume();
- case '(': return parse_brace_expression();
+ case '(': return parse_parenthesized_expression();
case T___noop: return parse_noop_expression();
}
check_format(&result->call);
+ if (warning.aggregate_return &&
+ is_type_compound(skip_typeref(function_type->return_type))) {
+ warningf(&result->base.source_position,
+ "function call has aggregate value");
+ }
+
return result;
end_error:
return create_invalid_expression();
&expression->base.source_position, condition_type_orig);
}
- expression_t *true_expression = parse_expression();
+ expression_t *true_expression = expression;
+ bool gnu_cond = false;
+ if ((c_mode & _GNUC) && token.type == ':') {
+ gnu_cond = true;
+ } else
+ true_expression = parse_expression();
rem_anchor_token(':');
expect(':');
expression_t *false_expression = parse_sub_expression(precedence);
}
conditional->true_expression
- = create_implicit_cast(true_expression, result_type);
+ = gnu_cond ? NULL : create_implicit_cast(true_expression, result_type);
conditional->false_expression
= create_implicit_cast(false_expression, result_type);
conditional->base.type = result_type;
type_t *points_to = pointer_type->pointer.points_to;
points_to = skip_typeref(points_to);
- if (is_type_incomplete(points_to) &&
- (! (c_mode & _GNUC)
- || !is_type_atomic(points_to, ATOMIC_TYPE_VOID))) {
- errorf(source_position,
- "arithmetic with pointer to incomplete type '%T' not allowed",
- orig_pointer_type);
- return false;
+ if (is_type_incomplete(points_to)) {
+ if (!(c_mode & _GNUC) || !is_type_atomic(points_to, ATOMIC_TYPE_VOID)) {
+ errorf(source_position,
+ "arithmetic with pointer to incomplete type '%T' not allowed",
+ orig_pointer_type);
+ return false;
+ } else if (warning.pointer_arith) {
+ warningf(source_position,
+ "pointer of type '%T' used in arithmetic",
+ orig_pointer_type);
+ }
} else if (is_type_function(points_to)) {
- errorf(source_position,
- "arithmetic with pointer to function type '%T' not allowed",
- orig_pointer_type);
- return false;
+ if (!(c_mode && _GNUC)) {
+ errorf(source_position,
+ "arithmetic with pointer to function type '%T' not allowed",
+ orig_pointer_type);
+ return false;
+ } else if (warning.pointer_arith) {
+ warningf(source_position,
+ "pointer to a function '%T' used in arithmetic",
+ orig_pointer_type);
+ }
}
return true;
}
bool const signed_left = is_type_signed(type_left);
bool const signed_right = is_type_signed(type_right);
- int const rank_left = get_rank(type_left);
- int const rank_right = get_rank(type_right);
+ int const rank_left = get_rank(type_left);
+ int const rank_right = get_rank(type_right);
if (signed_left == signed_right)
return rank_left >= rank_right ? type_left : type_right;
if (u_rank >= s_rank)
return u_type;
- if (get_atomic_type_size(s_rank) > get_atomic_type_size(u_rank))
+ /* casting rank to atomic_type_kind is a bit hacky, but makes things
+ * easier here... */
+ if (get_atomic_type_size((atomic_type_kind_t) s_rank)
+ > get_atomic_type_size((atomic_type_kind_t) u_rank))
return s_type;
switch (s_rank) {
- case ATOMIC_TYPE_INT: return type_int;
- case ATOMIC_TYPE_LONG: return type_long;
- case ATOMIC_TYPE_LONGLONG: return type_long_long;
+ case ATOMIC_TYPE_INT: return type_unsigned_int;
+ case ATOMIC_TYPE_LONG: return type_unsigned_long;
+ case ATOMIC_TYPE_LONGLONG: return type_unsigned_long_long;
default: panic("invalid atomic type");
}
expression->base.type = arithmetic_type;
}
+static void warn_div_by_zero(binary_expression_t const *const expression)
+{
+ if (warning.div_by_zero &&
+ is_type_integer(expression->base.type) &&
+ is_constant_expression(expression->right) &&
+ fold_constant(expression->right) == 0) {
+ warningf(&expression->base.source_position, "division by zero");
+ }
+}
+
+/**
+ * Check the semantic restrictions for a div/mod expression.
+ */
+static void semantic_divmod_arithmetic(binary_expression_t *expression) {
+ semantic_binexpr_arithmetic(expression);
+ warn_div_by_zero(expression);
+}
+
static void semantic_shift_op(binary_expression_t *expression)
{
expression_t *const left = expression->left;
expression->base.type = type_left;
}
+static void semantic_divmod_assign(binary_expression_t *expression)
+{
+ semantic_arithmetic_assign(expression);
+ warn_div_by_zero(expression);
+}
+
static void semantic_arithmetic_addsubb_assign(binary_expression_t *expression)
{
expression_t *const left = expression->left;
CREATE_BINEXPR_PARSER(',', EXPR_BINARY_COMMA, semantic_comma, 1)
CREATE_BINEXPR_PARSER('*', EXPR_BINARY_MUL, semantic_binexpr_arithmetic, 1)
-CREATE_BINEXPR_PARSER('/', EXPR_BINARY_DIV, semantic_binexpr_arithmetic, 1)
-CREATE_BINEXPR_PARSER('%', EXPR_BINARY_MOD, semantic_binexpr_arithmetic, 1)
+CREATE_BINEXPR_PARSER('/', EXPR_BINARY_DIV, semantic_divmod_arithmetic, 1)
+CREATE_BINEXPR_PARSER('%', EXPR_BINARY_MOD, semantic_divmod_arithmetic, 1)
CREATE_BINEXPR_PARSER('+', EXPR_BINARY_ADD, semantic_add, 1)
CREATE_BINEXPR_PARSER('-', EXPR_BINARY_SUB, semantic_sub, 1)
CREATE_BINEXPR_PARSER('<', EXPR_BINARY_LESS, semantic_comparison, 1)
CREATE_BINEXPR_PARSER(T_ASTERISKEQUAL, EXPR_BINARY_MUL_ASSIGN,
semantic_arithmetic_assign, 0)
CREATE_BINEXPR_PARSER(T_SLASHEQUAL, EXPR_BINARY_DIV_ASSIGN,
- semantic_arithmetic_assign, 0)
+ semantic_divmod_assign, 0)
CREATE_BINEXPR_PARSER(T_PERCENTEQUAL, EXPR_BINARY_MOD_ASSIGN,
- semantic_arithmetic_assign, 0)
+ semantic_divmod_assign, 0)
CREATE_BINEXPR_PARSER(T_LESSLESSEQUAL, EXPR_BINARY_SHIFTLEFT_ASSIGN,
semantic_arithmetic_assign, 0)
CREATE_BINEXPR_PARSER(T_GREATERGREATEREQUAL, EXPR_BINARY_SHIFTRIGHT_ASSIGN,
*pos = token.source_position;
statement->case_label.expression = parse_expression();
-
- PUSH_PARENT(statement);
+ if (! is_constant_expression(statement->case_label.expression)) {
+ errorf(pos, "case label does not reduce to an integer constant");
+ statement->case_label.is_bad = true;
+ } else {
+ long const val = fold_constant(statement->case_label.expression);
+ statement->case_label.first_case = val;
+ statement->case_label.last_case = val;
+ }
if (c_mode & _GNUC) {
if (token.type == T_DOTDOTDOT) {
next_token();
statement->case_label.end_range = parse_expression();
+ if (! is_constant_expression(statement->case_label.end_range)) {
+ errorf(pos, "case range does not reduce to an integer constant");
+ statement->case_label.is_bad = true;
+ } else {
+ long const val = fold_constant(statement->case_label.end_range);
+ statement->case_label.last_case = val;
+
+ if (val < statement->case_label.first_case) {
+ statement->case_label.is_empty = true;
+ warningf(pos, "empty range specified");
+ }
+ }
}
}
+ PUSH_PARENT(statement);
+
expect(':');
- if (! is_constant_expression(statement->case_label.expression)) {
- errorf(pos, "case label does not reduce to an integer constant");
- } else if (current_switch != NULL) {
- /* Check for duplicate case values */
- /* FIXME slow */
- long const val = fold_constant(statement->case_label.expression);
- for (case_label_statement_t *l = current_switch->first_case; l != NULL; l = l->next) {
- expression_t const* const e = l->expression;
- if (e == NULL || !is_constant_expression(e) || fold_constant(e) != val)
- continue;
+ if (current_switch != NULL) {
+ if (! statement->case_label.is_bad) {
+ /* Check for duplicate case values */
+ case_label_statement_t *c = &statement->case_label;
+ for (case_label_statement_t *l = current_switch->first_case; l != NULL; l = l->next) {
+ if (l->is_bad || l->is_empty || l->expression == NULL)
+ continue;
- errorf(pos, "duplicate case value (previously used %P)",
- &l->base.source_position);
- break;
- }
+ if (c->last_case < l->first_case || c->first_case > l->last_case)
+ continue;
+ errorf(pos, "duplicate case value (previously used %P)",
+ &l->base.source_position);
+ break;
+ }
+ }
/* link all cases into the switch statement */
if (current_switch->last_case == NULL) {
current_switch->first_case = &statement->case_label;
return create_invalid_statement();
}
-/**
- * Finds an existing default label of a switch statement.
- */
-static case_label_statement_t *
-find_default_label(const switch_statement_t *statement)
-{
- case_label_statement_t *label = statement->first_case;
- for ( ; label != NULL; label = label->next) {
- if (label->expression == NULL)
- return label;
- }
- return NULL;
-}
-
/**
* Parse a default statement.
*/
expect(':');
if (current_switch != NULL) {
- const case_label_statement_t *def_label = find_default_label(current_switch);
+ const case_label_statement_t *def_label = current_switch->default_label;
if (def_label != NULL) {
errorf(HERE, "multiple default labels in one switch (previous declared %P)",
&def_label->base.source_position);
} else {
+ current_switch->default_label = &statement->case_label;
+
/* link all cases into the switch statement */
if (current_switch->last_case == NULL) {
current_switch->first_case = &statement->case_label;
return create_invalid_statement();
}
+/**
+ * Check that all enums are handled in a switch.
+ *
+ * @param statement the switch statement to check
+ */
+static void check_enum_cases(const switch_statement_t *statement) {
+ const type_t *type = skip_typeref(statement->expression->base.type);
+ if (! is_type_enum(type))
+ return;
+ const enum_type_t *enumt = &type->enumt;
+
+ /* if we have a default, no warnings */
+ if (statement->default_label != NULL)
+ return;
+
+ /* FIXME: calculation of value should be done while parsing */
+ const declaration_t *declaration;
+ long last_value = -1;
+ for (declaration = enumt->declaration->next;
+ declaration != NULL && declaration->storage_class == STORAGE_CLASS_ENUM_ENTRY;
+ declaration = declaration->next) {
+ const expression_t *expression = declaration->init.enum_value;
+ long value = expression != NULL ? fold_constant(expression) : last_value + 1;
+ bool found = false;
+ for (const case_label_statement_t *l = statement->first_case; l != NULL; l = l->next) {
+ if (l->expression == NULL)
+ continue;
+ if (l->first_case <= value && value <= l->last_case) {
+ found = true;
+ break;
+ }
+ }
+ if (! found) {
+ warningf(&statement->base.source_position,
+ "enumeration value '%Y' not handled in switch", declaration->symbol);
+ }
+ last_value = value;
+ }
+}
+
/**
* Parse a switch statement.
*/
PUSH_PARENT(statement);
expect('(');
+ add_anchor_token(')');
expression_t *const expr = parse_expression();
type_t * type = skip_typeref(expr->base.type);
if (is_type_integer(type)) {
}
statement->switchs.expression = create_implicit_cast(expr, type);
expect(')');
+ rem_anchor_token(')');
switch_statement_t *rem = current_switch;
current_switch = &statement->switchs;
current_switch = rem;
if (warning.switch_default &&
- find_default_label(&statement->switchs) == NULL) {
+ statement->switchs.default_label == NULL) {
warningf(&statement->base.source_position, "switch has no default case");
}
+ if (warning.switch_enum)
+ check_enum_cases(&statement->switchs);
POP_PARENT;
return statement;
if (warning.empty_statement) {
warningf(HERE, "statement is empty");
}
+ statement_t *const statement = create_empty_statement();
eat(';');
- return create_empty_statement();
+ return statement;
}
/**
/* declaration or statement */
add_anchor_token(';');
switch (token.type) {
- case T_IDENTIFIER:
- if (look_ahead(1)->type == ':') {
+ case T_IDENTIFIER: {
+ token_type_t la1_type = (token_type_t)look_ahead(1)->type;
+ if (la1_type == ':') {
statement = parse_label_statement();
} else if (is_typedef_symbol(token.v.symbol)) {
statement = parse_declaration_statement();
- } else {
- statement = parse_expression_statement();
+ } else switch (la1_type) {
+ DECLARATION_START
+ case T_IDENTIFIER:
+ case '*':
+ statement = parse_declaration_statement();
+ break;
+
+ default:
+ statement = parse_expression_statement();
+ break;
}
break;
+ }
case T___extension__:
/* This can be a prefix to a declaration or an expression statement.
scope_t *last_scope = scope;
set_scope(&statement->compound.scope);
- statement_t *last_statement = NULL;
-
- bool only_decls_so_far = true;
+ statement_t **anchor = &statement->compound.statements;
+ bool only_decls_so_far = true;
while (token.type != '}' && token.type != T_EOF) {
statement_t *sub_statement = intern_parse_statement();
if (is_invalid_statement(sub_statement)) {
}
}
- if (last_statement != NULL) {
- last_statement->base.next = sub_statement;
- } else {
- statement->compound.statements = sub_statement;
- }
+ *anchor = sub_statement;
while (sub_statement->base.next != NULL)
sub_statement = sub_statement->base.next;
- last_statement = sub_statement;
+ anchor = &sub_statement->base.next;
}
if (token.type == '}') {
type_ptrdiff_t = make_global_typedef("__PTRDIFF_TYPE__", type_long);
type_uintmax_t = make_global_typedef("__uintmax_t__", type_unsigned_long_long);
type_uptrdiff_t = make_global_typedef("__UPTRDIFF_TYPE__", type_unsigned_long);
- type_wchar_t = make_global_typedef("__WCHAR_TYPE__", type_int);
+ type_wchar_t = make_global_typedef("__WCHAR_TYPE__", opt_short_wchar_t ? type_unsigned_short : type_int);
type_wint_t = make_global_typedef("__WINT_TYPE__", type_int);
type_intmax_t_ptr = make_pointer_type(type_intmax_t, TYPE_QUALIFIER_NONE);
type_ptrdiff_t_ptr = make_pointer_type(type_ptrdiff_t, TYPE_QUALIFIER_NONE);
type_ssize_t_ptr = make_pointer_type(type_ssize_t, TYPE_QUALIFIER_NONE);
type_wchar_t_ptr = make_pointer_type(type_wchar_t, TYPE_QUALIFIER_NONE);
+
+ /* const version of wchar_t */
+ type_const_wchar_t = allocate_type_zero(TYPE_TYPEDEF, &builtin_source_position);
+ type_const_wchar_t->typedeft.declaration = type_wchar_t->typedeft.declaration;
+ type_const_wchar_t->base.qualifiers |= TYPE_QUALIFIER_CONST;
+
+ type_const_wchar_t_ptr = make_pointer_type(type_const_wchar_t, TYPE_QUALIFIER_NONE);
}
/**
projects / cparser / blobdiff