strange structs
[cparser] / parser.c
index 0ec8867..702cdcf 100644 (file)
--- a/parser.c
+++ b/parser.c
@@ -22,7 +22,7 @@
 typedef struct {
        declaration_t *old_declaration;
        symbol_t      *symbol;
-       unsigned short namespace;
+       unsigned short namespc;
 } stack_entry_t;
 
 static token_t         token;
@@ -201,12 +201,25 @@ static void parse_error(const char *message)
        fprintf(stderr, "parse error: %s\n", message);
 }
 
-static void parse_warning(const char *message)
+static void parser_print_warning_prefix_pos(
+               const source_position_t source_position)
+{
+       parser_print_prefix_pos(source_position);
+       fputs("warning: ", stderr);
+}
+
+static void parse_warning_pos(const source_position_t source_position,
+                              const char *const message)
 {
-       parser_print_prefix_pos(token.source_position);
+       parser_print_prefix_pos(source_position);
        fprintf(stderr, "warning: %s\n", message);
 }
 
+static void parse_warning(const char *message)
+{
+       parse_warning_pos(token.source_position, message);
+}
+
 static void parse_error_expected(const char *message, ...)
 {
        va_list args;
@@ -236,14 +249,20 @@ static void parse_error_expected(const char *message, ...)
        fprintf(stderr, "\n");
 }
 
