- add -f[no-]short-wchar
[cparser] / parser.c
index f41ed52..baa943a 100644 (file)
--- a/parser.c
+++ b/parser.c
 #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
 
@@ -959,9 +967,9 @@ static void report_assign_error(assign_error_t error, type_t *orig_type_left,
                /* 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 pointed-to type",
+                        orig_type_left, context, orig_type_right, missing_qualifiers);
                return;
        }
 
@@ -3233,7 +3241,7 @@ static void parse_declaration_specifiers(declaration_specifiers_t *specifiers)
 
                        type_t *const typedef_type = get_typedef_type(token.v.symbol);
                        if (typedef_type == NULL) {
-                               /* Be somewhat resilient to typos like 'void f()' at the beginning of a
+                               /* 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;
@@ -4706,6 +4714,10 @@ static void check_declarations(void)
        if (warning.unused_parameter) {
                const scope_t *scope = &current_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) {
@@ -4786,9 +4798,7 @@ static void check_reachable(statement_t *const stmt)
                                                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;
                                        }
@@ -5514,7 +5524,7 @@ static expression_t *parse_string_const(void)
                        /* 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;
                }
@@ -5537,7 +5547,7 @@ static expression_t *parse_string_const(void)
 
                        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;
                        }
@@ -5970,9 +5980,9 @@ end_error:
 }
 
 /**
- * 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(')');
@@ -6458,7 +6468,7 @@ static expression_t *parse_primary_expression(void)
                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();
        }
 
@@ -6999,18 +7009,28 @@ static bool check_pointer_arithmetic(const source_position_t *source_position,
        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;
 }
@@ -8266,20 +8286,6 @@ end_error:
        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.
  */
@@ -8294,11 +8300,13 @@ static statement_t *parse_default_statement(void)
 
        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;
@@ -8449,6 +8457,46 @@ end_error:
        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.
  */
@@ -8462,6 +8510,7 @@ static statement_t *parse_switch(void)
        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)) {
@@ -8473,6 +8522,7 @@ static statement_t *parse_switch(void)
        }
        statement->switchs.expression = create_implicit_cast(expr, type);
        expect(')');
+       rem_anchor_token(')');
 
        switch_statement_t *rem = current_switch;
        current_switch          = &statement->switchs;
@@ -8480,9 +8530,11 @@ static statement_t *parse_switch(void)
        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;
@@ -8943,8 +8995,9 @@ static statement_t *parse_empty_statement(void)
        if (warning.empty_statement) {
                warningf(HERE, "statement is empty");
        }
+       statement_t *const statement = create_empty_statement();
        eat(';');
-       return create_empty_statement();
+       return statement;
 }
 
 /**
@@ -9046,9 +9099,8 @@ static statement_t *parse_compound_statement(bool inside_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)) {
@@ -9067,16 +9119,12 @@ static statement_t *parse_compound_statement(bool inside_expression_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 == '}') {
@@ -9126,13 +9174,20 @@ static void initialize_builtin_types(void)
        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);
 }
 
 /**