preliminary Win32 support added
[cparser] / parser.c
index eba409d..6c78507 100644 (file)
--- a/parser.c
+++ b/parser.c
@@ -201,6 +201,13 @@ static void parse_error(const char *message)
        fprintf(stderr, "parse error: %s\n", 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(const char *message)
 {
        parser_print_prefix_pos(token.source_position);
@@ -236,12 +243,19 @@ 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();
 }
@@ -251,9 +265,9 @@ 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();
 }
@@ -406,13 +420,13 @@ static declaration_t *stack_push(stack_entry_t **stack_ptr,
                        fprintf(stderr, "definition of symbol %s%s with type ",
                                        get_namespace_prefix(namespace), symbol->string);
                        error();
-                       print_type(declaration->type);
+                       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);
                }
                return previous_declaration;
@@ -491,20 +505,20 @@ static void stack_pop_to(stack_entry_t **stack_ptr, size_t new_top)
                                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->namespace == namespace) {
+                                       assert(iter_last != NULL);
+                                       iter_last->symbol_next = old_declaration;
+                                       old_declaration->symbol_next = iter->symbol_next;
                                        break;
                                }
                        }
-                       assert(declaration != NULL);
+                       assert(iter != NULL);
                }
        }
 
@@ -587,14 +601,27 @@ static expression_t *create_implicit_cast(expression_t *expression,
                return create_cast_expression(expression, dest_type);
        }
        if(dest_type->type == TYPE_POINTER) {
+               pointer_type_t *pointer_type
+                       = (pointer_type_t*) dest_type;
                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);
+                           return expression;
                        } else {
                                return create_cast_expression(expression, dest_type);
                        }
+               } else if(source_type->type == TYPE_ARRAY) {
+                       array_type_t *array_type = (array_type_t*) source_type;
+                       if(!types_compatible(array_type->element_type,
+                                            pointer_type->points_to)) {
+                               type_error_incompatible("can't implicitely cast types",
+                                               expression->source_position,
+                                               source_type, dest_type);
+                           return expression;
+                       }
+                       return create_cast_expression(expression, dest_type);
                }
        }
 
@@ -624,9 +651,9 @@ static void semantic_assign(type_t *orig_type_left, expression_t **right,
                parser_print_error_prefix();
                fprintf(stderr, "incompatible types in %s\n", context);
                parser_print_error_prefix();
-               print_type(type_left);
+               print_type_quoted(type_left);
                fputs(" <- ", stderr);
-               print_type(type_right);
+               print_type_quoted(type_right);
                fputs("\n", stderr);
        }
 
@@ -644,17 +671,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);
@@ -740,7 +769,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;
                        }
@@ -809,8 +838,7 @@ static initializer_t *parse_initializer_list(type_t *type)
                        break;
 
                if(token.type != ',') {
-                       parse_error_expected("problem while parsing initializer list",
-                                            ',', '}', 0);
+                       parse_error_expected("while parsing initializer list", ',', '}', 0);
                        eat_block();
                        return result;
                }
@@ -847,10 +875,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);
                }
 
@@ -867,6 +895,7 @@ static declaration_t *parse_compound_type_specifier(bool is_struct)
                }
                declaration->source_position = token.source_position;
                declaration->symbol          = symbol;
