X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=parser.c;h=1573e95d6f2d61ad2b96682de9456d0c2ecd18f9;hb=e7c87251c9a4fd96a0374bd64f0a17068cdf2eaf;hp=d83c2618089610725c76d33ceb26411ecb04b3dd;hpb=dc80433e9208fb190af9b5a466b484036cfb8335;p=cparser diff --git a/parser.c b/parser.c index d83c261..1573e95 100644 --- a/parser.c +++ b/parser.c @@ -67,7 +67,7 @@ struct declaration_specifiers_t { unsigned char alignment; /**< Alignment, 0 if not set. */ unsigned int is_inline : 1; unsigned int deprecated : 1; - decl_modifiers_t decl_modifiers; /**< MS __declspec extended modifier mask */ + decl_modifiers_t modifiers; /**< declaration modifiers */ gnu_attribute_t *gnu_attributes; /**< list of GNU attributes */ const char *deprecated_string; /**< can be set if declaration was marked deprecated. */ symbol_t *get_property_sym; /**< the name of the get property if set. */ @@ -104,6 +104,7 @@ static goto_statement_t *goto_first = NULL; static goto_statement_t *goto_last = NULL; static label_statement_t *label_first = NULL; static label_statement_t *label_last = NULL; +static translation_unit_t *unit = NULL; static struct obstack temp_obst; static source_position_t null_position = { NULL, 0 }; @@ -132,7 +133,7 @@ static const symbol_t *sym_noalias = NULL; static unsigned char token_anchor_set[T_LAST_TOKEN]; /** The current source position. */ -#define HERE &token.source_position +#define HERE (&token.source_position) static type_t *type_valist; @@ -162,7 +163,8 @@ static void semantic_comparison(binary_expression_t *expression); case T_restrict: \ case T_volatile: \ case T_inline: \ - case T__forceinline: + case T__forceinline: \ + case T___attribute__: #ifdef PROVIDE_COMPLEX #define COMPLEX_SPECIFIERS \ @@ -366,6 +368,8 @@ static size_t get_type_struct_size(type_kind_t kind) { static const size_t sizes[] = { [TYPE_ATOMIC] = sizeof(atomic_type_t), + [TYPE_COMPLEX] = sizeof(complex_type_t), + [TYPE_IMAGINARY] = sizeof(imaginary_type_t), [TYPE_BITFIELD] = sizeof(bitfield_type_t), [TYPE_COMPOUND_STRUCT] = sizeof(compound_type_t), [TYPE_COMPOUND_UNION] = sizeof(compound_type_t), @@ -488,6 +492,18 @@ static void add_anchor_token(int token_type) { ++token_anchor_set[token_type]; } +static int save_and_reset_anchor_state(int token_type) { + assert(0 <= token_type && token_type < T_LAST_TOKEN); + int count = token_anchor_set[token_type]; + token_anchor_set[token_type] = 0; + return count; +} + +static void restore_anchor_state(int token_type, int count) { + assert(0 <= token_type && token_type < T_LAST_TOKEN); + token_anchor_set[token_type] = count; +} + /** * Remove a token from the token anchor set (a multi-set). */ @@ -580,7 +596,10 @@ static void eat_statement(void) { /** * Report a parse error because an expected token was not found. */ -static __attribute__((sentinel)) +static +#if defined __GNUC__ && __GNUC__ >= 4 +__attribute__((sentinel)) +#endif void parse_error_expected(const char *message, ...) { if(message != NULL) { @@ -622,6 +641,8 @@ static void type_error_incompatible(const char *msg, parse_error_expected(NULL, (expected), NULL); \ add_anchor_token(expected); \ eat_until_anchor(); \ + if (token.type == expected) \ + next_token(); \ rem_anchor_token(expected); \ goto end_error; \ } \ @@ -852,11 +873,74 @@ static expression_t *create_implicit_cast(expression_t *expression, return create_cast_expression(expression, dest_type); } +typedef enum assign_error_t { + ASSIGN_SUCCESS, + ASSIGN_ERROR_INCOMPATIBLE, + ASSIGN_ERROR_POINTER_QUALIFIER_MISSING, + ASSIGN_WARNING_POINTER_INCOMPATIBLE, + ASSIGN_WARNING_POINTER_FROM_INT, + ASSIGN_WARNING_INT_FROM_POINTER +} assign_error_t; + +static void report_assign_error(assign_error_t error, type_t *orig_type_left, + const expression_t *const right, + const char *context, + const source_position_t *source_position) +{ + type_t *const orig_type_right = right->base.type; + type_t *const type_left = skip_typeref(orig_type_left); + type_t *const type_right = skip_typeref(orig_type_right); + + switch (error) { + case ASSIGN_SUCCESS: + return; + case ASSIGN_ERROR_INCOMPATIBLE: + errorf(source_position, + "destination type '%T' in %s is incompatible with type '%T'", + orig_type_left, context, orig_type_right); + return; + + case ASSIGN_ERROR_POINTER_QUALIFIER_MISSING: { + type_t *points_to_left + = skip_typeref(type_left->pointer.points_to); + type_t *points_to_right + = skip_typeref(type_right->pointer.points_to); + + /* the left type has all qualifiers from the right type */ + unsigned missing_qualifiers + = points_to_right->base.qualifiers & ~points_to_left->base.qualifiers; + errorf(source_position, + "destination type '%T' in %s from type '%T' lacks qualifiers '%Q' in pointed-to type", + orig_type_left, context, orig_type_right, missing_qualifiers); + return; + } + + case ASSIGN_WARNING_POINTER_INCOMPATIBLE: + warningf(source_position, + "destination type '%T' in %s is incompatible with '%E' of type '%T'", + orig_type_left, context, right, orig_type_right); + return; + + case ASSIGN_WARNING_POINTER_FROM_INT: + warningf(source_position, + "%s makes integer '%T' from pointer '%T' without a cast", + context, orig_type_left, orig_type_right); + return; + + case ASSIGN_WARNING_INT_FROM_POINTER: + warningf(source_position, + "%s makes integer '%T' from pointer '%T' without a cast", + context, orig_type_left, orig_type_right); + return; + + default: + panic("invalid error value"); + } +} + /** Implements the rules from § 6.5.16.1 */ -static type_t *semantic_assign(type_t *orig_type_left, - const expression_t *const right, - const char *context, - const source_position_t *source_position) +static assign_error_t semantic_assign(type_t *orig_type_left, + const expression_t *const right) { type_t *const orig_type_right = right->base.type; type_t *const type_left = skip_typeref(orig_type_left); @@ -864,7 +948,7 @@ static type_t *semantic_assign(type_t *orig_type_left, if(is_type_pointer(type_left)) { if(is_null_pointer_constant(right)) { - return orig_type_left; + return ASSIGN_SUCCESS; } else if(is_type_pointer(type_right)) { type_t *points_to_left = skip_typeref(type_left->pointer.points_to); @@ -875,9 +959,7 @@ static type_t *semantic_assign(type_t *orig_type_left, unsigned missing_qualifiers = points_to_right->base.qualifiers & ~points_to_left->base.qualifiers; if(missing_qualifiers != 0) { - errorf(source_position, - "destination type '%T' in %s from type '%T' lacks qualifiers '%Q' in pointed-to type", type_left, context, type_right, missing_qualifiers); - return orig_type_left; + return ASSIGN_ERROR_POINTER_QUALIFIER_MISSING; } points_to_left = get_unqualified_type(points_to_left); @@ -885,47 +967,36 @@ static type_t *semantic_assign(type_t *orig_type_left, if (is_type_atomic(points_to_left, ATOMIC_TYPE_VOID) || is_type_atomic(points_to_right, ATOMIC_TYPE_VOID)) { - return orig_type_left; + return ASSIGN_SUCCESS; } if (!types_compatible(points_to_left, points_to_right)) { - warningf(source_position, - "destination type '%T' in %s is incompatible with '%E' of type '%T'", - orig_type_left, context, right, orig_type_right); + return ASSIGN_WARNING_POINTER_INCOMPATIBLE; } - return orig_type_left; + return ASSIGN_SUCCESS; } else if(is_type_integer(type_right)) { - warningf(source_position, - "%s makes pointer '%T' from integer '%T' without a cast", - context, orig_type_left, orig_type_right); - return orig_type_left; + return ASSIGN_WARNING_POINTER_FROM_INT; } } else if ((is_type_arithmetic(type_left) && is_type_arithmetic(type_right)) || (is_type_atomic(type_left, ATOMIC_TYPE_BOOL) && is_type_pointer(type_right))) { - return orig_type_left; + return ASSIGN_SUCCESS; } else if ((is_type_compound(type_left) && is_type_compound(type_right)) || (is_type_builtin(type_left) && is_type_builtin(type_right))) { type_t *const unqual_type_left = get_unqualified_type(type_left); type_t *const unqual_type_right = get_unqualified_type(type_right); if (types_compatible(unqual_type_left, unqual_type_right)) { - return orig_type_left; + return ASSIGN_SUCCESS; } } else if (is_type_integer(type_left) && is_type_pointer(type_right)) { - warningf(source_position, - "%s makes integer '%T' from pointer '%T' without a cast", - context, orig_type_left, orig_type_right); - return orig_type_left; + return ASSIGN_WARNING_INT_FROM_POINTER; } - if (!is_type_valid(type_left)) - return type_left; - - if (!is_type_valid(type_right)) - return orig_type_right; + if (!is_type_valid(type_left) || !is_type_valid(type_right)) + return ASSIGN_SUCCESS; - return NULL; + return ASSIGN_ERROR_INCOMPATIBLE; } static expression_t *parse_constant_expression(void) @@ -1000,7 +1071,7 @@ static const char *gnu_attribute_names[GNU_AK_LAST] = { [GNU_AK_DESTRUCTOR] = "destructor", [GNU_AK_NOTHROW] = "nothrow", [GNU_AK_TRANSPARENT_UNION] = "transparent_union", - [GNU_AK_COMMON] = "coommon", + [GNU_AK_COMMON] = "common", [GNU_AK_NOCOMMON] = "nocommon", [GNU_AK_PACKED] = "packed", [GNU_AK_SHARED] = "shared", @@ -1043,6 +1114,7 @@ static const char *gnu_attribute_names[GNU_AK_LAST] = { [GNU_AK_TLS_MODEL] = "tls_model", [GNU_AK_VISIBILITY] = "visibility", [GNU_AK_REGPARM] = "regparm", + [GNU_AK_MODE] = "mode", [GNU_AK_MODEL] = "model", [GNU_AK_TRAP_EXIT] = "trap_exit", [GNU_AK_SP_SWITCH] = "sp_switch", @@ -1054,14 +1126,13 @@ static const char *gnu_attribute_names[GNU_AK_LAST] = { */ static int strcmp_underscore(const char *s1, const char *s2) { if(s2[0] == '_' && s2[1] == '_') { - s2 += 2; - size_t l1 = strlen(s1); - if(l1 + 2 != strlen(s2)) { - /* not equal */ - return 1; + size_t len2 = strlen(s2); + size_t len1 = strlen(s1); + if(len1 == len2-4 && s2[len2-2] == '_' && s2[len2-1] == '_') { + return strncmp(s1, s2+2, len2-4); } - return strncmp(s1, s2, l1); } + return strcmp(s1, s2); } @@ -1076,7 +1147,6 @@ static gnu_attribute_t *allocate_gnu_attribute(gnu_attribute_kind_t kind) { attribute->have_arguments = false; return attribute; - return attribute; } /** @@ -1155,8 +1225,8 @@ static void parse_gnu_attribute_tls_model_arg(gnu_attribute_t *attribute) { return; } } + errorf(HERE, "'%s' is an unrecognized tls model", string.begin); } - errorf(HERE, "'%s' is an unrecognized tls model", string.begin); attribute->invalid = true; } @@ -1179,8 +1249,8 @@ static void parse_gnu_attribute_visibility_arg(gnu_attribute_t *attribute) { return; } } + errorf(HERE, "'%s' is an unrecognized visibility", string.begin); } - errorf(HERE, "'%s' is an unrecognized visibility", string.begin); attribute->invalid = true; } @@ -1202,8 +1272,23 @@ static void parse_gnu_attribute_model_arg(gnu_attribute_t *attribute) { return; } } + errorf(HERE, "'%s' is an unrecognized model", string.begin); } - errorf(HERE, "'%s' is an unrecognized model", string.begin); + attribute->invalid = true; +} + +static void parse_gnu_attribute_mode_arg(gnu_attribute_t *attribute) +{ + /* TODO: find out what is allowed here... */ + + /* at least: byte, word, pointer, list of machine modes + * __XXX___ is interpreted as XXX */ + add_anchor_token(')'); + expect(T_IDENTIFIER); + rem_anchor_token(')'); + expect(')'); + return; +end_error: attribute->invalid = true; } @@ -1227,8 +1312,8 @@ static void parse_gnu_attribute_interrupt_arg(gnu_attribute_t *attribute) { return; } } + errorf(HERE, "'%s' is not an interrupt", string.begin); } - errorf(HERE, "'%s' is an interrupt", string.begin); attribute->invalid = true; } @@ -1276,6 +1361,19 @@ end_error: attribute->u.value = true; } +static void check_no_argument(gnu_attribute_t *attribute, const char *name) +{ + if(!attribute->have_arguments) + return; + + /* should have no arguments */ + errorf(HERE, "wrong number of arguments specified for '%s' attribute", name); + eat_until_matching_token('('); + /* we have already consumed '(', so we stop before ')', eat it */ + eat(')'); + attribute->invalid = true; +} + /** * Parse one GNU attribute. * @@ -1352,10 +1450,11 @@ end_error: * interrupt( string literal ) * sentinel( constant expression ) */ -static void parse_gnu_attribute(gnu_attribute_t **attributes) +static decl_modifiers_t parse_gnu_attribute(gnu_attribute_t **attributes) { - gnu_attribute_t *head = *attributes; - gnu_attribute_t *last = *attributes; + gnu_attribute_t *head = *attributes; + gnu_attribute_t *last = *attributes; + decl_modifiers_t modifiers = 0; gnu_attribute_t *attribute; eat(T___attribute__); @@ -1372,19 +1471,21 @@ static void parse_gnu_attribute(gnu_attribute_t **attributes) /* non-empty attribute list */ while(true) { const char *name; - if(token.type == T_const) { + if (token.type == T_const) { name = "const"; } else if(token.type == T_volatile) { name = "volatile"; } else if(token.type == T_cdecl) { /* __attribute__((cdecl)), WITH ms mode */ name = "cdecl"; - } else if(token.type != T_IDENTIFIER) { + } else if (token.type == T_IDENTIFIER) { + const symbol_t *sym = token.v.symbol; + name = sym->string; + } else { parse_error_expected("while parsing GNU attribute", T_IDENTIFIER, NULL); break; } - const symbol_t *sym = token.v.symbol; - name = sym->string; + next_token(); int i; @@ -1422,20 +1523,11 @@ static void parse_gnu_attribute(gnu_attribute_t **attributes) case GNU_AK_STDCALL: case GNU_AK_FASTCALL: case GNU_AK_DEPRECATED: - case GNU_AK_NOINLINE: - case GNU_AK_NORETURN: case GNU_AK_NAKED: - case GNU_AK_PURE: - case GNU_AK_ALWAYS_INLINE: case GNU_AK_MALLOC: case GNU_AK_WEAK: - case GNU_AK_CONSTRUCTOR: - case GNU_AK_DESTRUCTOR: - case GNU_AK_NOTHROW: - case GNU_AK_TRANSPARENT_UNION: case GNU_AK_COMMON: case GNU_AK_NOCOMMON: - case GNU_AK_PACKED: case GNU_AK_SHARED: case GNU_AK_NOTSHARED: case GNU_AK_USED: @@ -1463,16 +1555,62 @@ static void parse_gnu_attribute(gnu_attribute_t **attributes) case GNU_AK_MAY_ALIAS: case GNU_AK_MS_STRUCT: case GNU_AK_GCC_STRUCT: + check_no_argument(attribute, name); + break; + + case GNU_AK_PURE: + check_no_argument(attribute, name); + modifiers |= DM_PURE; + break; + + case GNU_AK_ALWAYS_INLINE: + check_no_argument(attribute, name); + modifiers |= DM_FORCEINLINE; + break; + case GNU_AK_DLLIMPORT: + check_no_argument(attribute, name); + modifiers |= DM_DLLIMPORT; + break; + case GNU_AK_DLLEXPORT: - if(attribute->have_arguments) { - /* should have no arguments */ - errorf(HERE, "wrong number of arguments specified for '%s' attribute", name); - eat_until_matching_token('('); - /* we have already consumed '(', so we stop before ')', eat it */ - eat(')'); - attribute->invalid = true; - } + check_no_argument(attribute, name); + modifiers |= DM_DLLEXPORT; + break; + + case GNU_AK_PACKED: + check_no_argument(attribute, name); + modifiers |= DM_PACKED; + break; + + case GNU_AK_NOINLINE: + check_no_argument(attribute, name); + modifiers |= DM_NOINLINE; + break; + + case GNU_AK_NORETURN: + check_no_argument(attribute, name); + modifiers |= DM_NORETURN; + break; + + case GNU_AK_NOTHROW: + check_no_argument(attribute, name); + modifiers |= DM_NOTHROW; + break; + + case GNU_AK_TRANSPARENT_UNION: + check_no_argument(attribute, name); + modifiers |= DM_TRANSPARENT_UNION; + break; + + case GNU_AK_CONSTRUCTOR: + check_no_argument(attribute, name); + modifiers |= DM_CONSTRUCTOR; + break; + + case GNU_AK_DESTRUCTOR: + check_no_argument(attribute, name); + modifiers |= DM_DESTRUCTOR; break; case GNU_AK_ALIGNED: @@ -1531,8 +1669,18 @@ static void parse_gnu_attribute(gnu_attribute_t **attributes) if(!attribute->have_arguments) { /* should have arguments */ errorf(HERE, "wrong number of arguments specified for '%s' attribute", name); - } else + } else { parse_gnu_attribute_model_arg(attribute); + } + break; + case GNU_AK_MODE: + if(!attribute->have_arguments) { + /* should have arguments */ + errorf(HERE, "wrong number of arguments specified for '%s' attribute", name); + } else { + parse_gnu_attribute_mode_arg(attribute); + } + break; case GNU_AK_INTERRUPT: /* may have one string argument */ if(attribute->have_arguments) @@ -1566,17 +1714,21 @@ static void parse_gnu_attribute(gnu_attribute_t **attributes) expect(')'); end_error: *attributes = head; + + return modifiers; } /** * Parse GNU attributes. */ -static void parse_attributes(gnu_attribute_t **attributes) +static decl_modifiers_t parse_attributes(gnu_attribute_t **attributes) { + decl_modifiers_t modifiers = 0; + while(true) { switch(token.type) { case T___attribute__: { - parse_gnu_attribute(attributes); + modifiers |= parse_gnu_attribute(attributes); break; } case T_asm: @@ -1599,7 +1751,7 @@ static void parse_attributes(gnu_attribute_t **attributes) attributes_finished: end_error: - return; + return modifiers; } static designator_t *parse_designation(void) @@ -1714,13 +1866,14 @@ static initializer_t *initializer_from_expression(type_t *orig_type, } } - type_t *const res_type = semantic_assign(type, expression, "initializer", - &expression->base.source_position); - if (res_type == NULL) + assign_error_t error = semantic_assign(type, expression); + if (error == ASSIGN_ERROR_INCOMPATIBLE) return NULL; + report_assign_error(error, type, expression, "initializer", + &expression->base.source_position); initializer_t *const result = allocate_initializer_zero(INITIALIZER_VALUE); - result->value.value = create_implicit_cast(expression, res_type); + result->value.value = create_implicit_cast(expression, type); return result; } @@ -2071,7 +2224,7 @@ static void skip_until(int type) { } /** - * skip any {...} blocks until a closing braket is reached. + * skip any {...} blocks until a closing bracket is reached. */ static void skip_initializers(void) { @@ -2142,6 +2295,9 @@ static initializer_t *parse_sub_initializer(type_path_t *path, = allocate_initializer_zero(INITIALIZER_DESIGNATOR); designator_initializer->designator.designator = designator; ARR_APP1(initializer_t*, initializers, designator_initializer); + + orig_type = path->top_type; + type = orig_type != NULL ? skip_typeref(orig_type) : NULL; } initializer_t *sub; @@ -2280,14 +2436,14 @@ error_parse_next: len * sizeof(initializers[0])); DEL_ARR_F(initializers); - ascend_to(path, top_path_level); + ascend_to(path, top_path_level+1); return result; end_error: skip_initializers(); DEL_ARR_F(initializers); - ascend_to(path, top_path_level); + ascend_to(path, top_path_level+1); return NULL; } @@ -2345,6 +2501,12 @@ static initializer_t *parse_initializer(parse_initializer_env_t *env) size = result->wide_string.string.size; break; + case INITIALIZER_DESIGNATOR: + case INITIALIZER_VALUE: + /* can happen for parse errors */ + size = 0; + break; + default: internal_errorf(HERE, "invalid initializer type"); } @@ -2370,7 +2532,8 @@ static declaration_t *append_declaration(declaration_t *declaration); static declaration_t *parse_compound_type_specifier(bool is_struct) { - gnu_attribute_t *attributes = NULL; + gnu_attribute_t *attributes = NULL; + decl_modifiers_t modifiers = 0; if(is_struct) { eat(T_struct); } else { @@ -2381,7 +2544,7 @@ static declaration_t *parse_compound_type_specifier(bool is_struct) declaration_t *declaration = NULL; if (token.type == T___attribute__) { - parse_attributes(&attributes); + modifiers |= parse_attributes(&attributes); } if(token.type == T_IDENTIFIER) { @@ -2411,7 +2574,7 @@ static declaration_t *parse_compound_type_specifier(bool is_struct) (is_struct ? NAMESPACE_STRUCT : NAMESPACE_UNION); declaration->source_position = token.source_position; declaration->symbol = symbol; - declaration->parent_scope = scope; + declaration->parent_scope = scope; if (symbol != NULL) { environment_push(declaration); } @@ -2419,18 +2582,20 @@ static declaration_t *parse_compound_type_specifier(bool is_struct) } if(token.type == '{') { - if(declaration->init.is_defined) { + if (declaration->init.complete) { assert(symbol != NULL); - errorf(HERE, "multiple definitions of '%s %Y'", - is_struct ? "struct" : "union", symbol); + errorf(HERE, "multiple definitions of '%s %Y' (previous definition at %P)", + is_struct ? "struct" : "union", symbol, + &declaration->source_position); declaration->scope.declarations = NULL; } - declaration->init.is_defined = true; + declaration->init.complete = true; parse_compound_type_entries(declaration); - parse_attributes(&attributes); + modifiers |= parse_attributes(&attributes); } + declaration->modifiers |= modifiers; return declaration; } @@ -2517,14 +2682,14 @@ static type_t *parse_enum_specifier(void) type->enumt.declaration = declaration; if(token.type == '{') { - if(declaration->init.is_defined) { + if(declaration->init.complete) { errorf(HERE, "multiple definitions of enum %Y", symbol); } if (symbol != NULL) { environment_push(declaration); } append_declaration(declaration); - declaration->init.is_defined = 1; + declaration->init.complete = true; parse_enum_entries(type); parse_attributes(&attributes); @@ -2614,10 +2779,8 @@ typedef enum { SPECIFIER_INT32 = 1 << 13, SPECIFIER_INT64 = 1 << 14, SPECIFIER_INT128 = 1 << 15, -#ifdef PROVIDE_COMPLEX SPECIFIER_COMPLEX = 1 << 16, SPECIFIER_IMAGINARY = 1 << 17, -#endif } specifiers_t; static type_t *create_builtin_type(symbol_t *const symbol, @@ -2628,7 +2791,7 @@ static type_t *create_builtin_type(symbol_t *const symbol, type->builtin.real_type = real_type; type_t *result = typehash_insert(type); - if (type != result) { + if(type != result) { free_type(type); } @@ -2638,8 +2801,8 @@ static type_t *create_builtin_type(symbol_t *const symbol, static type_t *get_typedef_type(symbol_t *symbol) { declaration_t *declaration = get_declaration(symbol, NAMESPACE_NORMAL); - if(declaration == NULL - || declaration->storage_class != STORAGE_CLASS_TYPEDEF) + if(declaration == NULL || + declaration->storage_class != STORAGE_CLASS_TYPEDEF) return NULL; type_t *type = allocate_type_zero(TYPE_TYPEDEF, &declaration->source_position); @@ -2672,7 +2835,7 @@ static bool check_elignment_value(long long intvalue) { static void parse_microsoft_extended_decl_modifier(declaration_specifiers_t *specifiers) { - decl_modifiers_t *modifiers = &specifiers->decl_modifiers; + decl_modifiers_t *modifiers = &specifiers->modifiers; while(true) { if(token.type == T_restrict) { @@ -2757,7 +2920,7 @@ static void parse_microsoft_extended_decl_modifier(declaration_specifiers_t *spe } } next_token(); - if(token.type == ',') { + if(token.type == ',') { next_token(); continue; } @@ -2808,10 +2971,11 @@ end_error: static void parse_declaration_specifiers(declaration_specifiers_t *specifiers) { - type_t *type = NULL; - unsigned type_qualifiers = 0; - unsigned type_specifiers = 0; - int newtype = 0; + type_t *type = NULL; + type_qualifiers_t qualifiers = TYPE_QUALIFIER_NONE; + type_modifiers_t modifiers = TYPE_MODIFIER_NONE; + unsigned type_specifiers = 0; + int newtype = 0; specifiers->source_position = token.source_position; @@ -2867,7 +3031,7 @@ static void parse_declaration_specifiers(declaration_specifiers_t *specifiers) /* type qualifiers */ #define MATCH_TYPE_QUALIFIER(token, qualifier) \ case token: \ - type_qualifiers |= qualifier; \ + qualifiers |= qualifier; \ next_token(); \ break; @@ -2910,13 +3074,12 @@ static void parse_declaration_specifiers(declaration_specifiers_t *specifiers) MATCH_SPECIFIER(T__int32, SPECIFIER_INT32, "_int32") MATCH_SPECIFIER(T__int64, SPECIFIER_INT64, "_int64") MATCH_SPECIFIER(T__int128, SPECIFIER_INT128, "_int128") -#ifdef PROVIDE_COMPLEX MATCH_SPECIFIER(T__Complex, SPECIFIER_COMPLEX, "_Complex") MATCH_SPECIFIER(T__Imaginary, SPECIFIER_IMAGINARY, "_Imaginary") -#endif + case T__forceinline: /* only in microsoft mode */ - specifiers->decl_modifiers |= DM_FORCEINLINE; + specifiers->modifiers |= DM_FORCEINLINE; case T_inline: next_token(); @@ -2942,8 +3105,9 @@ static void parse_declaration_specifiers(declaration_specifiers_t *specifiers) } case T_union: { type = allocate_type_zero(TYPE_COMPOUND_UNION, HERE); - type->compound.declaration = parse_compound_type_specifier(false); + if (type->compound.declaration->modifiers & DM_TRANSPARENT_UNION) + modifiers |= TYPE_MODIFIER_TRANSPARENT_UNION; break; } case T_enum: @@ -2958,7 +3122,10 @@ static void parse_declaration_specifiers(declaration_specifiers_t *specifiers) break; case T___attribute__: - parse_attributes(&specifiers->gnu_attributes); + specifiers->modifiers + |= parse_attributes(&specifiers->gnu_attributes); + if (specifiers->modifiers & DM_TRANSPARENT_UNION) + modifiers |= TYPE_MODIFIER_TRANSPARENT_UNION; break; case T_IDENTIFIER: { @@ -3100,26 +3267,18 @@ finish_specifiers: case SPECIFIER_BOOL: atomic_type = ATOMIC_TYPE_BOOL; break; -#ifdef PROVIDE_COMPLEX case SPECIFIER_FLOAT | SPECIFIER_COMPLEX: - atomic_type = ATOMIC_TYPE_FLOAT_COMPLEX; - break; - case SPECIFIER_DOUBLE | SPECIFIER_COMPLEX: - atomic_type = ATOMIC_TYPE_DOUBLE_COMPLEX; - break; - case SPECIFIER_LONG | SPECIFIER_DOUBLE | SPECIFIER_COMPLEX: - atomic_type = ATOMIC_TYPE_LONG_DOUBLE_COMPLEX; - break; case SPECIFIER_FLOAT | SPECIFIER_IMAGINARY: - atomic_type = ATOMIC_TYPE_FLOAT_IMAGINARY; + atomic_type = ATOMIC_TYPE_FLOAT; break; + case SPECIFIER_DOUBLE | SPECIFIER_COMPLEX: case SPECIFIER_DOUBLE | SPECIFIER_IMAGINARY: - atomic_type = ATOMIC_TYPE_DOUBLE_IMAGINARY; + atomic_type = ATOMIC_TYPE_DOUBLE; break; + case SPECIFIER_LONG | SPECIFIER_DOUBLE | SPECIFIER_COMPLEX: case SPECIFIER_LONG | SPECIFIER_DOUBLE | SPECIFIER_IMAGINARY: - atomic_type = ATOMIC_TYPE_LONG_DOUBLE_IMAGINARY; + atomic_type = ATOMIC_TYPE_LONG_DOUBLE; break; -#endif default: /* invalid specifier combination, give an error message */ if(type_specifiers == 0) { @@ -3143,18 +3302,30 @@ finish_specifiers: atomic_type = ATOMIC_TYPE_INVALID; } - type = allocate_type_zero(TYPE_ATOMIC, &builtin_source_position); - type->atomic.akind = atomic_type; - newtype = 1; + if(type_specifiers & SPECIFIER_COMPLEX && + atomic_type != ATOMIC_TYPE_INVALID) { + type = allocate_type_zero(TYPE_COMPLEX, &builtin_source_position); + type->complex.akind = atomic_type; + } else if(type_specifiers & SPECIFIER_IMAGINARY && + atomic_type != ATOMIC_TYPE_INVALID) { + type = allocate_type_zero(TYPE_IMAGINARY, &builtin_source_position); + type->imaginary.akind = atomic_type; + } else { + type = allocate_type_zero(TYPE_ATOMIC, &builtin_source_position); + type->atomic.akind = atomic_type; + } + newtype = 1; } else { if(type_specifiers != 0) { errorf(HERE, "multiple datatypes in declaration"); } } - type->base.qualifiers = type_qualifiers; /* FIXME: check type qualifiers here */ + type->base.qualifiers = qualifiers; + type->base.modifiers = modifiers; + type_t *result = typehash_insert(type); if(newtype && result != type) { free_type(type); @@ -3167,7 +3338,7 @@ end_error: static type_qualifiers_t parse_type_qualifiers(void) { - type_qualifiers_t type_qualifiers = TYPE_QUALIFIER_NONE; + type_qualifiers_t qualifiers = TYPE_QUALIFIER_NONE; while(true) { switch(token.type) { @@ -3183,7 +3354,7 @@ static type_qualifiers_t parse_type_qualifiers(void) MATCH_TYPE_QUALIFIER(T___sptr, TYPE_QUALIFIER_SPTR); default: - return type_qualifiers; + return qualifiers; } } } @@ -3206,8 +3377,9 @@ static declaration_t *parse_identifier_list(void) } last_declaration = declaration; - if(token.type != ',') + if (token.type != ',') { break; + } next_token(); } while(token.type == T_IDENTIFIER); @@ -3260,24 +3432,30 @@ static declaration_t *parse_parameter(void) static declaration_t *parse_parameters(function_type_t *type) { + declaration_t *declarations = NULL; + + eat('('); + add_anchor_token(')'); + int saved_comma_state = save_and_reset_anchor_state(','); + if(token.type == T_IDENTIFIER) { symbol_t *symbol = token.v.symbol; if(!is_typedef_symbol(symbol)) { type->kr_style_parameters = true; - return parse_identifier_list(); + declarations = parse_identifier_list(); + goto parameters_finished; } } if(token.type == ')') { type->unspecified_parameters = 1; - return NULL; + goto parameters_finished; } if(token.type == T_void && look_ahead(1)->type == ')') { next_token(); - return NULL; + goto parameters_finished; } - declaration_t *declarations = NULL; declaration_t *declaration; declaration_t *last_declaration = NULL; function_parameter_t *parameter; @@ -3288,7 +3466,7 @@ static declaration_t *parse_parameters(function_type_t *type) case T_DOTDOTDOT: next_token(); type->variadic = 1; - return declarations; + goto parameters_finished; case T_IDENTIFIER: case T___extension__: @@ -3311,12 +3489,25 @@ static declaration_t *parse_parameters(function_type_t *type) break; default: - return declarations; + goto parameters_finished; + } + if (token.type != ',') { + goto parameters_finished; } - if(token.type != ',') - return declarations; next_token(); } + + +parameters_finished: + rem_anchor_token(')'); + expect(')'); + + restore_anchor_state(',', saved_comma_state); + return declarations; + +end_error: + restore_anchor_state(',', saved_comma_state); + return NULL; } typedef enum { @@ -3411,9 +3602,6 @@ end_error: static construct_type_t *parse_function_declarator(declaration_t *declaration) { - eat('('); - add_anchor_token(')'); - type_t *type; if(declaration != NULL) { type = allocate_type_zero(TYPE_FUNCTION, &declaration->source_position); @@ -3432,13 +3620,31 @@ static construct_type_t *parse_function_declarator(declaration_t *declaration) construct_function_type->construct_type.kind = CONSTRUCT_FUNCTION; construct_function_type->function_type = type; - rem_anchor_token(')'); - expect(')'); - -end_error: return (construct_type_t*) construct_function_type; } +static void fix_declaration_type(declaration_t *declaration) +{ + decl_modifiers_t declaration_modifiers = declaration->modifiers; + type_modifiers_t type_modifiers = declaration->type->base.modifiers; + + if (declaration_modifiers & DM_TRANSPARENT_UNION) + type_modifiers |= TYPE_MODIFIER_TRANSPARENT_UNION; + + if (declaration->type->base.modifiers == type_modifiers) + return; + + type_t *copy = duplicate_type(declaration->type); + copy->base.modifiers = type_modifiers; + + type_t *result = typehash_insert(copy); + if (result != copy) { + obstack_free(type_obst, copy); + } + + declaration->type = result; +} + static construct_type_t *parse_inner_declarator(declaration_t *declaration, bool may_be_abstract) { @@ -3462,7 +3668,7 @@ static construct_type_t *parse_inner_declarator(declaration_t *declaration, } /* TODO: find out if this is correct */ - parse_attributes(&attributes); + decl_modifiers_t modifiers = parse_attributes(&attributes); construct_type_t *inner_types = NULL; @@ -3526,7 +3732,10 @@ static construct_type_t *parse_inner_declarator(declaration_t *declaration, } declarator_finished: - parse_attributes(&attributes); + modifiers = parse_attributes(&attributes); + if (declaration != NULL) { + declaration->modifiers |= modifiers; + } /* append inner_types at the end of the list, we don't to set last anymore * as it's not needed anymore */ @@ -3637,7 +3846,7 @@ static declaration_t *parse_declarator( { declaration_t *const declaration = allocate_declaration_zero(); declaration->declared_storage_class = specifiers->declared_storage_class; - declaration->decl_modifiers = specifiers->decl_modifiers; + declaration->modifiers = specifiers->modifiers; declaration->deprecated = specifiers->deprecated; declaration->deprecated_string = specifiers->deprecated_string; declaration->get_property_sym = specifiers->get_property_sym; @@ -3660,6 +3869,8 @@ static declaration_t *parse_declarator( type_t *const type = specifiers->type; declaration->type = construct_declarator_type(construct_type, type); + fix_declaration_type(declaration); + if(construct_type != NULL) { obstack_free(&temp_obst, construct_type); } @@ -3758,11 +3969,15 @@ static declaration_t *internal_record_declaration( const symbol_t *const symbol = declaration->symbol; const namespace_t namespc = (namespace_t)declaration->namespc; + assert(declaration->symbol != NULL); + declaration_t *previous_declaration = get_declaration(symbol, namespc); + type_t *const orig_type = declaration->type; type_t *const type = skip_typeref(orig_type); if (is_type_function(type) && type->function.unspecified_parameters && - warning.strict_prototypes) { + warning.strict_prototypes && + previous_declaration == NULL) { warningf(&declaration->source_position, "function declaration '%#T' is not a prototype", orig_type, declaration->symbol); @@ -3772,102 +3987,104 @@ static declaration_t *internal_record_declaration( check_type_of_main(declaration, &type->function); } - assert(declaration->symbol != NULL); - declaration_t *previous_declaration = get_declaration(symbol, namespc); - assert(declaration != previous_declaration); - if (previous_declaration != NULL) { - if (previous_declaration->parent_scope == scope) { - /* can happen for K&R style declarations */ - if(previous_declaration->type == NULL) { - previous_declaration->type = declaration->type; + if (previous_declaration != NULL + && previous_declaration->parent_scope == scope) { + /* can happen for K&R style declarations */ + if (previous_declaration->type == NULL) { + previous_declaration->type = declaration->type; + } + + const type_t *prev_type = skip_typeref(previous_declaration->type); + if (!types_compatible(type, prev_type)) { + errorf(&declaration->source_position, + "declaration '%#T' is incompatible with '%#T' (declared %P)", + orig_type, symbol, previous_declaration->type, symbol, + &previous_declaration->source_position); + } else { + unsigned old_storage_class = previous_declaration->storage_class; + if (old_storage_class == STORAGE_CLASS_ENUM_ENTRY) { + errorf(&declaration->source_position, + "redeclaration of enum entry '%Y' (declared %P)", + symbol, &previous_declaration->source_position); + return previous_declaration; } - const type_t *prev_type = skip_typeref(previous_declaration->type); - if (!types_compatible(type, prev_type)) { - errorf(&declaration->source_position, - "declaration '%#T' is incompatible with '%#T' (declared %P)", - orig_type, symbol, previous_declaration->type, symbol, - &previous_declaration->source_position); - } else { - unsigned old_storage_class = previous_declaration->storage_class; - if(old_storage_class == STORAGE_CLASS_ENUM_ENTRY) { - errorf(&declaration->source_position, - "redeclaration of enum entry '%Y' (declared %P)", - symbol, &previous_declaration->source_position); - return previous_declaration; - } + unsigned new_storage_class = declaration->storage_class; - unsigned new_storage_class = declaration->storage_class; + if (is_type_incomplete(prev_type)) { + previous_declaration->type = type; + prev_type = type; + } - if(is_type_incomplete(prev_type)) { + /* pretend no storage class means extern for function + * declarations (except if the previous declaration is neither + * none nor extern) */ + if (is_type_function(type)) { + if (prev_type->function.unspecified_parameters) { previous_declaration->type = type; prev_type = type; } - /* pretend no storage class means extern for function - * declarations (except if the previous declaration is neither - * none nor extern) */ - if (is_type_function(type)) { - switch (old_storage_class) { - case STORAGE_CLASS_NONE: - old_storage_class = STORAGE_CLASS_EXTERN; - - case STORAGE_CLASS_EXTERN: - if (is_function_definition) { - if (warning.missing_prototypes && - prev_type->function.unspecified_parameters && - !is_sym_main(symbol)) { - warningf(&declaration->source_position, - "no previous prototype for '%#T'", - orig_type, symbol); - } - } else if (new_storage_class == STORAGE_CLASS_NONE) { - new_storage_class = STORAGE_CLASS_EXTERN; - } - break; - - default: break; + switch (old_storage_class) { + case STORAGE_CLASS_NONE: + old_storage_class = STORAGE_CLASS_EXTERN; + /* FALLTHROUGH */ + + case STORAGE_CLASS_EXTERN: + if (is_function_definition) { + if (warning.missing_prototypes && + prev_type->function.unspecified_parameters && + !is_sym_main(symbol)) { + warningf(&declaration->source_position, + "no previous prototype for '%#T'", + orig_type, symbol); + } + } else if (new_storage_class == STORAGE_CLASS_NONE) { + new_storage_class = STORAGE_CLASS_EXTERN; } + break; + + default: + break; } + } - if (old_storage_class == STORAGE_CLASS_EXTERN && - new_storage_class == STORAGE_CLASS_EXTERN) { + if (old_storage_class == STORAGE_CLASS_EXTERN && + new_storage_class == STORAGE_CLASS_EXTERN) { warn_redundant_declaration: - if (warning.redundant_decls) { - warningf(&declaration->source_position, - "redundant declaration for '%Y' (declared %P)", - symbol, &previous_declaration->source_position); - } - } else if (current_function == NULL) { - if (old_storage_class != STORAGE_CLASS_STATIC && - new_storage_class == STORAGE_CLASS_STATIC) { - errorf(&declaration->source_position, - "static declaration of '%Y' follows non-static declaration (declared %P)", - symbol, &previous_declaration->source_position); - } else { - if (old_storage_class != STORAGE_CLASS_EXTERN && !is_function_definition) { - goto warn_redundant_declaration; - } - if (new_storage_class == STORAGE_CLASS_NONE) { - previous_declaration->storage_class = STORAGE_CLASS_NONE; - previous_declaration->declared_storage_class = STORAGE_CLASS_NONE; - } - } - } else { - if (old_storage_class == new_storage_class) { - errorf(&declaration->source_position, - "redeclaration of '%Y' (declared %P)", - symbol, &previous_declaration->source_position); - } else { - errorf(&declaration->source_position, - "redeclaration of '%Y' with different linkage (declared %P)", - symbol, &previous_declaration->source_position); - } + if (warning.redundant_decls && strcmp(previous_declaration->source_position.input_name, "") != 0) { + warningf(&declaration->source_position, + "redundant declaration for '%Y' (declared %P)", + symbol, &previous_declaration->source_position); + } + } else if (current_function == NULL) { + if (old_storage_class != STORAGE_CLASS_STATIC && + new_storage_class == STORAGE_CLASS_STATIC) { + errorf(&declaration->source_position, + "static declaration of '%Y' follows non-static declaration (declared %P)", + symbol, &previous_declaration->source_position); + } else if (old_storage_class != STORAGE_CLASS_EXTERN + && !is_function_definition) { + goto warn_redundant_declaration; + } else if (old_storage_class == STORAGE_CLASS_EXTERN) { + previous_declaration->storage_class = STORAGE_CLASS_NONE; + previous_declaration->declared_storage_class = STORAGE_CLASS_NONE; } + } else if (old_storage_class == new_storage_class) { + errorf(&declaration->source_position, + "redeclaration of '%Y' (declared %P)", + symbol, &previous_declaration->source_position); + } else { + errorf(&declaration->source_position, + "redeclaration of '%Y' with different linkage (declared %P)", + symbol, &previous_declaration->source_position); } - return previous_declaration; } + + if (declaration->is_inline) + previous_declaration->is_inline = true; + return previous_declaration; } else if (is_function_definition) { if (declaration->storage_class != STORAGE_CLASS_STATIC) { if (warning.missing_prototypes && !is_sym_main(symbol)) { @@ -3916,18 +4133,18 @@ static void parser_error_multiple_definition(declaration_t *declaration, } static bool is_declaration_specifier(const token_t *token, - bool only_type_specifiers) + bool only_specifiers_qualifiers) { switch(token->type) { TYPE_SPECIFIERS + TYPE_QUALIFIERS return true; case T_IDENTIFIER: return is_typedef_symbol(token->v.symbol); case T___extension__: STORAGE_CLASSES - TYPE_QUALIFIERS - return !only_type_specifiers; + return !only_specifiers_qualifiers; default: return false; @@ -3985,7 +4202,7 @@ static void parse_anonymous_declaration_rest( declaration->type = specifiers->type; declaration->declared_storage_class = specifiers->declared_storage_class; declaration->source_position = specifiers->source_position; - declaration->decl_modifiers = specifiers->decl_modifiers; + declaration->modifiers = specifiers->modifiers; if (declaration->declared_storage_class != STORAGE_CLASS_NONE) { warningf(&declaration->source_position, @@ -4098,13 +4315,27 @@ static void parse_declaration(parsed_declaration_func finished_declaration) } } +static type_t *get_default_promoted_type(type_t *orig_type) +{ + type_t *result = orig_type; + + type_t *type = skip_typeref(orig_type); + if(is_type_integer(type)) { + result = promote_integer(type); + } else if(type == type_float) { + result = type_double; + } + + return result; +} + static void parse_kr_declaration_list(declaration_t *declaration) { type_t *type = skip_typeref(declaration->type); - if(!is_type_function(type)) + if (!is_type_function(type)) return; - if(!type->function.kr_style_parameters) + if (!type->function.kr_style_parameters) return; /* push function parameters */ @@ -4113,14 +4344,14 @@ static void parse_kr_declaration_list(declaration_t *declaration) set_scope(&declaration->scope); declaration_t *parameter = declaration->scope.declarations; - for( ; parameter != NULL; parameter = parameter->next) { + for ( ; parameter != NULL; parameter = parameter->next) { assert(parameter->parent_scope == NULL); parameter->parent_scope = scope; environment_push(parameter); } /* parse declaration list */ - while(is_declaration_specifier(&token, false)) { + while (is_declaration_specifier(&token, false)) { parse_declaration(finished_kr_declaration); } @@ -4131,7 +4362,6 @@ static void parse_kr_declaration_list(declaration_t *declaration) /* update function type */ type_t *new_type = duplicate_type(type); - new_type->function.kr_style_parameters = false; function_parameter_t *parameters = NULL; function_parameter_t *last_parameter = NULL; @@ -4157,6 +4387,11 @@ static void parse_kr_declaration_list(declaration_t *declaration) semantic_parameter(parameter_declaration); parameter_type = parameter_declaration->type; + /* + * we need the default promoted types for the function type + */ + parameter_type = get_default_promoted_type(parameter_type); + function_parameter_t *function_parameter = obstack_alloc(type_obst, sizeof(function_parameter[0])); memset(function_parameter, 0, sizeof(function_parameter[0])); @@ -4169,7 +4404,11 @@ static void parse_kr_declaration_list(declaration_t *declaration) } last_parameter = function_parameter; } - new_type->function.parameters = parameters; + + /* § 6.9.1.7: A K&R style parameter list does NOT act as a function + * prototype */ + new_type->function.parameters = parameters; + new_type->function.unspecified_parameters = true; type = typehash_insert(new_type); if(type != new_type) { @@ -4309,7 +4548,9 @@ static void parse_external_declaration(void) /* § 6.7.5.3 (14) a function definition with () means no * parameters (and not unspecified parameters) */ - if(type->function.unspecified_parameters) { + if(type->function.unspecified_parameters + && type->function.parameters == NULL + && !type->function.kr_style_parameters) { type_t *duplicate = duplicate_type(type); duplicate->function.unspecified_parameters = false; @@ -4339,6 +4580,10 @@ static void parse_external_declaration(void) assert(parameter->parent_scope == NULL || parameter->parent_scope == scope); parameter->parent_scope = scope; + if (parameter->symbol == NULL) { + errorf(&ndeclaration->source_position, "parameter name omitted"); + continue; + } environment_push(parameter); } @@ -4438,7 +4683,7 @@ static void parse_compound_declarators(declaration_t *struct_declaration, declaration->declared_storage_class = STORAGE_CLASS_NONE; declaration->storage_class = STORAGE_CLASS_NONE; declaration->source_position = source_position; - declaration->decl_modifiers = specifiers->decl_modifiers; + declaration->modifiers = specifiers->modifiers; declaration->type = type; } else { declaration = parse_declarator(specifiers,/*may_be_abstract=*/true); @@ -4717,20 +4962,43 @@ static declaration_t *create_implicit_function(symbol_t *symbol, declaration->type = type; declaration->symbol = symbol; declaration->source_position = *source_position; - declaration->parent_scope = global_scope; - scope_t *old_scope = scope; - set_scope(global_scope); + bool strict_prototypes_old = warning.strict_prototypes; + warning.strict_prototypes = false; + record_declaration(declaration); + warning.strict_prototypes = strict_prototypes_old; - environment_push(declaration); - /* prepends the declaration to the global declarations list */ - declaration->next = scope->declarations; - scope->declarations = declaration; + return declaration; +} - assert(scope == global_scope); - set_scope(old_scope); +/** + * Creates a return_type (func)(argument_type) function type if not + * already exists. + */ +static type_t *make_function_2_type(type_t *return_type, type_t *argument_type1, + type_t *argument_type2) +{ + function_parameter_t *parameter2 + = obstack_alloc(type_obst, sizeof(parameter2[0])); + memset(parameter2, 0, sizeof(parameter2[0])); + parameter2->type = argument_type2; - return declaration; + function_parameter_t *parameter1 + = obstack_alloc(type_obst, sizeof(parameter1[0])); + memset(parameter1, 0, sizeof(parameter1[0])); + parameter1->type = argument_type1; + parameter1->next = parameter2; + + type_t *type = allocate_type_zero(TYPE_FUNCTION, &builtin_source_position); + type->function.return_type = return_type; + type->function.parameters = parameter1; + + type_t *result = typehash_insert(type); + if(result != type) { + free_type(type); + } + + return result; } /** @@ -4759,6 +5027,20 @@ static type_t *make_function_1_type(type_t *return_type, type_t *argument_type) return result; } +static type_t *make_function_0_type(type_t *return_type) +{ + type_t *type = allocate_type_zero(TYPE_FUNCTION, &builtin_source_position); + type->function.return_type = return_type; + type->function.parameters = NULL; + + type_t *result = typehash_insert(type); + if(result != type) { + free_type(type); + } + + return result; +} + /** * Creates a function type for some function like builtins. * @@ -4769,6 +5051,8 @@ static type_t *get_builtin_symbol_type(symbol_t *symbol) switch(symbol->ID) { case T___builtin_alloca: return make_function_1_type(type_void_ptr, type_size_t); + case T___builtin_huge_val: + return make_function_0_type(type_double); case T___builtin_nan: return make_function_1_type(type_double, type_char_ptr); case T___builtin_nanf: @@ -4777,6 +5061,8 @@ static type_t *get_builtin_symbol_type(symbol_t *symbol) return make_function_1_type(type_long_double, type_char_ptr); case T___builtin_va_end: return make_function_1_type(type_void, type_valist); + case T___builtin_expect: + return make_function_2_type(type_long, type_long, type_long); default: internal_errorf(HERE, "not implemented builtin symbol found"); } @@ -5366,6 +5652,7 @@ end_error: return create_invalid_expression(); } +#if 0 /** * Parses a __builtin_expect() expression. */ @@ -5388,6 +5675,7 @@ static expression_t *parse_builtin_expect(void) end_error: return create_invalid_expression(); } +#endif /** * Parses a MS assume() expression. @@ -5470,11 +5758,12 @@ static expression_t *parse_primary_expression(void) case T___builtin_offsetof: return parse_offsetof(); case T___builtin_va_start: return parse_va_start(); case T___builtin_va_arg: return parse_va_arg(); - case T___builtin_expect: return parse_builtin_expect(); + case T___builtin_expect: case T___builtin_alloca: case T___builtin_nan: case T___builtin_nand: case T___builtin_nanf: + case T___builtin_huge_val: case T___builtin_va_end: return parse_builtin_symbol(); case T___builtin_isgreater: case T___builtin_isgreaterequal: @@ -5563,20 +5852,50 @@ static expression_t *parse_array_expression(unsigned precedence, return expression; } -static expression_t *parse_typeprop(expression_kind_t kind, unsigned precedence) +static expression_t *parse_typeprop(expression_kind_t const kind, + source_position_t const pos, + unsigned const precedence) { expression_t *tp_expression = allocate_expression_zero(kind); - tp_expression->base.type = type_size_t; + tp_expression->base.type = type_size_t; + tp_expression->base.source_position = pos; - if(token.type == '(' && is_declaration_specifier(look_ahead(1), true)) { + char const* const what = kind == EXPR_SIZEOF ? "sizeof" : "alignof"; + + if (token.type == '(' && is_declaration_specifier(look_ahead(1), true)) { next_token(); add_anchor_token(')'); - tp_expression->typeprop.type = parse_typename(); + type_t* const orig_type = parse_typename(); + tp_expression->typeprop.type = orig_type; + + type_t const* const type = skip_typeref(orig_type); + char const* const wrong_type = + is_type_incomplete(type) ? "incomplete" : + type->kind == TYPE_FUNCTION ? "function designator" : + type->kind == TYPE_BITFIELD ? "bitfield" : + NULL; + if (wrong_type != NULL) { + errorf(&pos, "operand of %s expression must not be %s type '%T'", + what, wrong_type, type); + } + rem_anchor_token(')'); expect(')'); } else { expression_t *expression = parse_sub_expression(precedence); - expression->base.type = revert_automatic_type_conversion(expression); + + type_t* const orig_type = revert_automatic_type_conversion(expression); + expression->base.type = orig_type; + + type_t const* const type = skip_typeref(orig_type); + char const* const wrong_type = + is_type_incomplete(type) ? "incomplete" : + type->kind == TYPE_FUNCTION ? "function designator" : + type->kind == TYPE_BITFIELD ? "bitfield" : + NULL; + if (wrong_type != NULL) { + errorf(&pos, "operand of %s expression must not be expression of %s type '%T'", what, wrong_type, type); + } tp_expression->typeprop.type = expression->base.type; tp_expression->typeprop.tp_expression = expression; @@ -5589,14 +5908,16 @@ end_error: static expression_t *parse_sizeof(unsigned precedence) { + source_position_t pos = *HERE; eat(T_sizeof); - return parse_typeprop(EXPR_SIZEOF, precedence); + return parse_typeprop(EXPR_SIZEOF, pos, precedence); } static expression_t *parse_alignof(unsigned precedence) { + source_position_t pos = *HERE; eat(T___alignof__); - return parse_typeprop(EXPR_SIZEOF, precedence); + return parse_typeprop(EXPR_ALIGNOF, pos, precedence); } static expression_t *parse_select_expression(unsigned precedence, @@ -5611,7 +5932,7 @@ static expression_t *parse_select_expression(unsigned precedence, expression_t *select = allocate_expression_zero(EXPR_SELECT); select->select.compound = compound; - if(token.type != T_IDENTIFIER) { + if (token.type != T_IDENTIFIER) { parse_error_expected("while parsing select", T_IDENTIFIER, NULL); return select; } @@ -5623,7 +5944,7 @@ static expression_t *parse_select_expression(unsigned precedence, type_t *const type = skip_typeref(orig_type); type_t *type_left = type; - if(is_pointer) { + if (is_pointer) { if (!is_type_pointer(type)) { if (is_type_valid(type)) { errorf(HERE, "left hand side of '->' is not a pointer, but '%T'", orig_type); @@ -5645,14 +5966,14 @@ static expression_t *parse_select_expression(unsigned precedence, declaration_t *const declaration = type_left->compound.declaration; - if(!declaration->init.is_defined) { + if (!declaration->init.complete) { errorf(HERE, "request for member '%Y' of incomplete type '%T'", symbol, type_left); return create_invalid_expression(); } declaration_t *iter = find_compound_entry(declaration, symbol); - if(iter == NULL) { + if (iter == NULL) { errorf(HERE, "'%T' has no member named '%Y'", orig_type, symbol); return create_invalid_expression(); } @@ -5664,18 +5985,58 @@ static expression_t *parse_select_expression(unsigned precedence, select->select.compound_entry = iter; select->base.type = expression_type; - if(expression_type->kind == TYPE_BITFIELD) { - expression_t *extract - = allocate_expression_zero(EXPR_UNARY_BITFIELD_EXTRACT); - extract->unary.value = select; - extract->base.type = expression_type->bitfield.base_type; - - return extract; + type_t *skipped = skip_typeref(iter->type); + if (skipped->kind == TYPE_BITFIELD) { + select->base.type = skipped->bitfield.base_type; } return select; } +static void check_call_argument(const function_parameter_t *parameter, + call_argument_t *argument) +{ + type_t *expected_type = parameter->type; + type_t *expected_type_skip = skip_typeref(expected_type); + assign_error_t error = ASSIGN_ERROR_INCOMPATIBLE; + expression_t *arg_expr = argument->expression; + + /* handle transparent union gnu extension */ + if (is_type_union(expected_type_skip) + && (expected_type_skip->base.modifiers + & TYPE_MODIFIER_TRANSPARENT_UNION)) { + declaration_t *union_decl = expected_type_skip->compound.declaration; + + declaration_t *declaration = union_decl->scope.declarations; + type_t *best_type = NULL; + for ( ; declaration != NULL; declaration = declaration->next) { + type_t *decl_type = declaration->type; + error = semantic_assign(decl_type, arg_expr); + if (error == ASSIGN_ERROR_INCOMPATIBLE + || error == ASSIGN_ERROR_POINTER_QUALIFIER_MISSING) + continue; + + if (error == ASSIGN_SUCCESS) { + best_type = decl_type; + } else if (best_type == NULL) { + best_type = decl_type; + } + } + + if (best_type != NULL) { + expected_type = best_type; + } + } + + error = semantic_assign(expected_type, arg_expr); + argument->expression = create_implicit_cast(argument->expression, + expected_type); + + /* TODO report exact scope in error messages (like "in 3rd parameter") */ + report_assign_error(error, expected_type, arg_expr, "function call", + &arg_expr->base.source_position); +} + /** * Parse a call expression, ie. expression '( ... )'. * @@ -5736,57 +6097,36 @@ static expression_t *parse_call_expression(unsigned precedence, rem_anchor_token(')'); expect(')'); - if(function_type != NULL) { - function_parameter_t *parameter = function_type->parameters; - call_argument_t *argument = call->arguments; + if(function_type == NULL) + return result; + + function_parameter_t *parameter = function_type->parameters; + call_argument_t *argument = call->arguments; + if (!function_type->unspecified_parameters) { for( ; parameter != NULL && argument != NULL; parameter = parameter->next, argument = argument->next) { - type_t *expected_type = parameter->type; - /* TODO report scope in error messages */ - expression_t *const arg_expr = argument->expression; - type_t *const res_type = semantic_assign(expected_type, arg_expr, - "function call", - &arg_expr->base.source_position); - if (res_type == NULL) { - /* TODO improve error message */ - errorf(&arg_expr->base.source_position, - "Cannot call function with argument '%E' of type '%T' where type '%T' is expected", - arg_expr, arg_expr->base.type, expected_type); - } else { - argument->expression = create_implicit_cast(argument->expression, expected_type); - } + check_call_argument(parameter, argument); } - /* too few parameters */ - if(parameter != NULL) { + + if (parameter != NULL) { errorf(HERE, "too few arguments to function '%E'", expression); - } else if(argument != NULL) { - /* too many parameters */ - if(!function_type->variadic - && !function_type->unspecified_parameters) { - errorf(HERE, "too many arguments to function '%E'", expression); - } else { - /* do default promotion */ - for( ; argument != NULL; argument = argument->next) { - type_t *type = argument->expression->base.type; - - type = skip_typeref(type); - if(is_type_integer(type)) { - type = promote_integer(type); - } else if(type == type_float) { - type = type_double; - } + } else if (argument != NULL && !function_type->variadic) { + errorf(HERE, "too many arguments to function '%E'", expression); + } + } - argument->expression - = create_implicit_cast(argument->expression, type); - } + /* do default promotion */ + for( ; argument != NULL; argument = argument->next) { + type_t *type = argument->expression->base.type; - check_format(&result->call); - } - } else { - check_format(&result->call); - } + type = get_default_promoted_type(type); + + argument->expression + = create_implicit_cast(argument->expression, type); } + check_format(&result->call); + return result; end_error: return create_invalid_expression(); @@ -5873,12 +6213,33 @@ static expression_t *parse_conditional_expression(unsigned precedence, other_expression = true_expression; } - if(is_type_pointer(other_type)) { - if(!pointers_compatible(true_type, false_type)) { + /* TODO Treat (void*)0 as null pointer constant */ + if (is_type_pointer(other_type)) { + type_t *to1 = skip_typeref(pointer_type->pointer.points_to); + type_t *to2 = skip_typeref(other_type->pointer.points_to); + + type_t *to; + if (is_type_atomic(to1, ATOMIC_TYPE_VOID) || + is_type_atomic(to2, ATOMIC_TYPE_VOID)) { + to = type_void; + } else if (types_compatible(get_unqualified_type(to1), + get_unqualified_type(to2))) { + to = to1; + } else { warningf(&expression->base.source_position, - "pointer types '%T' and '%T' in conditional expression are incompatible", true_type, false_type); + "pointer types '%T' and '%T' in conditional expression are incompatible", + true_type, false_type); + to = type_void; } - result_type = true_type; + + type_t *const copy = duplicate_type(to); + copy->base.qualifiers = to1->base.qualifiers | to2->base.qualifiers; + + type_t *const type = typehash_insert(copy); + if (type != copy) + free_type(copy); + + result_type = make_pointer_type(type, TYPE_QUALIFIER_NONE); } else if(is_null_pointer_constant(other_expression)) { result_type = pointer_type; } else if(is_type_integer(other_type)) { @@ -5946,19 +6307,37 @@ end_error: return create_invalid_expression(); } +static void check_pointer_arithmetic(const source_position_t *source_position, + type_t *pointer_type, + type_t *orig_pointer_type) +{ + type_t *points_to = pointer_type->pointer.points_to; + points_to = skip_typeref(points_to); + + if (is_type_incomplete(points_to) && + (! (c_mode & _GNUC) + || !is_type_atomic(points_to, ATOMIC_TYPE_VOID))) { + errorf(source_position, + "arithmetic with pointer to incomplete type '%T' not allowed", + orig_pointer_type); + } else if (is_type_function(points_to)) { + errorf(source_position, + "arithmetic with pointer to function type '%T' not allowed", + orig_pointer_type); + } +} + static void semantic_incdec(unary_expression_t *expression) { type_t *const orig_type = expression->value->base.type; type_t *const type = skip_typeref(orig_type); - /* TODO !is_type_real && !is_type_pointer */ - if(!is_type_arithmetic(type) && type->kind != TYPE_POINTER) { - if (is_type_valid(type)) { - /* TODO: improve error message */ - errorf(HERE, "operation needs an arithmetic or pointer type"); - } - return; + if (is_type_pointer(type)) { + check_pointer_arithmetic(&expression->base.source_position, + type, orig_type); + } else if (!is_type_real(type) && is_type_valid(type)) { + /* TODO: improve error message */ + errorf(HERE, "operation needs an arithmetic or pointer type"); } - expression->base.type = orig_type; } @@ -6021,6 +6400,25 @@ static void semantic_dereference(unary_expression_t *expression) expression->base.type = result_type; } +static void set_address_taken(expression_t *expression) +{ + if(expression->kind != EXPR_REFERENCE) + return; + + declaration_t *const declaration = expression->reference.declaration; + /* happens for parse errors */ + if(declaration == NULL) + return; + + if (declaration->storage_class == STORAGE_CLASS_REGISTER) { + errorf(&expression->base.source_position, + "address of register variable '%Y' requested", + declaration->symbol); + } else { + declaration->address_taken = 1; + } +} + /** * Check the semantic of the address taken expression. */ @@ -6033,17 +6431,7 @@ static void semantic_take_addr(unary_expression_t *expression) if(!is_type_valid(orig_type)) return; - if(value->kind == EXPR_REFERENCE) { - declaration_t *const declaration = value->reference.declaration; - if(declaration != NULL) { - if (declaration->storage_class == STORAGE_CLASS_REGISTER) { - errorf(&expression->base.source_position, - "address of register variable '%Y' requested", - declaration->symbol); - } - declaration->address_taken = 1; - } - } + set_address_taken(value); expression->base.type = make_pointer_type(orig_type, TYPE_QUALIFIER_NONE); } @@ -6202,19 +6590,25 @@ static void semantic_add(binary_expression_t *expression) type_t *const type_left = skip_typeref(orig_type_left); type_t *const type_right = skip_typeref(orig_type_right); - /* § 5.6.5 */ - if(is_type_arithmetic(type_left) && is_type_arithmetic(type_right)) { + /* § 6.5.6 */ + if (is_type_arithmetic(type_left) && is_type_arithmetic(type_right)) { type_t *arithmetic_type = semantic_arithmetic(type_left, type_right); expression->left = create_implicit_cast(left, arithmetic_type); expression->right = create_implicit_cast(right, arithmetic_type); expression->base.type = arithmetic_type; return; - } else if(is_type_pointer(type_left) && is_type_integer(type_right)) { + } else if (is_type_pointer(type_left) && is_type_integer(type_right)) { + check_pointer_arithmetic(&expression->base.source_position, + type_left, orig_type_left); expression->base.type = type_left; - } else if(is_type_pointer(type_right) && is_type_integer(type_left)) { + } else if (is_type_pointer(type_right) && is_type_integer(type_left)) { + check_pointer_arithmetic(&expression->base.source_position, + type_right, orig_type_right); expression->base.type = type_right; } else if (is_type_valid(type_left) && is_type_valid(type_right)) { - errorf(HERE, "invalid operands to binary + ('%T', '%T')", orig_type_left, orig_type_right); + errorf(&expression->base.source_position, + "invalid operands to binary + ('%T', '%T')", + orig_type_left, orig_type_right); } } @@ -6235,17 +6629,29 @@ static void semantic_sub(binary_expression_t *expression) expression->base.type = arithmetic_type; return; } else if(is_type_pointer(type_left) && is_type_integer(type_right)) { + check_pointer_arithmetic(&expression->base.source_position, + type_left, orig_type_left); expression->base.type = type_left; } else if(is_type_pointer(type_left) && is_type_pointer(type_right)) { - if(!pointers_compatible(type_left, type_right)) { - errorf(HERE, - "pointers to incompatible objects to binary '-' ('%T', '%T')", + type_t *const unqual_left = get_unqualified_type(skip_typeref(type_left->pointer.points_to)); + type_t *const unqual_right = get_unqualified_type(skip_typeref(type_right->pointer.points_to)); + if (!types_compatible(unqual_left, unqual_right)) { + errorf(&expression->base.source_position, + "subtracting pointers to incompatible types '%T' and '%T'", orig_type_left, orig_type_right); - } else { - expression->base.type = type_ptrdiff_t; + } else if (!is_type_object(unqual_left)) { + if (is_type_atomic(unqual_left, ATOMIC_TYPE_VOID)) { + warningf(&expression->base.source_position, + "subtracting pointers to void"); + } else { + errorf(&expression->base.source_position, + "subtracting pointers to non-object types '%T'", + orig_type_left); + } } + expression->base.type = type_ptrdiff_t; } else if (is_type_valid(type_left) && is_type_valid(type_right)) { - errorf(HERE, "invalid operands to binary '-' ('%T', '%T')", + errorf(HERE, "invalid operands of types '%T' and '%T' to binary '-'", orig_type_left, orig_type_right); } } @@ -6287,9 +6693,9 @@ static void semantic_comparison(binary_expression_t *expression) other_expr = left; } - type_t *other_type = skip_typeref(other_expr->base.type); if(const_expr != NULL) { - long val = fold_constant(const_expr); + type_t *other_type = skip_typeref(other_expr->base.type); + long val = fold_constant(const_expr); /* TODO: check if val can be represented by other_type */ (void) other_type; (void) val; @@ -6322,6 +6728,74 @@ static void semantic_comparison(binary_expression_t *expression) expression->base.type = type_int; } +/** + * Checks if a compound type has constant fields. + */ +static bool has_const_fields(const compound_type_t *type) +{ + const scope_t *scope = &type->declaration->scope; + const declaration_t *declaration = scope->declarations; + + for (; declaration != NULL; declaration = declaration->next) { + if (declaration->namespc != NAMESPACE_NORMAL) + continue; + + const type_t *decl_type = skip_typeref(declaration->type); + if (decl_type->base.qualifiers & TYPE_QUALIFIER_CONST) + return true; + } + /* TODO */ + return false; +} + +static bool is_lvalue(const expression_t *expression) +{ + switch (expression->kind) { + case EXPR_REFERENCE: + case EXPR_ARRAY_ACCESS: + case EXPR_SELECT: + case EXPR_UNARY_DEREFERENCE: + return true; + + default: + return false; + } +} + +static bool is_valid_assignment_lhs(expression_t const* const left) +{ + type_t *const orig_type_left = revert_automatic_type_conversion(left); + type_t *const type_left = skip_typeref(orig_type_left); + + if (!is_lvalue(left)) { + errorf(HERE, "left hand side '%E' of assignment is not an lvalue", + left); + return false; + } + + if (is_type_array(type_left)) { + errorf(HERE, "cannot assign to arrays ('%E')", left); + return false; + } + if (type_left->base.qualifiers & TYPE_QUALIFIER_CONST) { + errorf(HERE, "assignment to readonly location '%E' (type '%T')", left, + orig_type_left); + return false; + } + if (is_type_incomplete(type_left)) { + errorf(HERE, "left-hand side '%E' of assignment has incomplete type '%T'", + left, orig_type_left); + return false; + } + if (is_type_compound(type_left) && has_const_fields(&type_left->compound)) { + errorf(HERE, "cannot assign to '%E' because compound type '%T' has readonly fields", + left, orig_type_left); + return false; + } + + return true; +} + static void semantic_arithmetic_assign(binary_expression_t *expression) { expression_t *left = expression->left; @@ -6329,6 +6803,9 @@ static void semantic_arithmetic_assign(binary_expression_t *expression) type_t *orig_type_left = left->base.type; type_t *orig_type_right = right->base.type; + if (!is_valid_assignment_lhs(left)) + return; + type_t *type_left = skip_typeref(orig_type_left); type_t *type_right = skip_typeref(orig_type_right); @@ -6358,6 +6835,9 @@ static void semantic_arithmetic_addsubb_assign(binary_expression_t *expression) type_t *const type_left = skip_typeref(orig_type_left); type_t *const type_right = skip_typeref(orig_type_right); + if (!is_valid_assignment_lhs(left)) + return; + 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. @@ -6367,6 +6847,8 @@ static void semantic_arithmetic_addsubb_assign(binary_expression_t *expression) expression->right = create_implicit_cast(right, arithmetic_type); expression->base.type = type_left; } else if (is_type_pointer(type_left) && is_type_integer(type_right)) { + check_pointer_arithmetic(&expression->base.source_position, + type_left, orig_type_left); expression->base.type = type_left; } else if (is_type_valid(type_left) && is_type_valid(type_right)) { errorf(HERE, "incompatible types '%T' and '%T' in assignment", orig_type_left, orig_type_right); @@ -6396,26 +6878,6 @@ static void semantic_logical_op(binary_expression_t *expression) expression->base.type = type_int; } -/** - * Checks if a compound type has constant fields. - */ -static bool has_const_fields(const compound_type_t *type) -{ - const scope_t *scope = &type->declaration->scope; - const declaration_t *declaration = scope->declarations; - - for (; declaration != NULL; declaration = declaration->next) { - if (declaration->namespc != NAMESPACE_NORMAL) - continue; - - const type_t *decl_type = skip_typeref(declaration->type); - if (decl_type->base.qualifiers & TYPE_QUALIFIER_CONST) - return true; - } - /* TODO */ - return false; -} - /** * Check the semantic restrictions of a binary assign expression. */ @@ -6427,38 +6889,13 @@ static void semantic_binexpr_assign(binary_expression_t *expression) type_t *type_left = revert_automatic_type_conversion(left); type_left = skip_typeref(orig_type_left); - /* must be a modifiable lvalue */ - if (is_type_array(type_left)) { - errorf(HERE, "cannot assign to arrays ('%E')", left); - return; - } - if(type_left->base.qualifiers & TYPE_QUALIFIER_CONST) { - errorf(HERE, "assignment to readonly location '%E' (type '%T')", left, - orig_type_left); + if (!is_valid_assignment_lhs(left)) return; - } - if(is_type_incomplete(type_left)) { - errorf(HERE, - "left-hand side of assignment '%E' has incomplete type '%T'", - left, orig_type_left); - return; - } - if(is_type_compound(type_left) && has_const_fields(&type_left->compound)) { - errorf(HERE, "cannot assign to '%E' because compound type '%T' has readonly fields", - left, orig_type_left); - return; - } - type_t *const res_type = semantic_assign(orig_type_left, expression->right, + assign_error_t error = semantic_assign(orig_type_left, expression->right); + report_assign_error(error, orig_type_left, expression->right, "assignment", &left->base.source_position); - if (res_type == NULL) { - errorf(&expression->base.source_position, - "cannot assign to '%T' from '%T'", - orig_type_left, expression->right->base.type); - } else { - expression->right = create_implicit_cast(expression->right, res_type); - } - + expression->right = create_implicit_cast(expression->right, orig_type_left); expression->base.type = orig_type_left; } @@ -6543,7 +6980,6 @@ static bool expression_has_effect(const expression_t *const expr) case EXPR_UNARY_CAST_IMPLICIT: return true; case EXPR_UNARY_ASSUME: return true; - case EXPR_UNARY_BITFIELD_EXTRACT: return false; case EXPR_BINARY_ADD: return false; case EXPR_BINARY_SUB: return false; @@ -6784,13 +7220,13 @@ static void init_expression_parsers(void) register_infix_parser(parse_EXPR_UNARY_POSTFIX_DECREMENT, T_MINUSMINUS, 30); - register_infix_parser(parse_EXPR_BINARY_MUL, '*', 16); - register_infix_parser(parse_EXPR_BINARY_DIV, '/', 16); - register_infix_parser(parse_EXPR_BINARY_MOD, '%', 16); - register_infix_parser(parse_EXPR_BINARY_SHIFTLEFT, T_LESSLESS, 16); - register_infix_parser(parse_EXPR_BINARY_SHIFTRIGHT, T_GREATERGREATER, 16); - register_infix_parser(parse_EXPR_BINARY_ADD, '+', 15); - register_infix_parser(parse_EXPR_BINARY_SUB, '-', 15); + register_infix_parser(parse_EXPR_BINARY_MUL, '*', 17); + register_infix_parser(parse_EXPR_BINARY_DIV, '/', 17); + register_infix_parser(parse_EXPR_BINARY_MOD, '%', 17); + register_infix_parser(parse_EXPR_BINARY_ADD, '+', 16); + register_infix_parser(parse_EXPR_BINARY_SUB, '-', 16); + register_infix_parser(parse_EXPR_BINARY_SHIFTLEFT, T_LESSLESS, 15); + register_infix_parser(parse_EXPR_BINARY_SHIFTRIGHT, T_GREATERGREATER, 15); register_infix_parser(parse_EXPR_BINARY_LESS, '<', 14); register_infix_parser(parse_EXPR_BINARY_GREATER, '>', 14); register_infix_parser(parse_EXPR_BINARY_LESSEQUAL, T_LESSEQUAL, 14); @@ -6841,42 +7277,49 @@ static void init_expression_parsers(void) } /** - * Parse a asm statement constraints specification. + * Parse a asm statement arguments specification. */ -static asm_constraint_t *parse_asm_constraints(void) +static asm_argument_t *parse_asm_arguments(bool is_out) { - asm_constraint_t *result = NULL; - asm_constraint_t *last = NULL; + asm_argument_t *result = NULL; + asm_argument_t *last = NULL; - while(token.type == T_STRING_LITERAL || token.type == '[') { - asm_constraint_t *constraint = allocate_ast_zero(sizeof(constraint[0])); - memset(constraint, 0, sizeof(constraint[0])); + while (token.type == T_STRING_LITERAL || token.type == '[') { + asm_argument_t *argument = allocate_ast_zero(sizeof(argument[0])); + memset(argument, 0, sizeof(argument[0])); - if(token.type == '[') { + if (token.type == '[') { eat('['); - if(token.type != T_IDENTIFIER) { - parse_error_expected("while parsing asm constraint", + if (token.type != T_IDENTIFIER) { + parse_error_expected("while parsing asm argument", T_IDENTIFIER, NULL); return NULL; } - constraint->symbol = token.v.symbol; + argument->symbol = token.v.symbol; expect(']'); } - constraint->constraints = parse_string_literals(); + argument->constraints = parse_string_literals(); expect('('); - constraint->expression = parse_expression(); + expression_t *expression = parse_expression(); + argument->expression = expression; + if (is_out && !is_lvalue(expression)) { + errorf(&expression->base.source_position, + "asm output argument is not an lvalue"); + } expect(')'); - if(last != NULL) { - last->next = constraint; + set_address_taken(expression); + + if (last != NULL) { + last->next = argument; } else { - result = constraint; + result = argument; } - last = constraint; + last = argument; - if(token.type != ',') + if (token.type != ',') break; eat(','); } @@ -6941,14 +7384,14 @@ static statement_t *parse_asm_statement(void) } eat(':'); - asm_statement->inputs = parse_asm_constraints(); + asm_statement->outputs = parse_asm_arguments(true); if(token.type != ':') { rem_anchor_token(':'); goto end_of_asm; } eat(':'); - asm_statement->outputs = parse_asm_constraints(); + asm_statement->inputs = parse_asm_arguments(false); if(token.type != ':') { rem_anchor_token(':'); goto end_of_asm; @@ -7356,7 +7799,7 @@ static statement_t *parse_goto(void) if(token.type != T_IDENTIFIER) { parse_error_expected("while parsing goto", T_IDENTIFIER, NULL); eat_statement(); - return NULL; + goto end_error; } symbol_t *symbol = token.v.symbol; next_token(); @@ -7538,18 +7981,14 @@ static statement_t *parse_return(void) "'return' with a value, in function returning void"); return_value = NULL; } else { - type_t *const res_type = semantic_assign(return_type, - return_value, "'return'", &statement->base.source_position); - if (res_type == NULL) { - errorf(&statement->base.source_position, - "cannot return something of type '%T' in function returning '%T'", - return_value->base.type, return_type); - } else { - return_value = create_implicit_cast(return_value, res_type); - } + assign_error_t error = semantic_assign(return_type, return_value); + report_assign_error(error, return_type, return_value, "'return'", + &statement->base.source_position); + return_value = create_implicit_cast(return_value, return_type); } /* check for returning address of a local var */ - if (return_value->base.kind == EXPR_UNARY_TAKE_ADDRESS) { + if (return_value != NULL && + return_value->base.kind == EXPR_UNARY_TAKE_ADDRESS) { const expression_t *expression = return_value->unary.value; if (is_local_variable(expression)) { warningf(&statement->base.source_position, @@ -7921,18 +8360,8 @@ static void check_unused_globals(void) /** * Parse a translation unit. */ -static translation_unit_t *parse_translation_unit(void) +static void parse_translation_unit(void) { - translation_unit_t *unit = allocate_ast_zero(sizeof(unit[0])); - - assert(global_scope == NULL); - global_scope = &unit->scope; - - assert(scope == NULL); - set_scope(&unit->scope); - - initialize_builtin_types(); - while(token.type != T_EOF) { if (token.type == ';') { /* TODO error in strict mode */ @@ -7942,16 +8371,6 @@ static translation_unit_t *parse_translation_unit(void) parse_external_declaration(); } } - - assert(scope == &unit->scope); - scope = NULL; - last_declaration = NULL; - - assert(global_scope == &unit->scope); - check_unused_globals(); - global_scope = NULL; - - return unit; } /** @@ -7959,7 +8378,7 @@ static translation_unit_t *parse_translation_unit(void) * * @return the translation unit or NULL if errors occurred. */ -translation_unit_t *parse(void) +void start_parsing(void) { environment_stack = NEW_ARR_F(stack_entry_t, 0); label_stack = NEW_ARR_F(stack_entry_t, 0); @@ -7970,16 +8389,43 @@ translation_unit_t *parse(void) type_set_output(stderr); ast_set_output(stderr); - lookahead_bufpos = 0; - for(int i = 0; i < MAX_LOOKAHEAD + 2; ++i) { - next_token(); - } - translation_unit_t *unit = parse_translation_unit(); + assert(unit == NULL); + unit = allocate_ast_zero(sizeof(unit[0])); + + assert(global_scope == NULL); + global_scope = &unit->scope; + + assert(scope == NULL); + set_scope(&unit->scope); + + initialize_builtin_types(); +} + +translation_unit_t *finish_parsing(void) +{ + assert(scope == &unit->scope); + scope = NULL; + last_declaration = NULL; + + assert(global_scope == &unit->scope); + check_unused_globals(); + global_scope = NULL; DEL_ARR_F(environment_stack); DEL_ARR_F(label_stack); - return unit; + translation_unit_t *result = unit; + unit = NULL; + return result; +} + +void parse(void) +{ + lookahead_bufpos = 0; + for(int i = 0; i < MAX_LOOKAHEAD + 2; ++i) { + next_token(); + } + parse_translation_unit(); } /**