support for alloca
[cparser] / parser.c
index 4b118c7..eb7eb9c 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;
@@ -45,6 +45,7 @@ static type_t         *type_float       = NULL;
 static type_t         *type_const_char  = NULL;
 static type_t         *type_string      = NULL;
 static type_t         *type_void        = NULL;
+static type_t         *type_void_ptr    = NULL;
 static type_t         *type_size_t      = NULL;
 static type_t         *type_ptrdiff_t   = NULL;
 
@@ -71,14 +72,10 @@ static type_t       *parse_typename(void);
 #ifdef PROVIDE_COMPLEX
 #define COMPLEX_SPECIFIERS  \
        case T__Complex:
-#else
-#define COMPLEX_SPECIFIERS
-#endif
-
-#ifdef PROVIDE_IMAGINARY
 #define IMAGINARY_SPECIFIERS \
        case T__Imaginary:
 #else
+#define COMPLEX_SPECIFIERS
 #define IMAGINARY_SPECIFIERS
 #endif
 
@@ -341,6 +338,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); \
@@ -372,20 +377,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:
@@ -409,20 +414,20 @@ static declaration_t *stack_push(stack_entry_t **stack_ptr,
                                  context_t *parent_context)
 {
        symbol_t    *symbol    = declaration->symbol;
-       namespace_t  namespace = (namespace_t)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);
+                                       get_namespace_prefix(namespc), symbol->string);
                        print_type_quoted(declaration->type);
                        fputc('\n', stderr);
                        parser_print_error_prefix_pos(
@@ -487,7 +492,7 @@ 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;
+       entry.namespc       = namespc;
        ARR_APP1(stack_entry_t, *stack_ptr, entry);
 
        /* replace/add declaration into declaration list of the symbol */
@@ -498,7 +503,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 {
@@ -546,12 +551,12 @@ 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       = (namespace_t)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 {
@@ -562,7 +567,7 @@ static void stack_pop_to(stack_entry_t **stack_ptr, size_t new_top)
                        declaration_t *iter      = declaration->symbol_next;
                        for( ; iter != NULL; iter_last = iter, iter = iter->symbol_next) {
                                /* replace an entry? */
-                               if(iter->namespace == namespace) {
+                               if(iter->namespc == namespc) {
                                        assert(iter_last != NULL);
                                        iter_last->symbol_next = old_declaration;
                                        old_declaration->symbol_next = iter->symbol_next;
@@ -691,7 +696,7 @@ static expression_t *create_implicit_cast(expression_t *expression,
                                panic("casting of non-atomic types not implemented yet");
                }
 
-               type_error_incompatible("can't implicitely cast types",
+               type_error_incompatible("can't implicitly cast types",
                                                                                                                expression->source_position,
                                                                                                                source_type, dest_type);
                return expression;
@@ -844,6 +849,7 @@ attributes_finished:
        ;
 }
 
+#if 0
 static designator_t *parse_designation(void)
 {
        if(token.type != '[' && token.type != '.')
@@ -886,69 +892,255 @@ 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);
+       }
 
-       /* TODO: semantic */
-       (void) type;
+       expression_t *expression      = parse_assignment_expression();
+       type_t       *expression_type = skip_typeref(expression->datatype);
 
-       initializer_t *result = allocate_ast_zero(sizeof(result[0]));
-       result->type = INITIALIZER_LIST;
+       return parse_sub_initializer(type, expression, expression_type);
+}
 
-       initializer_t *last = NULL;
-       while(1) {
-               initializer_t *initializer = parse_initializer(NULL);
-               if(last != NULL) {
-                       last->next = initializer;
+static bool had_initializer_brace_warning;
+
+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_value_t *result = allocate_ast_zero(sizeof(result[0]));
+               result->initializer.type    = INITIALIZER_VALUE;
+
+               if(type != NULL) {
+                       semantic_assign(type, &expression, "initializer");
+               }
+               result->value = expression;
+
+               return (initializer_t*) result;
+       }
+
+       bool read_paren = false;
+       if(token.type == '{') {
+               next_token();
+               read_paren = true;
+       }
+
+       /* descend into subtype */
+       initializer_t  *result = NULL;
+       initializer_t **elems;
+       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);
+
+               initializer_t *sub;
+               had_initializer_brace_warning = false;
+               if(expression == NULL) {
+                       sub = parse_sub_initializer_elem(element_type);
                } else {
-                       result->v.list = initializer;
+                       sub = parse_sub_initializer(element_type, expression,
+                                                   expression_type);
                }
-               last = initializer;
 
-               if(token.type == '}')
-                       break;
+               /* didn't match the subtypes -> try the parent type */
+               if(sub == NULL) {
+                       assert(!read_paren);
+                       return NULL;
+               }
 
-               if(token.type != ',') {
-                       parse_error_expected("while parsing initializer list", ',', '}', 0);
-                       eat_block();
-                       return result;
+               elems = NEW_ARR_F(initializer_t*, 0);
+               ARR_APP1(initializer_t*, elems, sub);
+
+               while(true) {
+                       if(token.type == '}')
+                               break;
+                       expect_block(',');
+
+                       initializer_t *sub
+                               = parse_sub_initializer(element_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(',');
+       } 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;
 
-               if(token.type == '}')
-                       break;
+               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 {
+                       sub = parse_sub_initializer(first_type, expression,expression_type);
+               }
+
+               /* didn't match the subtypes -> try our parent type */
+               if(sub == NULL) {
+                       assert(!read_paren);
+                       return NULL;
+               }
+
+               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);
+
+                       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);
+               }
        }
 
-       expect('}');
+       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;
+
+       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) {
@@ -960,6 +1152,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();
@@ -985,9 +1182,9 @@ 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;
@@ -1081,7 +1278,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;
        }
@@ -1107,12 +1304,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)
@@ -1178,8 +1374,6 @@ typedef enum {
        SPECIFIER_VOID      = 1 << 10,
 #ifdef PROVIDE_COMPLEX
        SPECIFIER_COMPLEX   = 1 << 11,
-#endif
-#ifdef PROVIDE_IMAGINARY
        SPECIFIER_IMAGINARY = 1 << 12,
 #endif
 } specifiers_t;