+static void print_type_quoted(type_t *type)
+{
+       fputc('\'', stderr);
+       print_type(type);
+       fputc('\'', stderr);
+}
+
 static void type_error(const char *msg, const source_position_t source_position,
                        type_t *type)
 {
        parser_print_error_prefix_pos(source_position);
        fprintf(stderr, "%s, but found type ", msg);
-       print_type(type);
+       print_type_quoted(type);
        fputc('\n', stderr);
-       error();
 }
 
 static void type_error_incompatible(const char *msg,
@@ -251,11 +270,10 @@ static void type_error_incompatible(const char *msg,
 {
        parser_print_error_prefix_pos(source_position);
        fprintf(stderr, "%s, incompatible types: ", msg);
-       print_type(type1);
+       print_type_quoted(type1);
        fprintf(stderr, " - ");
-       print_type(type2);
+       print_type_quoted(type2);
        fprintf(stderr, ")\n");
-       error();
 }
 
 static void eat_block(void)
@@ -323,6 +341,14 @@ static void eat_brace(void)
     }                                              \
     next_token();
 
+#define expect_block(expected)                     \
+    if(UNLIKELY(token.type != (expected))) {       \
+        parse_error_expected(NULL, (expected), 0); \
+        eat_block();                               \
+        return NULL;                               \
+    }                                              \
+    next_token();
+
 #define expect_void(expected)                      \
     if(UNLIKELY(token.type != (expected))) {       \
         parse_error_expected(NULL, (expected), 0); \
@@ -354,20 +380,20 @@ static bool is_compatible_declaration (declaration_t *declaration,
        return declaration->type == previous->type;
 }
 
-static declaration_t *get_declaration(symbol_t *symbol, namespace_t namespace)
+static declaration_t *get_declaration(symbol_t *symbol, namespace_t namespc)
 {
        declaration_t *declaration = symbol->declaration;
        for( ; declaration != NULL; declaration = declaration->symbol_next) {
-               if(declaration->namespace == namespace)
+               if(declaration->namespc == namespc)
                        return declaration;
        }
 
        return NULL;
 }
 
-static const char *get_namespace_prefix(namespace_t namespace)
+static const char *get_namespace_prefix(namespace_t namespc)
 {
-       switch(namespace) {
+       switch(namespc) {
        case NAMESPACE_NORMAL:
                return "";
        case NAMESPACE_UNION:
@@ -391,29 +417,76 @@ static declaration_t *stack_push(stack_entry_t **stack_ptr,
                                  context_t *parent_context)
 {
        symbol_t    *symbol    = declaration->symbol;
-       namespace_t  namespace = declaration->namespace;
+       namespace_t  namespc = (namespace_t)declaration->namespc;
 
        /* a declaration should be only pushed once */
        assert(declaration->parent_context == NULL);
        declaration->parent_context = parent_context;
 
-       declaration_t *previous_declaration = get_declaration(symbol, namespace);
+       declaration_t *previous_declaration = get_declaration(symbol, namespc);
        assert(declaration != previous_declaration);
        if(previous_declaration != NULL
                        && previous_declaration->parent_context == context) {
                if(!is_compatible_declaration(declaration, previous_declaration)) {
                        parser_print_error_prefix_pos(declaration->source_position);
                        fprintf(stderr, "definition of symbol %s%s with type ",
-                                       get_namespace_prefix(namespace), symbol->string);
-                       error();
-                       print_type(declaration->type);
+                                       get_namespace_prefix(namespc), symbol->string);
+                       print_type_quoted(declaration->type);
                        fputc('\n', stderr);
                        parser_print_error_prefix_pos(
                                        previous_declaration->source_position);
                        fprintf(stderr, "is incompatible with previous declaration "
                                        "of type ");
-                       print_type(previous_declaration->type);
+                       print_type_quoted(previous_declaration->type);
                        fputc('\n', stderr);
+               } else {
+                       const storage_class_t old_storage = previous_declaration->storage_class;
+                       const storage_class_t new_storage = declaration->storage_class;
+                       if (current_function == NULL) {
+                               if (old_storage != STORAGE_CLASS_STATIC &&
+                                   new_storage == STORAGE_CLASS_STATIC) {
+                                       parser_print_error_prefix_pos(declaration->source_position);
+                                       fprintf(stderr,
+                                               "static declaration of '%s' follows non-static declaration\n",
+                                               symbol->string);
+                                       parser_print_error_prefix_pos(previous_declaration->source_position);
+                                       fprintf(stderr, "previous declaration of '%s' was here\n",
+                                               symbol->string);
+                               } else {
+                                       if (old_storage == STORAGE_CLASS_EXTERN) {
+                                               if (new_storage == STORAGE_CLASS_NONE) {
+                                                       previous_declaration->storage_class = STORAGE_CLASS_NONE;
+                                               }
+                                       } else {
+                                               parser_print_warning_prefix_pos(declaration->source_position);
+                                               fprintf(stderr, "redundant declaration for '%s'\n",
+                                                                               symbol->string);
+                                               parser_print_warning_prefix_pos(previous_declaration->source_position);
+                                               fprintf(stderr, "previous declaration of '%s' was here\n",
+                                                                               symbol->string);
+                                       }
+                               }
+                       } else {
+                               if (old_storage == STORAGE_CLASS_EXTERN &&
+                                               new_storage == STORAGE_CLASS_EXTERN) {
+                                       parser_print_warning_prefix_pos(declaration->source_position);
+                                       fprintf(stderr, "redundant extern declaration for '%s'\n",
+                                               symbol->string);
+                                       parser_print_warning_prefix_pos(previous_declaration->source_position);
+                                       fprintf(stderr, "previous declaration of '%s' was here\n",
+                                               symbol->string);
+                               } else {
+                                       parser_print_error_prefix_pos(declaration->source_position);
+                                       if (old_storage == new_storage) {
+                                               fprintf(stderr, "redeclaration of '%s'\n", symbol->string);
+                                       } else {
+                                               fprintf(stderr, "redeclaration of '%s' with different linkage\n", symbol->string);
+                                       }
+                                       parser_print_error_prefix_pos(previous_declaration->source_position);
+                                       fprintf(stderr, "previous declaration of '%s' was here\n",
+                                               symbol->string);
+                               }
+                       }
                }
                return previous_declaration;
        }
@@ -422,8 +495,8 @@ static declaration_t *stack_push(stack_entry_t **stack_ptr,
        stack_entry_t entry;
        entry.symbol          = symbol;
        entry.old_declaration = symbol->declaration;
-       entry.namespace       = namespace;
-       ARR_APP1(*stack_ptr, entry);
+       entry.namespc       = namespc;
+       ARR_APP1(stack_entry_t, *stack_ptr, entry);
 
        /* replace/add declaration into declaration list of the symbol */
        if(symbol->declaration == NULL) {
@@ -433,7 +506,7 @@ static declaration_t *stack_push(stack_entry_t **stack_ptr,
                declaration_t *iter      = symbol->declaration;
                for( ; iter != NULL; iter_last = iter, iter = iter->symbol_next) {
                        /* replace an entry? */
-                       if(iter->namespace == namespace) {
+                       if(iter->namespc == namespc) {
                                if(iter_last == NULL) {
                                        symbol->declaration = declaration;
                                } else {
@@ -481,30 +554,30 @@ static void stack_pop_to(stack_entry_t **stack_ptr, size_t new_top)
 
                declaration_t *old_declaration = entry->old_declaration;
                symbol_t      *symbol          = entry->symbol;
-               namespace_t    namespace       = entry->namespace;
+               namespace_t    namespc         = (namespace_t)entry->namespc;
 
                /* replace/remove declaration */
                declaration_t *declaration = symbol->declaration;
                assert(declaration != NULL);
-               if(declaration->namespace == namespace) {
+               if(declaration->namespc == namespc) {
                        if(old_declaration == NULL) {
                                symbol->declaration = declaration->symbol_next;
                        } else {
                                symbol->declaration = old_declaration;
-                               assert(old_declaration->symbol_next ==
-                                      declaration->symbol_next);
                        }
                } else {
-                       for(; declaration != NULL; declaration = declaration->symbol_next) {
-                               declaration_t *symbol_next = declaration->symbol_next;
-                               if(symbol_next->namespace == namespace) {
-                                       declaration->symbol_next = old_declaration;
-                                       assert(old_declaration->symbol_next
-                                               == symbol_next->symbol_next);
+                       declaration_t *iter_last = declaration;
+                       declaration_t *iter      = declaration->symbol_next;
+                       for( ; iter != NULL; iter_last = iter, iter = iter->symbol_next) {
+                               /* replace an entry? */
+                               if(iter->namespc == namespc) {
+                                       assert(iter_last != NULL);
+                                       iter_last->symbol_next = old_declaration;
+                                       old_declaration->symbol_next = iter->symbol_next;
                                        break;
                                }
                        }
-                       assert(declaration != NULL);
+                       assert(iter != NULL);
                }
        }
 
@@ -559,6 +632,17 @@ static expression_t *create_cast_expression(expression_t *expression,
        return (expression_t*) cast;
 }
 
+static bool is_null_expression(const expression_t *const expr)
+{
+       if (expr->type != EXPR_CONST) return false;
+
+       type_t *const type = skip_typeref(expr->datatype);
+       if (!is_type_integer(type)) return false;
+
+       const const_t *const const_expr = (const const_t*)expr;
+       return const_expr->v.int_value == 0;
+}
+
 static expression_t *create_implicit_cast(expression_t *expression,
                                           type_t *dest_type)
 {
@@ -587,15 +671,38 @@ static expression_t *create_implicit_cast(expression_t *expression,
                return create_cast_expression(expression, dest_type);
        }
        if(dest_type->type == TYPE_POINTER) {
-               if(source_type->type == TYPE_POINTER) {
-                       if(!pointers_compatible(source_type, dest_type)) {
-                               type_error_incompatible("can't implicitely cast types",
-                                               expression->source_position,
-                                               source_type, dest_type);
-                       } else {
-                               return create_cast_expression(expression, dest_type);
+               pointer_type_t *pointer_type
+                       = (pointer_type_t*) dest_type;
+               switch (source_type->type) {
+                       case TYPE_ATOMIC:
+                               if (is_null_expression(expression)) {
+                                       return create_cast_expression(expression, dest_type);
+                               }
+                               break;
+
+                       case TYPE_POINTER:
+                               if (pointers_compatible(source_type, dest_type)) {
+                                       return create_cast_expression(expression, dest_type);
+                               }
+                               break;
+
+                       case TYPE_ARRAY: {
+                               array_type_t *const array_type = (array_type_t*) source_type;
+                               if (types_compatible(array_type->element_type,
+                                                                                                                pointer_type->points_to)) {
+                                       return create_cast_expression(expression, dest_type);
+                               }
+                               break;
                        }
+
+                       default:
+                               panic("casting of non-atomic types not implemented yet");
                }
+
+               type_error_incompatible("can't implicitly cast types",
+                                                                                                               expression->source_position,
+                                                                                                               source_type, dest_type);
+               return expression;
        }
 
        panic("casting of non-atomic types not implemented yet");
@@ -609,27 +716,51 @@ static void semantic_assign(type_t *orig_type_left, expression_t **right,
        if(orig_type_right == NULL)
                return;
 
-       type_t *type_left       = skip_typeref(orig_type_left);
-       type_t *type_right      = skip_typeref(orig_type_right);
+       type_t *const type_left  = skip_typeref(orig_type_left);
+       type_t *const type_right = skip_typeref(orig_type_right);
 
-       if(type_left == type_right) {
-               /* fine */
-       } else if(is_type_arithmetic(type_left) && is_type_arithmetic(type_right)) {
+       if (type_left == type_right) {
+               return;
+       }
+
+       if ((is_type_arithmetic(type_left) && is_type_arithmetic(type_right)) ||
+           (type_left->type == TYPE_POINTER && is_null_expression(*right)) ||
+           (type_left->type == TYPE_POINTER && type_right->type == TYPE_POINTER)) {
                *right = create_implicit_cast(*right, type_left);
-       } else if(type_left->type == TYPE_POINTER
-                       && type_right->type == TYPE_POINTER) {
-               /* TODO */
-       } else {
-               /* TODO: improve error message */
-               parser_print_error_prefix();
-               fprintf(stderr, "incompatible types in %s\n", context);
-               parser_print_error_prefix();
-               print_type(type_left);
-               fputs(" <- ", stderr);
-               print_type(type_right);
-               fputs("\n", stderr);
+               return;
+       }
+
+       if (type_left->type == TYPE_POINTER) {
+               switch (type_right->type) {
+                       case TYPE_FUNCTION: {
+                               pointer_type_t *const ptr_type = (pointer_type_t*)type_left;
+                               if (ptr_type->points_to == type_right) {
+                                       return;
+                               }
+                               break;
+                       }
+
+                       case TYPE_ARRAY: {
+                               pointer_type_t *const ptr_type = (pointer_type_t*)type_left;
+                               array_type_t   *const arr_type = (array_type_t*)type_right;
+                               if (ptr_type->points_to == arr_type->element_type) {
+                                       return;
+                               }
+                               break;
+                       }
+
+                       default: break;
+               }
        }
 
+       /* TODO: improve error message */
+       parser_print_error_prefix();
+       fprintf(stderr, "incompatible types in %s\n", context);
+       parser_print_error_prefix();
+       print_type_quoted(type_left);
+       fputs(" <- ", stderr);
+       print_type_quoted(type_right);
+       fputs("\n", stderr);
 }
 
 static expression_t *parse_constant_expression(void)
@@ -644,17 +775,19 @@ static expression_t *parse_assignment_expression(void)
        return parse_sub_expression(2);
 }
 
-static void parse_compound_type_entries(void);
-static declaration_t *parse_declarator(storage_class_t storage_class,
-               type_t *type, int may_be_abstract);
-static declaration_t *record_declaration(declaration_t *declaration);
-
 typedef struct declaration_specifiers_t  declaration_specifiers_t;
 struct declaration_specifiers_t {
        storage_class_t  storage_class;
+       bool             is_inline;
        type_t          *type;
 };
 
+static void parse_compound_type_entries(void);
+static declaration_t *parse_declarator(
+               const declaration_specifiers_t *specifiers, type_t *type,
+               bool may_be_abstract);
+static declaration_t *record_declaration(declaration_t *declaration);
+
 static const char *parse_string_literals(void)
 {
        assert(token.type == T_STRING_LITERAL);
@@ -719,6 +852,7 @@ attributes_finished:
        ;
 }
 
+#if 0
 static designator_t *parse_designation(void)
 {
        if(token.type != '[' && token.type != '.')
@@ -740,7 +874,7 @@ static designator_t *parse_designation(void)
                        designator = allocate_ast_zero(sizeof(designator[0]));
                        next_token();
                        if(token.type != T_IDENTIFIER) {
-                               parse_error_expected("problem while parsing designator",
+                               parse_error_expected("while parsing designator",
                                                     T_IDENTIFIER, 0);
                                return NULL;
                        }
@@ -761,70 +895,225 @@ static designator_t *parse_designation(void)
                last = designator;
        }
 }
+#endif
 
-static initializer_t *parse_initializer_list(type_t *type);
-
-static initializer_t *parse_initializer(type_t *type)
+static initializer_t *initializer_from_expression(type_t *type,
+                                                  expression_t *expression)
 {
-       designator_t *designator = parse_designation();
+       initializer_value_t *result = allocate_ast_zero(sizeof(result[0]));
 
-       initializer_t *result;
-       if(token.type == '{') {
-               result = parse_initializer_list(type);
-       } else {
-               result          = allocate_ast_zero(sizeof(result[0]));
-               result->type    = INITIALIZER_VALUE;
-               result->v.value = parse_assignment_expression();
+       /* TODO check that expression is a constant expression */
 
-               if(type != NULL) {
-                       semantic_assign(type, &result->v.value, "initializer");
+       /* Â§ 6.7.8.14/15 char array may be initialized by string literals */
+       if(type->type == TYPE_ARRAY && expression->type == EXPR_STRING_LITERAL) {
+               array_type_t *array_type   = (array_type_t*) type;
+               type_t       *element_type = array_type->element_type;
+
+               if(element_type->type == TYPE_ATOMIC) {
+                       atomic_type_t      *atomic_type = (atomic_type_t*) element_type;
+                       atomic_type_type_t  atype       = atomic_type->atype;
+
+                       /* TODO handle wide strings */
+                       if(atype == ATOMIC_TYPE_CHAR
+                                       || atype == ATOMIC_TYPE_SCHAR
+                                       || atype == ATOMIC_TYPE_UCHAR) {
+                               /* it's fine TODO: check for length of string array... */
+                               goto initializer_from_expression_finished;
+                       }
                }
        }
-       result->designator = designator;
 
-       return result;
+       semantic_assign(type, &expression, "initializer");
+
+initializer_from_expression_finished:
+       result->initializer.type = INITIALIZER_VALUE;
+       result->value            = expression;
+
+       return (initializer_t*) result;
 }
 
-static initializer_t *parse_initializer_list(type_t *type)
+static initializer_t *parse_sub_initializer(type_t *type,
+                                            expression_t *expression,
+                                            type_t *expression_type);
+
+static initializer_t *parse_sub_initializer_elem(type_t *type)
 {
-       eat('{');
+       if(token.type == '{') {
+               return parse_sub_initializer(type, NULL, NULL);
+       }
+
+       expression_t *expression      = parse_assignment_expression();
+       type_t       *expression_type = skip_typeref(expression->datatype);
 
-       /* TODO: semantic */
-       (void) type;
+       return parse_sub_initializer(type, expression, expression_type);
+}
 
-       initializer_t *result = allocate_ast_zero(sizeof(result[0]));
-       result->type = INITIALIZER_LIST;
+static bool had_initializer_brace_warning;
 
-       initializer_t *last = NULL;
-       while(1) {
-               initializer_t *initializer = parse_initializer(NULL);
-               if(last != NULL) {
-                       last->next = initializer;
+static initializer_t *parse_sub_initializer(type_t *type,
+                                            expression_t *expression,
+                                            type_t *expression_type)
+{
+       if(is_type_scalar(type)) {
+               /* there might be extra {} hierarchies */
+               if(token.type == '{') {
+                       next_token();
+                       if(!had_initializer_brace_warning) {
+                               parse_warning("braces around scalar initializer");
+                               had_initializer_brace_warning = true;
+                       }
+                       initializer_t *result = parse_sub_initializer(type, NULL, NULL);
+                       if(token.type == ',') {
+                               next_token();
+                               /* TODO: warn about excessive elements */
+                       }
+                       expect_block('}');
+                       return result;
+               }
+
+               if(expression == NULL) {
+                       expression = parse_assignment_expression();
+               }
+               return initializer_from_expression(type, expression);
+       }
+
+       /* TODO: ignore qualifiers, comparing pointers is probably
+        * not correct */
+       if(expression != NULL && expression_type == type) {
+               initializer_t *result = allocate_ast_zero(sizeof(result[0]));
+               result->type          = INITIALIZER_VALUE;
+
+               if(type != NULL) {
+                       semantic_assign(type, &expression, "initializer");
+               }
+               //result->v.value = expression;
+
+               return result;
+       }
+
+       bool read_paren = false;
+       if(token.type == '{') {
+               next_token();
+               read_paren = true;
+       }
+
+       /* descend into subtype */
+       initializer_t *result = NULL;
+       if(type->type == TYPE_ARRAY) {
+               array_type_t *array_type   = (array_type_t*) type;
+               type_t       *element_type = array_type->element_type;
+               element_type               = skip_typeref(element_type);
+
+               result
+                       = parse_sub_initializer(element_type, expression, expression_type);
+       } else {
+               assert(type->type == TYPE_COMPOUND_STRUCT
+                               || type->type == TYPE_COMPOUND_UNION);
+               compound_type_t *compound_type = (compound_type_t*) type;
+               context_t       *context       = & compound_type->declaration->context;
+
+               declaration_t *first = context->declarations;
+               if(first == NULL)
+                       return NULL;
+               type_t *first_type = first->type;
+               first_type         = skip_typeref(first_type);
+
+               initializer_t *sub;
+               had_initializer_brace_warning = false;
+               if(expression == NULL) {
+                       sub = parse_sub_initializer_elem(first_type);
                } else {
-                       result->v.list = initializer;
+                       sub = parse_sub_initializer(first_type, expression,expression_type);
                }
-               last = initializer;
 
-               if(token.type == '}')
-                       break;
+               /* didn't match the subtypes -> try our parent type */
+               if(sub == NULL) {
+                       assert(!read_paren);
+                       return NULL;
+               }
 
-               if(token.type != ',') {
-                       parse_error_expected("problem while parsing initializer list",
-                                            ',', '}', 0);
-                       eat_block();
-                       return result;
+               initializer_t **elems = NEW_ARR_F(initializer_t*, 0);
+               ARR_APP1(initializer_t*, elems, sub);
+
+               declaration_t *iter  = first->next;
+               for( ; iter != NULL; iter = iter->next) {
+                       if(iter->symbol == NULL)
+                               continue;
+                       if(iter->namespc != NAMESPACE_NORMAL)
+                               continue;
+
+                       if(token.type == '}')
+                               break;
+                       expect_block(',');
+
+                       type_t *iter_type = iter->type;
+                       iter_type         = skip_typeref(iter_type);
+
+                       /* read next token */
+                       initializer_t *sub = parse_sub_initializer(iter_type, NULL, NULL);
+                       if(sub == NULL) {
+                               /* TODO error, do nicer cleanup*/
+                               parse_error("member initializer didn't match");
+                               DEL_ARR_F(elems);
+                               return NULL;
+                       }
+                       ARR_APP1(initializer_t*, elems, sub);
                }
-               eat(',');
 
-               if(token.type == '}')
-                       break;
+               int    len        = ARR_LEN(elems);
+               size_t elems_size = sizeof(initializer_t*) * len;
+
+               initializer_list_t *init
+                       = allocate_ast_zero(sizeof(init[0]) + elems_size);
+
+               init->initializer.type = INITIALIZER_LIST;
+               init->len              = len;
+               memcpy(init->initializers, elems, elems_size);
+               DEL_ARR_F(elems);
+
+               result = (initializer_t*) init;
        }
 
-       expect('}');
+       if(read_paren) {
+               if(token.type == ',')
+                       next_token();
+               expect('}');
+       }
+       return result;
+}
+
+static initializer_t *parse_initializer(type_t *type)
+{
+       initializer_t *result;
+
+       type = skip_typeref(type);
+
+       if(token.type != '{') {
+               expression_t *expression = parse_assignment_expression();
+               return initializer_from_expression(type, expression);
+       }
+
+       if(is_type_scalar(type)) {
+               /* Â§ 6.7.8.11 */
+               eat('{');
+
+               expression_t *expression = parse_assignment_expression();
+               result = initializer_from_expression(type, expression);
+
+               if(token.type == ',')
+                       next_token();
+
+               expect('}');
+               return result;
+       } else {
+               result = parse_sub_initializer(type, NULL, NULL);
+       }
 
        return result;
 }
 
+
+
 static declaration_t *parse_compound_type_specifier(bool is_struct)
 {
        if(is_struct) {
@@ -836,6 +1125,11 @@ static declaration_t *parse_compound_type_specifier(bool is_struct)
        symbol_t      *symbol      = NULL;
        declaration_t *declaration = NULL;
 
+       if (token.type == T___attribute__) {
+               /* TODO */
+               parse_attributes();
+       }
+
        if(token.type == T_IDENTIFIER) {
                symbol = token.v.symbol;
                next_token();
@@ -847,10 +1141,10 @@ static declaration_t *parse_compound_type_specifier(bool is_struct)
                }
        } else if(token.type != '{') {
                if(is_struct) {
-                       parse_error_expected("problem while parsing struct type specifier",
+                       parse_error_expected("while parsing struct type specifier",
                                             T_IDENTIFIER, '{', 0);
                } else {
-                       parse_error_expected("problem while parsing union type specifier",
+                       parse_error_expected("while parsing union type specifier",
                                             T_IDENTIFIER, '{', 0);
                }
 
@@ -861,12 +1155,13 @@ static declaration_t *parse_compound_type_specifier(bool is_struct)
                declaration = allocate_type_zero(sizeof(declaration[0]));
 
                if(is_struct) {
-                       declaration->namespace = NAMESPACE_STRUCT;
+                       declaration->namespc = NAMESPACE_STRUCT;
                } else {
-                       declaration->namespace = NAMESPACE_UNION;
+                       declaration->namespc = NAMESPACE_UNION;
                }
                declaration->source_position = token.source_position;
                declaration->symbol          = symbol;
+               record_declaration(declaration);
        }
 
        if(token.type == '{') {
@@ -877,7 +1172,6 @@ static declaration_t *parse_compound_type_specifier(bool is_struct)
                                        is_struct ? "struct" : "union", symbol->string);
                        declaration->context.declarations = NULL;
                }
-               record_declaration(declaration);
                declaration->init.is_defined = true;
 
                int         top          = environment_top();
@@ -909,8 +1203,7 @@ static void parse_enum_entries(void)
                declaration_t *entry = allocate_ast_zero(sizeof(entry[0]));
 
                if(token.type != T_IDENTIFIER) {
-                       parse_error_expected("problem while parsing enum entry",
-                                            T_IDENTIFIER, 0);
+                       parse_error_expected("while parsing enum entry", T_IDENTIFIER, 0);
                        eat_block();
                        return;
                }
@@ -947,7 +1240,7 @@ static declaration_t *parse_enum_specifier(void)
 
                declaration = get_declaration(symbol, NAMESPACE_ENUM);
        } else if(token.type != '{') {
-               parse_error_expected("problem while parsing enum type specifier",
+               parse_error_expected("while parsing enum type specifier",
                                     T_IDENTIFIER, '{', 0);
                return NULL;
        } else {
@@ -958,7 +1251,7 @@ static declaration_t *parse_enum_specifier(void)
        if(declaration == NULL) {
                declaration = allocate_type_zero(sizeof(declaration[0]));
 
-               declaration->namespace       = NAMESPACE_ENUM;
+               declaration->namespc       = NAMESPACE_ENUM;
                declaration->source_position = token.source_position;
                declaration->symbol          = symbol;
        }
@@ -984,12 +1277,11 @@ static declaration_t *parse_enum_specifier(void)
  */
 static bool is_typedef_symbol(symbol_t *symbol)
 {
-       declaration_t *declaration = get_declaration(symbol, NAMESPACE_NORMAL);
-       if(declaration == NULL
-                       || declaration->storage_class != STORAGE_CLASS_TYPEDEF)
-               return false;
-
-       return true;
+       const declaration_t *const declaration =
+               get_declaration(symbol, NAMESPACE_NORMAL);
+       return
+               declaration != NULL &&
+               declaration->storage_class == STORAGE_CLASS_TYPEDEF;
 }
 
 static type_t *parse_typeof(void)
@@ -1123,7 +1415,6 @@ static void parse_declaration_specifiers(declaration_specifiers_t *specifiers)
                MATCH_TYPE_QUALIFIER(T_const,    TYPE_QUALIFIER_CONST);
                MATCH_TYPE_QUALIFIER(T_restrict, TYPE_QUALIFIER_RESTRICT);
                MATCH_TYPE_QUALIFIER(T_volatile, TYPE_QUALIFIER_VOLATILE);
-               MATCH_TYPE_QUALIFIER(T_inline,   TYPE_QUALIFIER_INLINE);
 
                case T___extension__:
                        /* TODO */
@@ -1156,6 +1447,11 @@ static void parse_declaration_specifiers(declaration_specifiers_t *specifiers)
 #ifdef PROVIDE_IMAGINARY
                MATCH_SPECIFIER(T__Imaginary, SPECIFIER_IMAGINARY, "_Imaginary")
 #endif
+               case T_inline:
+                       next_token();
+                       specifiers->is_inline = true;
+                       break;
+
                case T_long:
                        next_token();
                        if(type_specifiers & SPECIFIER_LONG_LONG) {
@@ -1352,7 +1648,7 @@ finish_specifiers:
                }
        }
 
-       type->qualifiers = type_qualifiers;
+       type->qualifiers = (type_qualifier_t)type_qualifiers;
 
        type_t *result = typehash_insert(type);
        if(newtype && result != (type_t*) type) {
@@ -1362,9 +1658,9 @@ finish_specifiers:
        specifiers->type = result;
 }
 
-static type_qualifier_t parse_type_qualifiers(void)
+static unsigned parse_type_qualifiers(void)
 {
-       type_qualifier_t type_qualifiers = 0;
+       unsigned type_qualifiers = TYPE_QUALIFIER_NONE;
 
        while(true) {
                switch(token.type) {
@@ -1372,7 +1668,6 @@ static type_qualifier_t parse_type_qualifiers(void)
                MATCH_TYPE_QUALIFIER(T_const,    TYPE_QUALIFIER_CONST);
                MATCH_TYPE_QUALIFIER(T_restrict, TYPE_QUALIFIER_RESTRICT);
                MATCH_TYPE_QUALIFIER(T_volatile, TYPE_QUALIFIER_VOLATILE);
-               MATCH_TYPE_QUALIFIER(T_inline,   TYPE_QUALIFIER_INLINE);
 
                default:
                        return type_qualifiers;
@@ -1384,8 +1679,8 @@ static void parse_identifier_list(void)
 {
        while(true) {
                if(token.type != T_IDENTIFIER) {
-                       parse_error_expected("problem while parsing parameter identifier "
-                                            "list", T_IDENTIFIER, 0);
+                       parse_error_expected("while parsing parameter identifier list",
+                                            T_IDENTIFIER, 0);
                        return;
                }
                next_token();
@@ -1402,14 +1697,23 @@ static declaration_t *parse_parameter(void)
 
        parse_declaration_specifiers(&specifiers);
 
-       declaration_t *declaration = parse_declarator(specifiers.storage_class,
-                                                     specifiers.type, 1);
+       declaration_t *declaration
+               = parse_declarator(&specifiers, specifiers.type, true);
 
        /* TODO check declaration constraints for parameters */
        if(declaration->storage_class == STORAGE_CLASS_TYPEDEF) {
                parse_error("typedef not allowed in parameter list");
        }
 
+       /* Array as last part of a paramter type is just syntactic sugar.  Turn it
+        * into a pointer */
+       if (declaration->type->type == TYPE_ARRAY) {
+               const array_type_t *const arr_type =
+                       (const array_type_t*)declaration->type;
+               declaration->type =
+                       make_pointer_type(arr_type->element_type, TYPE_QUALIFIER_NONE);
+       }
+
        return declaration;
 }
 
@@ -1622,8 +1926,15 @@ static construct_type_t *parse_inner_declarator(declaration_t *declaration,
        default:
                if(may_be_abstract)
                        break;
-               parse_error_expected("problem while parsing declarator", T_IDENTIFIER,
-                                    '(', 0);
+               parse_error_expected("while parsing declarator", T_IDENTIFIER, '(', 0);
+               /* avoid a loop in the outermost scope, because eat_statement doesn't
+                * eat '}' */
+               if(token.type == '}' && current_function == NULL) {
+                       next_token();
+               } else {
+                       eat_statement();
+               }
+               return NULL;
        }
 
        while(true) {
@@ -1719,11 +2030,13 @@ static type_t *construct_declarator_type(construct_type_t *construct_list,
        return type;
 }
 
-static declaration_t *parse_declarator(storage_class_t storage_class,
-               type_t *type, int may_be_abstract)
+static declaration_t *parse_declarator(
+               const declaration_specifiers_t *specifiers,
+               type_t *type, bool may_be_abstract)
 {
        declaration_t *declaration = allocate_ast_zero(sizeof(declaration[0]));
-       declaration->storage_class = storage_class;
+       declaration->storage_class = specifiers->storage_class;
+       declaration->is_inline     = specifiers->is_inline;
 
        construct_type_t *construct_type
                = parse_inner_declarator(declaration, may_be_abstract);
@@ -1778,18 +2091,24 @@ static void parser_error_multiple_definition(declaration_t *previous,
        fprintf(stderr, "multiple definition of symbol '%s'\n",
                declaration->symbol->string);
        parser_print_error_prefix_pos(previous->source_position);
-       fprintf(stderr, "this is the location of the previous "
-               "definition.\n");
-       error();
+       fprintf(stderr, "this is the location of the previous definition.\n");
 }
 
 static void parse_init_declarators(const declaration_specifiers_t *specifiers)
 {
        while(true) {
                declaration_t *ndeclaration
-                       = parse_declarator(specifiers->storage_class, specifiers->type, 0);
+                       = parse_declarator(specifiers, specifiers->type, false);
 
                declaration_t *declaration = record_declaration(ndeclaration);
+
+               type_t *type = declaration->type;
+               if(type->type != TYPE_FUNCTION && declaration->is_inline) {
+                       parser_print_warning_prefix_pos(declaration->source_position);
+                       fprintf(stderr, "variable '%s' declared 'inline'\n",
+                               declaration->symbol->string);
+               }
+
                if(token.type == '=') {
                        next_token();
 
@@ -1862,8 +2181,7 @@ static void parse_struct_declarators(const declaration_specifiers_t *specifiers)
                        /* TODO (bitfields) */
                } else {
                        declaration_t *declaration
-                               = parse_declarator(specifiers->storage_class,
-                                                  specifiers->type, 1);
+                               = parse_declarator(specifiers, specifiers->type, true);
 
                        /* TODO: check constraints for struct declarations */
                        /* TODO: check for doubled fields */
@@ -1909,6 +2227,29 @@ static void parse_declaration(void)
        parse_declaration_specifiers(&specifiers);
 
        if(token.type == ';') {
+               if (specifiers.storage_class != STORAGE_CLASS_NONE) {
+                       parse_warning_pos(source_position,
+                                         "useless keyword in empty declaration");
+               }
+               switch (specifiers.type->type) {
+                       case TYPE_COMPOUND_STRUCT:
+                       case TYPE_COMPOUND_UNION: {
+                               const compound_type_t *const comp_type =
+                                       (const compound_type_t*)specifiers.type;
+                               if (comp_type->declaration->symbol == NULL) {
+                                       parse_warning_pos(source_position,
+                                                                                                               "unnamed struct/union that defines no instances");
+                               }
+                               break;
+                       }
+
+                       case TYPE_ENUM: break;
+
+                       default:
+                               parse_warning_pos(source_position, "empty declaration");
+                               break;
+               }
+
                next_token();
 
                declaration_t *declaration = allocate_ast_zero(sizeof(declaration[0]));
@@ -1956,6 +2297,14 @@ struct expression_parser_function_t {
 
 expression_parser_function_t expression_parsers[T_LAST_TOKEN];
 
+static expression_t *make_invalid_expression(void)
+{
+       expression_t *expression    = allocate_ast_zero(sizeof(expression[0]));
+       expression->type            = EXPR_INVALID;
+       expression->source_position = token.source_position;
+       return expression;
+}
+
 static expression_t *expected_expression_error(void)
 {
        parser_print_error_prefix();
@@ -1963,11 +2312,9 @@ static expression_t *expected_expression_error(void)
        print_token(stderr, & token);
        fprintf(stderr, "\n");
 
-       expression_t *expression = allocate_ast_zero(sizeof(expression[0]));
-       expression->type = EXPR_INVALID;
        next_token();
 
-       return expression;
+       return make_invalid_expression();
 }
 
 static expression_t *parse_string_const(void)
@@ -2060,7 +2407,7 @@ static expression_t *parse_reference(void)
 
        if(declaration == NULL) {
 #ifndef STRICT_C99
-               /* an implicitely defined function */
+               /* an implicitly defined function */
                if(token.type == '(') {
                        parser_print_prefix_pos(token.source_position);
                        fprintf(stderr, "warning: implicit declaration of function '%s'\n",
@@ -2204,7 +2551,7 @@ static designator_t *parse_designator(void)
        designator_t *result = allocate_ast_zero(sizeof(result[0]));
 
        if(token.type != T_IDENTIFIER) {
-               parse_error_expected("problem while parsing member designator",
+               parse_error_expected("while parsing member designator",
                                     T_IDENTIFIER, 0);
                eat_brace();
                return NULL;
@@ -2217,8 +2564,8 @@ static designator_t *parse_designator(void)
                if(token.type == '.') {
                        next_token();
                        if(token.type != T_IDENTIFIER) {
-                               parse_error_expected("problem while parsing member designator",
-                                       T_IDENTIFIER, 0);
+                               parse_error_expected("while parsing member designator",
+                                                    T_IDENTIFIER, 0);
                                eat_brace();
                                return NULL;
                        }
@@ -2333,11 +2680,7 @@ static expression_t *parse_primary_expression(void)
        fprintf(stderr, "\n");
        eat_statement();
 
-       expression_t *expression = allocate_ast_zero(sizeof(expression[0]));
-       expression->type     = EXPR_INVALID;
-       expression->datatype = type_void;
-
-       return expression;
+       return make_invalid_expression();
 }
 
 static expression_t *parse_array_expression(unsigned precedence,
@@ -2365,7 +2708,7 @@ static expression_t *parse_array_expression(unsigned precedence,
                } else {
                        parser_print_error_prefix();
                        fprintf(stderr, "array access on object with non-pointer type ");
-                       print_type(type);
+                       print_type_quoted(type);
                        fprintf(stderr, "\n");
                }
        }
@@ -2424,8 +2767,9 @@ static expression_t *parse_select_expression(unsigned precedence,
                                              expression_t *compound)
 {
        (void) precedence;
-
        assert(token.type == '.' || token.type == T_MINUSGREATER);
+
+       bool is_pointer = (token.type == T_MINUSGREATER);
        next_token();
 
        select_expression_t *select = allocate_ast_zero(sizeof(select[0]));
@@ -2433,15 +2777,69 @@ static expression_t *parse_select_expression(unsigned precedence,
        select->expression.type = EXPR_SELECT;
        select->compound        = compound;
 
-       /* TODO: datatype */
-
        if(token.type != T_IDENTIFIER) {
-               parse_error_expected("Problem while parsing select", T_IDENTIFIER, 0);
+               parse_error_expected("while parsing select", T_IDENTIFIER, 0);
                return (expression_t*) select;
        }
-       select->symbol = token.v.symbol;
+       symbol_t *symbol = token.v.symbol;
+       select->symbol   = symbol;
        next_token();
 
+       type_t *type = compound->datatype;
+       if(type == NULL)
+               return make_invalid_expression();
+
+       type_t *type_left = type;
+       if(is_pointer) {
+               if(type->type != TYPE_POINTER) {
+                       parser_print_error_prefix();
+                       fprintf(stderr, "left hand side of '->' is not a pointer, but ");
+                       print_type_quoted(type);
+                       fputc('\n', stderr);
+                       return make_invalid_expression();
+               }
+               pointer_type_t *pointer_type = (pointer_type_t*) type;
+               type_left                    = pointer_type->points_to;
+       }
+       type_left = skip_typeref(type_left);
+
+       if(type_left->type != TYPE_COMPOUND_STRUCT
+                       && type_left->type != TYPE_COMPOUND_UNION) {
+               parser_print_error_prefix();
+               fprintf(stderr, "request for member '%s' in something not a struct or "
+                       "union, but ", symbol->string);
+               print_type_quoted(type_left);
+               fputc('\n', stderr);
+               return make_invalid_expression();
+       }
+
+       compound_type_t *compound_type = (compound_type_t*) type_left;
+       declaration_t   *declaration   = compound_type->declaration;
+
+       if(!declaration->init.is_defined) {
+               parser_print_error_prefix();
+               fprintf(stderr, "request for member '%s' of incomplete type ",
+                       symbol->string);
+               print_type_quoted(type_left);
+               fputc('\n', stderr);
+               return make_invalid_expression();
+       }
+
+       declaration_t *iter = declaration->context.declarations;
+       for( ; iter != NULL; iter = iter->next) {
+               if(iter->symbol == symbol) {
+                       break;
+               }
+       }
+       if(iter == NULL) {
+               parser_print_error_prefix();
+               print_type_quoted(type_left);
+               fprintf(stderr, " has no member named '%s'\n", symbol->string);
+               return make_invalid_expression();
+       }
+
+       select->compound_entry      = iter;
+       select->expression.datatype = iter->type;
        return (expression_t*) select;
 }
 
@@ -2455,20 +2853,24 @@ static expression_t *parse_call_expression(unsigned precedence,
 
        function_type_t *function_type;
        type_t          *type = expression->datatype;
-       if(type->type != TYPE_FUNCTION) {
-               /* TODO calling pointers to functions is ok */
+       if (type->type == TYPE_FUNCTION) {
+               function_type             = (function_type_t*) type;
+               call->expression.datatype = function_type->result_type;
+       } else if (type->type == TYPE_POINTER &&
+                  ((pointer_type_t*)type)->points_to->type == TYPE_FUNCTION) {
+               pointer_type_t *const ptr_type = (pointer_type_t*)type;
+               function_type                  = (function_type_t*)ptr_type->points_to;
+               call->expression.datatype      = function_type->result_type;
+       } else {
                parser_print_error_prefix();
                fputs("called object '", stderr);
                print_expression(expression);
                fputs("' (type ", stderr);
-               print_type(type);
-               fputs("is not a function\n", stderr);
+               print_type_quoted(type);
+               fputs("is not a function\n", stderr);
 
                function_type             = NULL;
                call->expression.datatype = NULL;
-       } else {
-               function_type             = (function_type_t*) type;
-               call->expression.datatype = function_type->result_type;
        }
 
        /* parse arguments */
@@ -2561,12 +2963,11 @@ static expression_t *parse_conditional_expression(unsigned precedence,
        conditional->condition = expression;
 
        /* 6.5.15.2 */
-       type_t *condition_type = conditional->condition->datatype;
-       if(condition_type != NULL) {
-               if(!is_type_scalar(condition_type)) {
-                       type_error("expected a scalar type", expression->source_position,
-                                  condition_type);
-               }
+       type_t *condition_type_orig = conditional->condition->datatype;
+       type_t *condition_type      = skip_typeref(condition_type_orig);
+       if(condition_type != NULL && !is_type_scalar(condition_type)) {
+               type_error("expected a scalar type", expression->source_position,
+                          condition_type_orig);
        }
 
        conditional->true_expression = parse_expression();
@@ -2580,27 +2981,33 @@ static expression_t *parse_conditional_expression(unsigned precedence,
        if(false_type == NULL)
                return (expression_t*) conditional;
 
+       type_t *const skipped_true_type  = skip_typeref(true_type);
+       type_t *const skipped_false_type = skip_typeref(false_type);
+
        /* 6.5.15.3 */
-       if(true_type == false_type) {
-               conditional->expression.datatype = true_type;
-       } else if(is_type_arithmetic(true_type) && is_type_arithmetic(false_type)) {
-               type_t *result = get_type_after_conversion(true_type, false_type);
+       if (skipped_true_type == skipped_false_type) {
+               conditional->expression.datatype = skipped_true_type;
+       } else if (is_type_arithmetic(skipped_true_type) &&
+                  is_type_arithmetic(skipped_false_type)) {
+               type_t *const result = get_type_after_conversion(skipped_true_type,
+                                                                skipped_false_type);
                /* TODO: create implicit convs if necessary */
                conditional->expression.datatype = result;
-       } else if(true_type->type == TYPE_POINTER &&
-                 false_type->type == TYPE_POINTER &&
+       } else if (skipped_true_type->type == TYPE_POINTER &&
+                  skipped_false_type->type == TYPE_POINTER &&
                          true /* TODO compatible points_to types */) {
                /* TODO */
-       } else if(/* (is_null_ptr_const(true_type) && false_type->type == TYPE_POINTER)
-              || (is_null_ptr_const(false_type) &&
-                  true_type->type == TYPE_POINTER) TODO*/ false) {
+       } else if(/* (is_null_ptr_const(skipped_true_type) &&
+                     skipped_false_type->type == TYPE_POINTER)
+              || (is_null_ptr_const(skipped_false_type) &&
+                  skipped_true_type->type == TYPE_POINTER) TODO*/ false) {
                /* TODO */
        } else if(/* 1 is pointer to object type, other is void* */ false) {
                /* TODO */
        } else {
-               type_error_incompatible("problem while parsing conditional",
+               type_error_incompatible("while parsing conditional",
                                        expression->source_position, true_type,
-                                       false_type);
+                                       skipped_false_type);
        }
 
        return (expression_t*) conditional;
@@ -2615,6 +3022,23 @@ static expression_t *parse_extension(unsigned precedence)
        return parse_sub_expression(precedence);
 }
 
+static expression_t *parse_builtin_classify_type(const unsigned precedence)
+{
+       eat(T___builtin_classify_type);
+
+       classify_type_expression_t *const classify_type_expr =
+               allocate_ast_zero(sizeof(classify_type_expr[0]));
+       classify_type_expr->expression.type     = EXPR_CLASSIFY_TYPE;
+       classify_type_expr->expression.datatype = type_int;
+
+       expect('(');
+       expression_t *const expression = parse_sub_expression(precedence);
+       expect(')');
+       classify_type_expr->type_expression = expression;
+
+       return (expression_t*)classify_type_expr;
+}
+
 static void semantic_incdec(unary_expression_t *expression)
 {
        type_t *orig_type = expression->value->datatype;
@@ -2649,22 +3073,63 @@ static void semantic_unexpr_arithmetic(unary_expression_t *expression)
        expression->expression.datatype = orig_type;
 }
 
-static void semantic_dereference(unary_expression_t *expression)
+static void semantic_unexpr_scalar(unary_expression_t *expression)
 {
        type_t *orig_type = expression->value->datatype;
        if(orig_type == NULL)
                return;
 
        type_t *type = skip_typeref(orig_type);
-       if(type->type != TYPE_POINTER) {
-               /* TODO: improve error message */
-               parser_print_error_prefix();
-               fprintf(stderr, "operation needs a pointer type\n");
+       if (!is_type_scalar(type)) {
+               parse_error("operand of ! must be of scalar type\n");
                return;
        }
 
-       pointer_type_t *pointer_type    = (pointer_type_t*) type;
-       expression->expression.datatype = pointer_type->points_to;
+       expression->expression.datatype = orig_type;
+}
+
+static void semantic_unexpr_integer(unary_expression_t *expression)
+{
+       type_t *orig_type = expression->value->datatype;
+       if(orig_type == NULL)
+               return;
+
+       type_t *type = skip_typeref(orig_type);
+       if (!is_type_integer(type)) {
+               parse_error("operand of ~ must be of integer type\n");
+               return;
+       }
+
+       expression->expression.datatype = orig_type;
+}
+
+static void semantic_dereference(unary_expression_t *expression)
+{
+       type_t *orig_type = expression->value->datatype;
+       if(orig_type == NULL)
+               return;
+
+       type_t *type = skip_typeref(orig_type);
+       switch (type->type) {
+               case TYPE_ARRAY: {
+                       array_type_t *const array_type  = (array_type_t*)type;
+                       expression->expression.datatype = array_type->element_type;
+                       break;
+               }
+
+               case TYPE_POINTER: {
+                       pointer_type_t *pointer_type    = (pointer_type_t*)type;
+                       expression->expression.datatype = pointer_type->points_to;
+                       break;
+               }
+
+               default:
+                       parser_print_error_prefix();
+                       fputs("'Unary *' needs pointer or arrray type, but type ", stderr);
+                       print_type_quoted(orig_type);
+                       fputs(" given.\n", stderr);
+                       return;
+       }
 }
 
 static void semantic_take_addr(unary_expression_t *expression)
@@ -2673,6 +3138,15 @@ static void semantic_take_addr(unary_expression_t *expression)
        if(orig_type == NULL)
                return;
 
+       expression_t *value = expression->value;
+       if(value->type == EXPR_REFERENCE) {
+               reference_expression_t *reference   = (reference_expression_t*) value;
+               declaration_t          *declaration = reference->declaration;
+               if(declaration != NULL) {
+                       declaration->address_taken = 1;
+               }
+       }
+
        expression->expression.datatype = make_pointer_type(orig_type, 0);
 }
 
@@ -2694,11 +3168,11 @@ static expression_t *parse_##unexpression_type(unsigned precedence)            \
 
 CREATE_UNARY_EXPRESSION_PARSER('-', UNEXPR_NEGATE, semantic_unexpr_arithmetic)
 CREATE_UNARY_EXPRESSION_PARSER('+', UNEXPR_PLUS,   semantic_unexpr_arithmetic)
-CREATE_UNARY_EXPRESSION_PARSER('!', UNEXPR_NOT,    semantic_unexpr_arithmetic)
+CREATE_UNARY_EXPRESSION_PARSER('!', UNEXPR_NOT,    semantic_unexpr_scalar)
 CREATE_UNARY_EXPRESSION_PARSER('*', UNEXPR_DEREFERENCE, semantic_dereference)
 CREATE_UNARY_EXPRESSION_PARSER('&', UNEXPR_TAKE_ADDRESS, semantic_take_addr)
 CREATE_UNARY_EXPRESSION_PARSER('~', UNEXPR_BITWISE_NEGATE,
-                               semantic_unexpr_arithmetic)
+                               semantic_unexpr_integer)
 CREATE_UNARY_EXPRESSION_PARSER(T_PLUSPLUS,   UNEXPR_PREFIX_INCREMENT,
                                semantic_incdec)
 CREATE_UNARY_EXPRESSION_PARSER(T_MINUSMINUS, UNEXPR_PREFIX_DECREMENT,
@@ -2790,6 +3264,34 @@ static void semantic_binexpr_arithmetic(binary_expression_t *expression)
        expression->expression.datatype = arithmetic_type;
 }
 
+static void semantic_shift_op(binary_expression_t *expression)
+{
+       expression_t *left       = expression->left;
+       expression_t *right      = expression->right;
+       type_t       *orig_type_left  = left->datatype;
+       type_t       *orig_type_right = right->datatype;
+
+       if(orig_type_left == NULL || orig_type_right == NULL)
+               return;
+
+       type_t *type_left  = skip_typeref(orig_type_left);
+       type_t *type_right = skip_typeref(orig_type_right);
+
+       if(!is_type_integer(type_left) || !is_type_integer(type_right)) {
+               /* TODO: improve error message */
+               parser_print_error_prefix();
+               fprintf(stderr, "operation needs integer types\n");
+               return;
+       }
+
+       type_left  = promote_integer(type_left);
+       type_right = promote_integer(type_right);
+
+       expression->left  = create_implicit_cast(left, type_left);
+       expression->right = create_implicit_cast(right, type_right);
+       expression->expression.datatype = type_left;
+}
+
 static void semantic_add(binary_expression_t *expression)
 {
        expression_t *left            = expression->left;
@@ -2814,12 +3316,20 @@ static void semantic_add(binary_expression_t *expression)
                expression->expression.datatype = type_left;
        } else if(type_right->type == TYPE_POINTER && is_type_integer(type_left)) {
                expression->expression.datatype = type_right;
+       } else if (type_left->type == TYPE_ARRAY && is_type_integer(type_right)) {
+               const array_type_t *const arr_type = (const array_type_t*)type_left;
+               expression->expression.datatype =
+                 make_pointer_type(arr_type->element_type, TYPE_QUALIFIER_NONE);
+       } else if (type_right->type == TYPE_ARRAY && is_type_integer(type_left)) {
+               const array_type_t *const arr_type = (const array_type_t*)type_right;
+               expression->expression.datatype =
+                       make_pointer_type(arr_type->element_type, TYPE_QUALIFIER_NONE);
        } else {
                parser_print_error_prefix();
                fprintf(stderr, "invalid operands to binary + (");
-               print_type(orig_type_left);
+               print_type_quoted(orig_type_left);
                fprintf(stderr, ", ");
-               print_type(orig_type_right);
+               print_type_quoted(orig_type_right);
                fprintf(stderr, ")\n");
        }
 }
@@ -2851,9 +3361,9 @@ static void semantic_sub(binary_expression_t *expression)
                if(!pointers_compatible(type_left, type_right)) {
                        parser_print_error_prefix();
                        fprintf(stderr, "pointers to incompatible objects to binary - (");
-                       print_type(orig_type_left);
+                       print_type_quoted(orig_type_left);
                        fprintf(stderr, ", ");
-                       print_type(orig_type_right);
+                       print_type_quoted(orig_type_right);
                        fprintf(stderr, ")\n");
                } else {
                        expression->expression.datatype = type_ptrdiff_t;
@@ -2861,9 +3371,9 @@ static void semantic_sub(binary_expression_t *expression)
        } else {
                parser_print_error_prefix();
                fprintf(stderr, "invalid operands to binary - (");
-               print_type(orig_type_left);
+               print_type_quoted(orig_type_left);
                fprintf(stderr, ", ");
-               print_type(orig_type_right);
+               print_type_quoted(orig_type_right);
                fprintf(stderr, ")\n");
        }
 }
@@ -2887,6 +3397,17 @@ static void semantic_comparison(binary_expression_t *expression)
                expression->left  = create_implicit_cast(left, arithmetic_type);
                expression->right = create_implicit_cast(right, arithmetic_type);
                expression->expression.datatype = arithmetic_type;
+       } else if (type_left->type  == TYPE_POINTER &&
+                  type_right->type == TYPE_POINTER) {
+               /* TODO check compatibility */
+       } else if (type_left->type == TYPE_POINTER) {
+               expression->right = create_implicit_cast(right, type_left);
+       } else if (type_right->type == TYPE_POINTER) {
+               expression->left = create_implicit_cast(left, type_right);
+       } else {
+               type_error_incompatible("invalid operands in comparison",
+                                       expression->expression.source_position,
+                                       type_left, type_right);
        }
        expression->expression.datatype = type_int;
 }
@@ -2920,6 +3441,40 @@ static void semantic_arithmetic_assign(binary_expression_t *expression)
        expression->expression.datatype = type_left;
 }
 
+static void semantic_arithmetic_addsubb_assign(binary_expression_t *expression)
+{
+       expression_t *left            = expression->left;
+       expression_t *right           = expression->right;
+       type_t       *orig_type_left  = left->datatype;
+       type_t       *orig_type_right = right->datatype;
+
+       if(orig_type_left == NULL || orig_type_right == NULL)
+               return;
+
+       type_t *type_left  = skip_typeref(orig_type_left);
+       type_t *type_right = skip_typeref(orig_type_right);
+
+       if (is_type_arithmetic(type_left) && is_type_arithmetic(type_right)) {
+               /* combined instructions are tricky. We can't create an implicit cast on
+                * the left side, because we need the uncasted form for the store.
+                * The ast2firm pass has to know that left_type must be right_type
+                * for the arithmeitc operation and create a cast by itself */
+               type_t *const arithmetic_type = semantic_arithmetic(type_left, type_right);
+               expression->right = create_implicit_cast(right, arithmetic_type);
+               expression->expression.datatype = type_left;
+       } else if (type_left->type == TYPE_POINTER && is_type_integer(type_right)) {
+               expression->expression.datatype = type_left;
+       } else {
+               parser_print_error_prefix();
+               fputs("Incompatible types ", stderr);
+               print_type_quoted(orig_type_left);
+               fputs(" and ", stderr);
+               print_type_quoted(orig_type_right);
+               fputs(" in assignment\n", stderr);
+               return;
+       }
+}
+
 static void semantic_logical_op(binary_expression_t *expression)
 {
        expression_t *left            = expression->left;
@@ -2933,10 +3488,10 @@ static void semantic_logical_op(binary_expression_t *expression)
        type_t *type_left  = skip_typeref(orig_type_left);
        type_t *type_right = skip_typeref(orig_type_right);
 
-       if(!is_type_arithmetic(type_left) || !is_type_arithmetic(type_right)) {
+       if (!is_type_scalar(type_left) || !is_type_scalar(type_right)) {
                /* TODO: improve error message */
                parser_print_error_prefix();
-               fprintf(stderr, "operation needs arithmetic types\n");
+               fprintf(stderr, "operation needs scalar types\n");
                return;
        }
 
@@ -2948,7 +3503,9 @@ static void semantic_binexpr_assign(binary_expression_t *expression)
        expression_t *left       = expression->left;
        type_t       *type_left  = left->datatype;
 
-       if(type_left != NULL) {
+       if (type_left->type == TYPE_ARRAY) {
+               parse_error("Cannot assign to arrays.");
+       } else if (type_left != NULL) {
                semantic_assign(type_left, &expression->right, "assignment");
        }
 
@@ -3001,13 +3558,13 @@ CREATE_BINEXPR_PARSER(T_ANDAND, BINEXPR_LOGICAL_AND,  semantic_logical_op, 1)
 CREATE_BINEXPR_PARSER(T_PIPEPIPE, BINEXPR_LOGICAL_OR, semantic_logical_op, 1)
 /* TODO shift has a bit special semantic */
 CREATE_BINEXPR_PARSER(T_LESSLESS, BINEXPR_SHIFTLEFT,
-                      semantic_binexpr_arithmetic, 1)
+                      semantic_shift_op, 1)
 CREATE_BINEXPR_PARSER(T_GREATERGREATER, BINEXPR_SHIFTRIGHT,
-                      semantic_binexpr_arithmetic, 1)
+                      semantic_shift_op, 1)
 CREATE_BINEXPR_PARSER(T_PLUSEQUAL, BINEXPR_ADD_ASSIGN,
-                      semantic_arithmetic_assign, 0)
+                      semantic_arithmetic_addsubb_assign, 0)
 CREATE_BINEXPR_PARSER(T_MINUSEQUAL, BINEXPR_SUB_ASSIGN,
-                      semantic_arithmetic_assign, 0)
+                      semantic_arithmetic_addsubb_assign, 0)
 CREATE_BINEXPR_PARSER(T_ASTERISKEQUAL, BINEXPR_MUL_ASSIGN,
                       semantic_arithmetic_assign, 0)
 CREATE_BINEXPR_PARSER(T_SLASHEQUAL, BINEXPR_DIV_ASSIGN,
@@ -3058,7 +3615,7 @@ static expression_t *parse_sub_expression(unsigned precedence)
                left = parser->infix_parser(parser->infix_precedence, left);
 
                assert(left != NULL);
-               assert(left->type != EXPR_INVALID);
+               assert(left->type != EXPR_UNKNOWN);
                left->source_position = source_position;
        }
 
@@ -3171,6 +3728,8 @@ static void init_expression_parsers(void)
        register_expression_parser(parse_UNEXPR_PREFIX_DECREMENT, T_MINUSMINUS, 25);
        register_expression_parser(parse_sizeof,                  T_sizeof,     25);
        register_expression_parser(parse_extension,            T___extension__, 25);
+       register_expression_parser(parse_builtin_classify_type,
+                                                    T___builtin_classify_type, 25);
 }
 
 
@@ -3216,7 +3775,7 @@ static declaration_t *get_label(symbol_t *symbol)
 
        /* otherwise we need to create a new one */
        declaration_t *declaration = allocate_ast_zero(sizeof(declaration[0]));
-       declaration->namespace     = NAMESPACE_LABEL;
+       declaration->namespc     = NAMESPACE_LABEL;
        declaration->symbol        = symbol;
 
        label_push(declaration);