+               record_declaration(declaration);
        }
 
        if(token.type == '{') {
@@ -877,7 +906,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 +937,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 +974,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 {
@@ -1123,7 +1150,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 +1182,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) {
@@ -1372,7 +1403,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 +1414,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,8 +1432,8 @@ 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) {
@@ -1475,6 +1505,7 @@ static declaration_t *parse_parameters(function_type_t *type)
 }
 
 typedef enum {
+       CONSTRUCT_INVALID,
        CONSTRUCT_POINTER,
        CONSTRUCT_FUNCTION,
        CONSTRUCT_ARRAY
@@ -1519,7 +1550,8 @@ static construct_type_t *parse_pointer_declarator(void)
 
        parsed_pointer_t *pointer = obstack_alloc(&temp_obst, sizeof(pointer[0]));
        memset(pointer, 0, sizeof(pointer[0]));
-       pointer->type_qualifiers = parse_type_qualifiers();
+       pointer->construct_type.type = CONSTRUCT_POINTER;
+       pointer->type_qualifiers     = parse_type_qualifiers();
 
        return (construct_type_t*) pointer;
 }
@@ -1530,6 +1562,7 @@ static construct_type_t *parse_array_declarator(void)
 
        parsed_array_t *array = obstack_alloc(&temp_obst, sizeof(array[0]));
        memset(array, 0, sizeof(array[0]));
+       array->construct_type.type = CONSTRUCT_ARRAY;
 
        if(token.type == T_static) {
                array->is_static = true;
@@ -1619,8 +1652,7 @@ 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);
        }
 
        while(true) {
@@ -1672,6 +1704,8 @@ static type_t *construct_declarator_type(construct_type_t *construct_list,
                array_type_t              *array_type;
 
                switch(iter->type) {
+               case CONSTRUCT_INVALID:
+                       panic("invalid type construction found");
                case CONSTRUCT_FUNCTION:
                        construct_function_type = (construct_function_type_t*) iter;
                        function_type           = construct_function_type->function_type;
@@ -1714,11 +1748,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);
@@ -1782,9 +1818,17 @@ 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();
 
@@ -1857,8 +1901,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 */
@@ -1951,6 +1994,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();
@@ -1958,11 +2009,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)
@@ -2199,7 +2248,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;
@@ -2212,8 +2261,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;
                        }
@@ -2328,11 +2377,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,
@@ -2349,15 +2394,18 @@ static expression_t *parse_array_expression(unsigned precedence,
        array_access->array_ref           = array_ref;
        array_access->index               = parse_expression();
 
-       type_t *array_type = array_ref->datatype;
-       if(array_type != NULL) {
-               if(array_type->type == TYPE_POINTER) {
-                       pointer_type_t *pointer           = (pointer_type_t*) array_type;
+       type_t *type = array_ref->datatype;
+       if(type != NULL) {
+               if(type->type == TYPE_POINTER) {
+                       pointer_type_t *pointer           = (pointer_type_t*) type;
                        array_access->expression.datatype = pointer->points_to;
+               } else if(type->type == TYPE_ARRAY) {
+                       array_type_t *array_type          = (array_type_t*) type;
+                       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(array_type);
+                       print_type_quoted(type);
                        fprintf(stderr, "\n");
                }
        }
@@ -2416,8 +2464,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]));
@@ -2425,15 +2474,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 memeber named '%s'\n", symbol->string);
+               return make_invalid_expression();
+       }
+
+       select->compound_entry      = iter;
+       select->expression.datatype = iter->type;
        return (expression_t*) select;
 }
 
@@ -2453,7 +2556,7 @@ static expression_t *parse_call_expression(unsigned precedence,
                fputs("called object '", stderr);
                print_expression(expression);
                fputs("' (type ", stderr);
-               print_type(type);
+               print_type_quoted(type);
                fputs("is not a function\n", stderr);
 
                function_type             = NULL;
@@ -2590,7 +2693,7 @@ static expression_t *parse_conditional_expression(unsigned precedence,
        } 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);
        }
@@ -2665,6 +2768,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);
 }
 
@@ -2782,6 +2894,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;
@@ -2809,9 +2949,9 @@ static void semantic_add(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");
        }
 }
@@ -2843,9 +2983,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;
@@ -2853,9 +2993,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");
        }
 }
@@ -2993,9 +3133,9 @@ 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)
 CREATE_BINEXPR_PARSER(T_MINUSEQUAL, BINEXPR_SUB_ASSIGN,
@@ -3050,7 +3190,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;
        }