@@ -1274,8 +1468,6 @@ static void parse_declaration_specifiers(declaration_specifiers_t *specifiers)
                MATCH_SPECIFIER(T__Bool,      SPECIFIER_BOOL,      "_Bool")
 #ifdef PROVIDE_COMPLEX
                MATCH_SPECIFIER(T__Complex,   SPECIFIER_COMPLEX,   "_Complex")
-#endif
-#ifdef PROVIDE_IMAGINARY
                MATCH_SPECIFIER(T__Imaginary, SPECIFIER_IMAGINARY, "_Imaginary")
 #endif
                case T_inline:
@@ -1434,8 +1626,6 @@ finish_specifiers:
                case SPECIFIER_LONG | SPECIFIER_DOUBLE | SPECIFIER_COMPLEX:
                        atomic_type = ATOMIC_TYPE_LONG_DOUBLE_COMPLEX;
                        break;
-#endif
-#ifdef PROVIDE_IMAGINARY
                case SPECIFIER_FLOAT | SPECIFIER_IMAGINARY:
                        atomic_type = ATOMIC_TYPE_FLOAT_IMAGINARY;
                        break;
@@ -1536,6 +1726,15 @@ static declaration_t *parse_parameter(void)
                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;
 }
 
@@ -1544,7 +1743,7 @@ static declaration_t *parse_parameters(function_type_t *type)
        if(token.type == T_IDENTIFIER) {
                symbol_t      *symbol = token.v.symbol;
                if(!is_typedef_symbol(symbol)) {
-                       /* TODO */
+                       /* TODO: K&R style C parameters */
                        parse_identifier_list();
                        return NULL;
                }
@@ -1749,6 +1948,14 @@ static construct_type_t *parse_inner_declarator(declaration_t *declaration,
                if(may_be_abstract)
                        break;
                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) {
@@ -1905,8 +2112,7 @@ 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");
+       fprintf(stderr, "this is the location of the previous definition.\n");
 }
 
 static void parse_init_declarators(const declaration_specifiers_t *specifiers)
@@ -1920,7 +2126,7 @@ static void parse_init_declarators(const declaration_specifiers_t *specifiers)
                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",
+                       fprintf(stderr, "variable '%s' declared 'inline'\n",
                                declaration->symbol->string);
                }
 
@@ -1933,7 +2139,8 @@ static void parse_init_declarators(const declaration_specifiers_t *specifiers)
                                parser_error_multiple_definition(declaration, ndeclaration);
                        }
 
-                       ndeclaration->init.initializer = parse_initializer(declaration->type);
+                       ndeclaration->init.initializer
+                               = parse_initializer(declaration->type);
                } else if(token.type == '{') {
                        if(declaration->type->type != TYPE_FUNCTION) {
                                parser_print_error_prefix();
@@ -2148,7 +2355,7 @@ static expression_t *parse_int_const(void)
        const_t *cnst = allocate_ast_zero(sizeof(cnst[0]));
 
        cnst->expression.type     = EXPR_CONST;
-       cnst->expression.datatype = type_int;
+       cnst->expression.datatype = token.datatype;
        cnst->v.int_value         = token.v.intvalue;
 
        next_token();
@@ -2161,7 +2368,7 @@ static expression_t *parse_float_const(void)
        const_t *cnst = allocate_ast_zero(sizeof(cnst[0]));
 
        cnst->expression.type     = EXPR_CONST;
-       cnst->expression.datatype = type_double;
+       cnst->expression.datatype = token.datatype;
        cnst->v.float_value       = token.v.floatvalue;
 
        next_token();
@@ -2222,7 +2429,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",
@@ -2337,9 +2544,13 @@ static expression_t *parse_brace_expression(void)
 
 static expression_t *parse_function_keyword(void)
 {
-       eat(T___FUNCTION__);
+       next_token();
        /* TODO */
 
+       if (current_function == NULL) {
+               parse_error("'__func__' used outside of a function");
+       }
+
        string_literal_t *expression = allocate_ast_zero(sizeof(expression[0]));
        expression->expression.type     = EXPR_FUNCTION;
        expression->expression.datatype = type_string;
@@ -2446,18 +2657,42 @@ static expression_t *parse_va_arg(void)
        return (expression_t*) expression;
 }
 
+static type_t *make_function_1_type(type_t *result_type, type_t *argument_type)
+{
+       function_parameter_t *parameter = allocate_type_zero(sizeof(parameter[0]));
+       parameter->type = argument_type;
+
+       function_type_t *type = allocate_type_zero(sizeof(type[0]));
+       type->type.type   = TYPE_FUNCTION;
+       type->result_type = result_type;
+       type->parameters  = parameter;
+
+       type_t *result = typehash_insert((type_t*) type);
+       if(result != (type_t*) type) {
+               free_type(type);
+       }
+
+       return result;
+}
+
 static expression_t *parse_builtin_symbol(void)
 {
        builtin_symbol_expression_t *expression
                = allocate_ast_zero(sizeof(expression[0]));
        expression->expression.type = EXPR_BUILTIN_SYMBOL;
 
-       /* TODO: set datatype */
-
        expression->symbol = token.v.symbol;
 
+       type_t *type;
+       switch(token.type) {
+       case T___builtin_alloca:
+               type = make_function_1_type(type_void_ptr, type_size_t);
+               break;
+       }
+
        next_token();
 
+       expression->expression.datatype = type;
        return (expression_t*) expression;
 }
 
@@ -2473,6 +2708,7 @@ static expression_t *parse_primary_expression(void)
        case T_IDENTIFIER:
                return parse_reference();
        case T___FUNCTION__:
+       case T___func__:
                return parse_function_keyword();
        case T___PRETTY_FUNCTION__:
                return parse_pretty_function_keyword();
@@ -2480,6 +2716,7 @@ static expression_t *parse_primary_expression(void)
                return parse_offsetof();
        case T___builtin_va_arg:
                return parse_va_arg();
+       case T___builtin_alloca:
        case T___builtin_expect:
        case T___builtin_va_start:
        case T___builtin_va_end:
@@ -2505,25 +2742,37 @@ static expression_t *parse_array_expression(unsigned precedence,
 
        eat('[');
 
+       expression_t *index = parse_expression();
+
        array_access_expression_t *array_access
                = allocate_ast_zero(sizeof(array_access[0]));
 
-       array_access->expression.type     = EXPR_ARRAY_ACCESS;
-       array_access->array_ref           = array_ref;
-       array_access->index               = parse_expression();
+       array_access->expression.type = EXPR_ARRAY_ACCESS;
+       array_access->array_ref       = array_ref;
+       array_access->index           = index;
 
-       type_t *type = array_ref->datatype;
-       if(type != NULL) {
-               if(type->type == TYPE_POINTER) {
-                       pointer_type_t *pointer           = (pointer_type_t*) type;
+       type_t *type_left  = skip_typeref(array_ref->datatype);
+       type_t *type_right = skip_typeref(index->datatype);
+
+       if(type_left != NULL && type_right != NULL) {
+               if(type_left->type == TYPE_POINTER) {
+                       pointer_type_t *pointer           = (pointer_type_t*) type_left;
+                       array_access->expression.datatype = pointer->points_to;
+               } else if(type_left->type == TYPE_ARRAY) {
+                       array_type_t *array_type          = (array_type_t*) type_left;
+                       array_access->expression.datatype = array_type->element_type;
+               } else if(type_right->type == TYPE_POINTER) {
+                       pointer_type_t *pointer           = (pointer_type_t*) type_right;
                        array_access->expression.datatype = pointer->points_to;
-               } else if(type->type == TYPE_ARRAY) {
-                       array_type_t *array_type          = (array_type_t*) type;
+               } else if(type_right->type == TYPE_ARRAY) {
+                       array_type_t *array_type          = (array_type_t*) type_right;
                        array_access->expression.datatype = array_type->element_type;
                } else {
                        parser_print_error_prefix();
-                       fprintf(stderr, "array access on object with non-pointer type ");
-                       print_type_quoted(type);
+                       fprintf(stderr, "array access on object with non-pointer types ");
+                       print_type_quoted(type_left);
+                       fprintf(stderr, ", ");
+                       print_type_quoted(type_right);
                        fprintf(stderr, "\n");
                }
        }
@@ -2649,7 +2898,7 @@ static expression_t *parse_select_expression(unsigned precedence,
        if(iter == NULL) {
                parser_print_error_prefix();
                print_type_quoted(type_left);
-               fprintf(stderr, " has no memeber named '%s'\n", symbol->string);
+               fprintf(stderr, " has no member named '%s'\n", symbol->string);
                return make_invalid_expression();
        }
 
@@ -2759,13 +3008,7 @@ static expression_t *parse_call_expression(unsigned precedence,
        return (expression_t*) call;
 }
 
-static type_t *get_type_after_conversion(const type_t *type1,
-                                         const type_t *type2)
-{
-       /* TODO... */
-       (void) type2;
-       return (type_t*) type1;
-}
+static type_t *semantic_arithmetic(type_t *type_left, type_t *type_right);
 
 static expression_t *parse_conditional_expression(unsigned precedence,
                                                   expression_t *expression)
@@ -2778,22 +3021,23 @@ 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(skip_typeref(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();
+       expression_t *const t_expr = parse_expression();
+       conditional->true_expression = t_expr;
        expect(':');
-       conditional->false_expression = parse_sub_expression(precedence);
+       expression_t *const f_expr = parse_sub_expression(precedence);
+       conditional->false_expression = f_expr;
 
-       type_t *true_type  = conditional->true_expression->datatype;
+       type_t *const true_type  = t_expr->datatype;
        if(true_type == NULL)
                return (expression_t*) conditional;
-       type_t *false_type = conditional->false_expression->datatype;
+       type_t *const false_type = f_expr->datatype;
        if(false_type == NULL)
                return (expression_t*) conditional;
 
@@ -2805,9 +3049,10 @@ static expression_t *parse_conditional_expression(unsigned precedence,
                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 */
+               type_t *const result = semantic_arithmetic(skipped_true_type,
+                                                          skipped_false_type);
+               conditional->true_expression  = create_implicit_cast(t_expr, result);
+               conditional->false_expression = create_implicit_cast(f_expr, result);
                conditional->expression.datatype = result;
        } else if (skipped_true_type->type == TYPE_POINTER &&
                   skipped_false_type->type == TYPE_POINTER &&
@@ -2838,6 +3083,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;
@@ -3527,6 +3789,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);
 }
 
 
@@ -3540,7 +3804,7 @@ static statement_t *parse_case_statement(void)
        label->expression = parse_expression();
 
        expect(':');
-       label->statement.next = parse_statement();
+       label->label_statement = parse_statement();
 
        return (statement_t*) label;
 }
@@ -3554,7 +3818,7 @@ static statement_t *parse_default_statement(void)
        label->statement.source_position = token.source_position;
 
        expect(':');
-       label->statement.next = parse_statement();
+       label->label_statement = parse_statement();
 
        return (statement_t*) label;
 }
@@ -3572,7 +3836,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);
@@ -4066,6 +4330,7 @@ void init_parser(void)
        type_ptrdiff_t   = make_atomic_type(ATOMIC_TYPE_LONG, 0);
        type_const_char  = make_atomic_type(ATOMIC_TYPE_CHAR, TYPE_QUALIFIER_CONST);
        type_void        = make_atomic_type(ATOMIC_TYPE_VOID, 0);
+       type_void_ptr    = make_pointer_type(type_void, 0);
        type_string      = make_pointer_type(type_const_char, 0);
 }