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. */
static declaration_t *current_function = NULL;
static switch_statement_t *current_switch = NULL;
static statement_t *current_loop = NULL;
+static ms_try_statement_t *current_try = NULL;
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 };
+
/* symbols for Microsoft extended-decl-modifier */
static const symbol_t *sym_align = NULL;
static const symbol_t *sym_allocate = 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;
-static statement_t *parse_compound_statement(void);
+static statement_t *parse_compound_statement(bool inside_expression_statement);
static statement_t *parse_statement(void);
static expression_t *parse_sub_expression(unsigned precedence);
case T_restrict: \
case T_volatile: \
case T_inline: \
- case T__forceinline:
+ case T__forceinline: \
+ case T___attribute__:
#ifdef PROVIDE_COMPLEX
#define COMPLEX_SPECIFIERS \
[STATEMENT_WHILE] = sizeof(while_statement_t),
[STATEMENT_DO_WHILE] = sizeof(do_while_statement_t),
[STATEMENT_FOR] = sizeof(for_statement_t),
- [STATEMENT_ASM] = sizeof(asm_statement_t)
+ [STATEMENT_ASM] = sizeof(asm_statement_t),
+ [STATEMENT_MS_TRY] = sizeof(ms_try_statement_t),
+ [STATEMENT_LEAVE] = sizeof(leave_statement_t)
};
assert(kind <= sizeof(sizes) / sizeof(sizes[0]));
assert(sizes[kind] != 0);
{
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),
* Allocate a type node of given kind and initialize all
* fields with zero.
*/
-static type_t *allocate_type_zero(type_kind_t kind, source_position_t source_position)
+static type_t *allocate_type_zero(type_kind_t kind, const source_position_t *source_position)
{
size_t size = get_type_struct_size(kind);
type_t *res = obstack_alloc(type_obst, size);
memset(res, 0, size);
res->base.kind = kind;
- res->base.source_position = source_position;
+ res->base.source_position = *source_position;
return res;
}
++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).
*/
}
/**
- * eat all token until a ';' is reached
- * or a stop token is found.
+ * eat all token until a ';' is reached or a stop token is found.
*/
static void eat_statement(void) {
eat_until_matching_token(';');
/**
* Report a parse error because an expected token was not found.
*/
-static void parse_error_expected(const char *message, ...)
+static
+#if defined __GNUC__ && __GNUC__ >= 4
+__attribute__((sentinel))
+#endif
+void parse_error_expected(const char *message, ...)
{
if(message != NULL) {
errorf(HERE, "%s", message);
}
va_list ap;
va_start(ap, message);
- errorf(HERE, "got %K, expected %#k", &token, &ap, "a ");
+ errorf(HERE, "got %K, expected %#k", &token, &ap, ", ");
va_end(ap);
}
/**
* Report a type error.
*/
-static void type_error(const char *msg, const source_position_t source_position,
+static void type_error(const char *msg, const source_position_t *source_position,
type_t *type)
{
errorf(source_position, "%s, but found type '%T'", msg, type);
* Report an incompatible type.
*/
static void type_error_incompatible(const char *msg,
- const source_position_t source_position, type_t *type1, type_t *type2)
+ const source_position_t *source_position, type_t *type1, type_t *type2)
{
- errorf(source_position, "%s, incompatible types: '%T' - '%T'", msg, type1, type2);
+ errorf(source_position, "%s, incompatible types: '%T' - '%T'",
+ msg, type1, type2);
}
/**
* If not, generate an error, eat the current statement,
* and goto the end_error label.
*/
-#define expect(expected) \
- do { \
- if(UNLIKELY(token.type != (expected))) { \
- parse_error_expected(NULL, (expected), 0); \
- add_anchor_token(expected); \
- eat_until_anchor(); \
- rem_anchor_token(expected); \
- goto end_error; \
- } \
- next_token(); \
+#define expect(expected) \
+ do { \
+ if(UNLIKELY(token.type != (expected))) { \
+ 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; \
+ } \
+ next_token(); \
} while(0)
static void set_scope(scope_t *new_scope)
static int get_rank(const type_t *type)
{
assert(!is_typeref(type));
- /* The C-standard allows promoting to int or unsigned int (see § 7.2.2
+ /* The C-standard allows promoting enums to int or unsigned int (see § 7.2.2
* and esp. footnote 108). However we can't fold constants (yet), so we
* can't decide whether unsigned int is possible, while int always works.
* (unsigned int would be preferable when possible... for stuff like
static type_t *promote_integer(type_t *type)
{
if(type->kind == TYPE_BITFIELD)
- type = type->bitfield.base;
+ type = type->bitfield.base_type;
if(get_rank(type) < ATOMIC_TYPE_INT)
type = type_int;
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,
- 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);
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);
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);
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)
expression_t *result = parse_sub_expression(7);
if(!is_constant_expression(result)) {
- errorf(result->base.source_position, "expression '%E' is not constant\n", result);
+ errorf(&result->base.source_position,
+ "expression '%E' is not constant\n", result);
}
return result;
record_declaration(declaration);
- type_t *typedef_type = allocate_type_zero(TYPE_TYPEDEF, builtin_source_position);
+ type_t *typedef_type = allocate_type_zero(TYPE_TYPEDEF, &builtin_source_position);
typedef_type->typedeft.declaration = declaration;
return typedef_type;
[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",
[GNU_AK_MAY_ALIAS] = "may_alias",
[GNU_AK_MS_STRUCT] = "ms_struct",
[GNU_AK_GCC_STRUCT] = "gcc_struct",
+ [GNU_AK_DLLIMPORT] = "dllimport",
+ [GNU_AK_DLLEXPORT] = "dllexport",
[GNU_AK_ALIGNED] = "aligned",
[GNU_AK_ALIAS] = "alias",
[GNU_AK_SECTION] = "section",
[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",
*/
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);
}
*/
static gnu_attribute_t *allocate_gnu_attribute(gnu_attribute_kind_t kind) {
gnu_attribute_t *attribute = obstack_alloc(&temp_obst, sizeof(*attribute));
- attribute->kind = kind;
- attribute->next = NULL;
- attribute->invalid = false;
- attribute->have_arguments = false;
+ attribute->kind = kind;
+ attribute->next = NULL;
+ attribute->invalid = false;
+ attribute->have_arguments = false;
+
+ return attribute;
}
/**
/**
* parse one string literal argument.
*/
-static void parse_gnu_attribute_string_arg(gnu_attribute_t *attribute, string_t *string) {
+static void parse_gnu_attribute_string_arg(gnu_attribute_t *attribute,
+ string_t *string)
+{
add_anchor_token('(');
if(token.type != T_STRING_LITERAL) {
- parse_error_expected("while parsing attribute directive", T_STRING_LITERAL);
+ parse_error_expected("while parsing attribute directive",
+ T_STRING_LITERAL, NULL);
goto end_error;
}
*string = parse_string_literals();
return;
}
}
+ errorf(HERE, "'%s' is an unrecognized tls model", string.begin);
}
- errorf(HERE, "'%s' is an unrecognized tls model", string.begin);
attribute->invalid = true;
}
return;
}
}
+ errorf(HERE, "'%s' is an unrecognized visibility", string.begin);
}
- errorf(HERE, "'%s' is an unrecognized visibility", string.begin);
attribute->invalid = true;
}
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;
}
return;
}
}
+ errorf(HERE, "'%s' is not an interrupt", string.begin);
}
- errorf(HERE, "'%s' is an interrupt", string.begin);
attribute->invalid = true;
}
int i;
if(token.type != T_IDENTIFIER) {
- parse_error_expected("while parsing format attribute directive", T_IDENTIFIER);
+ parse_error_expected("while parsing format attribute directive", T_IDENTIFIER, NULL);
goto end_error;
}
const char *name = token.v.symbol->string;
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.
*
* may_alias
* ms_struct
* gcc_struct
+ * dllimport
+ * dllexport
*
* The following attributes are parsed with arguments
* aligned( const expression )
* 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__);
/* 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) {
- parse_error_expected("while parsing GNU attribute", 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;
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:
case GNU_AK_MAY_ALIAS:
case GNU_AK_MS_STRUCT:
case GNU_AK_GCC_STRUCT:
- 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);
+ 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:
+ 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:
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)
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:
expect('(');
if(token.type != T_STRING_LITERAL) {
parse_error_expected("while parsing assembler attribute",
- T_STRING_LITERAL);
+ T_STRING_LITERAL, NULL);
eat_until_matching_token('(');
break;
} else {
attributes_finished:
end_error:
- return;
+ return modifiers;
}
static designator_t *parse_designation(void)
next_token();
if(token.type != T_IDENTIFIER) {
parse_error_expected("while parsing designator",
- T_IDENTIFIER, 0);
+ T_IDENTIFIER, NULL);
return NULL;
}
designator->symbol = token.v.symbol;
}
}
- 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;
}
expression_t *expression = parse_assignment_expression();
if(must_be_constant && !is_initializer_constant(expression)) {
- errorf(expression->base.source_position,
+ errorf(&expression->base.source_position,
"Initialisation expression '%E' is not constant\n",
expression);
}
initializer_t *initializer = initializer_from_expression(type, expression);
if(initializer == NULL) {
- errorf(expression->base.source_position,
+ errorf(&expression->base.source_position,
"expression '%E' (type '%T') doesn't match expected type '%T'",
expression, expression->base.type, type);
/* TODO */
symbol_t *symbol = designator->symbol;
if(!is_type_compound(type)) {
if(is_type_valid(type)) {
- errorf(designator->source_position,
+ errorf(&designator->source_position,
"'.%Y' designator used for non-compound type '%T'",
symbol, orig_type);
}
}
}
if(iter == NULL) {
- errorf(designator->source_position,
+ errorf(&designator->source_position,
"'%T' has no member named '%Y'", orig_type, symbol);
goto failed;
}
if(used_in_offsetof) {
type_t *real_type = skip_typeref(iter->type);
if(real_type->kind == TYPE_BITFIELD) {
- errorf(designator->source_position,
+ errorf(&designator->source_position,
"offsetof designator '%Y' may not specify bitfield",
symbol);
goto failed;
if(!is_type_array(type)) {
if(is_type_valid(type)) {
- errorf(designator->source_position,
+ errorf(&designator->source_position,
"[%E] designator used for non-array type '%T'",
array_index, orig_type);
}
long index = fold_constant(array_index);
if(!used_in_offsetof) {
if(index < 0) {
- errorf(designator->source_position,
+ errorf(&designator->source_position,
"array index [%E] must be positive", array_index);
goto failed;
}
if(type->array.size_constant == true) {
long array_size = type->array.size;
if(index >= array_size) {
- errorf(designator->source_position,
- "designator [%E] (%d) exceeds array size %d",
- array_index, index, array_size);
+ errorf(&designator->source_position,
+ "designator [%E] (%d) exceeds array size %d",
+ array_index, index, array_size);
goto failed;
}
}
}
/**
- * skip any {...} blocks until a closing braket is reached.
+ * skip any {...} blocks until a closing bracket is reached.
*/
static void skip_initializers(void)
{
= 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;
expression_t *expression = parse_assignment_expression();
if(env->must_be_constant && !is_initializer_constant(expression)) {
- errorf(expression->base.source_position,
+ errorf(&expression->base.source_position,
"Initialisation expression '%E' is not constant\n",
expression);
}
goto end_error;
}
if(is_type_scalar(type)) {
- errorf(expression->base.source_position,
+ errorf(&expression->base.source_position,
"expression '%E' doesn't match expected type '%T'",
expression, orig_type);
goto end_error;
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;
}
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");
}
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 {
declaration_t *declaration = NULL;
if (token.type == T___attribute__) {
- parse_attributes(&attributes);
+ modifiers |= parse_attributes(&attributes);
}
if(token.type == T_IDENTIFIER) {
} else if(token.type != '{') {
if(is_struct) {
parse_error_expected("while parsing struct type specifier",
- T_IDENTIFIER, '{', 0);
+ T_IDENTIFIER, '{', NULL);
} else {
parse_error_expected("while parsing union type specifier",
- T_IDENTIFIER, '{', 0);
+ T_IDENTIFIER, '{', NULL);
}
return NULL;
(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);
}
}
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;
}
add_anchor_token('}');
do {
if(token.type != T_IDENTIFIER) {
- parse_error_expected("while parsing enum entry", T_IDENTIFIER, 0);
+ parse_error_expected("while parsing enum entry", T_IDENTIFIER, NULL);
eat_block();
rem_anchor_token('}');
return;
declaration = get_declaration(symbol, NAMESPACE_ENUM);
} else if(token.type != '{') {
parse_error_expected("while parsing enum type specifier",
- T_IDENTIFIER, '{', 0);
+ T_IDENTIFIER, '{', NULL);
return NULL;
} else {
declaration = NULL;
declaration->parent_scope = scope;
}
- type_t *const type = allocate_type_zero(TYPE_ENUM, declaration->source_position);
+ type_t *const type = allocate_type_zero(TYPE_ENUM, &declaration->source_position);
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);
rem_anchor_token(')');
expect(')');
- type_t *typeof_type = allocate_type_zero(TYPE_TYPEOF, expression->base.source_position);
+ type_t *typeof_type = allocate_type_zero(TYPE_TYPEOF, &expression->base.source_position);
typeof_type->typeoft.expression = expression;
typeof_type->typeoft.typeof_type = type;
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,
type_t *const real_type)
{
- type_t *type = allocate_type_zero(TYPE_BUILTIN, builtin_source_position);
+ type_t *type = allocate_type_zero(TYPE_BUILTIN, &builtin_source_position);
type->builtin.symbol = symbol;
type->builtin.real_type = real_type;
type_t *result = typehash_insert(type);
- if (type != result) {
+ if(type != result) {
free_type(type);
}
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);
+ type_t *type = allocate_type_zero(TYPE_TYPEDEF, &declaration->source_position);
type->typedeft.declaration = declaration;
return type;
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) {
}
}
next_token();
- if(token.type == ',') {
+ if(token.type == ',') {
next_token();
continue;
}
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;
/* type qualifiers */
#define MATCH_TYPE_QUALIFIER(token, qualifier) \
case token: \
- type_qualifiers |= qualifier; \
+ qualifiers |= qualifier; \
next_token(); \
break;
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();
}
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:
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: {
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) {
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);
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) {
MATCH_TYPE_QUALIFIER(T___sptr, TYPE_QUALIFIER_SPTR);
default:
- return type_qualifiers;
+ return qualifiers;
}
}
}
}
last_declaration = declaration;
- if(token.type != ',')
+ if (token.type != ',') {
break;
+ }
next_token();
} while(token.type == T_IDENTIFIER);
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;
case T_DOTDOTDOT:
next_token();
type->variadic = 1;
- return declarations;
+ goto parameters_finished;
case T_IDENTIFIER:
case T___extension__:
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 {
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);
+ type = allocate_type_zero(TYPE_FUNCTION, &declaration->source_position);
} else {
- type = allocate_type_zero(TYPE_FUNCTION, token.source_position);
+ type = allocate_type_zero(TYPE_FUNCTION, HERE);
}
declaration_t *parameters = parse_parameters(&type->function);
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)
{
}
/* TODO: find out if this is correct */
- parse_attributes(&attributes);
+ decl_modifiers_t modifiers = parse_attributes(&attributes);
construct_type_t *inner_types = NULL;
default:
if(may_be_abstract)
break;
- parse_error_expected("while parsing declarator", T_IDENTIFIER, '(', 0);
+ parse_error_expected("while parsing declarator", T_IDENTIFIER, '(', NULL);
/* avoid a loop in the outermost scope, because eat_statement doesn't
* eat '}' */
if(token.type == '}' && current_function == NULL) {
}
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 */
case CONSTRUCT_POINTER: {
parsed_pointer_t *parsed_pointer = (parsed_pointer_t*) iter;
- type_t *pointer_type = allocate_type_zero(TYPE_POINTER, (source_position_t){NULL, 0});
+ type_t *pointer_type = allocate_type_zero(TYPE_POINTER, &null_position);
pointer_type->pointer.points_to = type;
pointer_type->base.qualifiers = parsed_pointer->type_qualifiers;
case CONSTRUCT_ARRAY: {
parsed_array_t *parsed_array = (parsed_array_t*) iter;
- type_t *array_type = allocate_type_zero(TYPE_ARRAY, (source_position_t){NULL, 0});
+ type_t *array_type = allocate_type_zero(TYPE_ARRAY, &null_position);
expression_t *size_expression = parsed_array->size;
if(size_expression != NULL) {
{
declaration_t *const declaration = allocate_declaration_zero();
declaration->declared_storage_class = specifiers->declared_storage_class;
- declaration->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;
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);
}
static void check_type_of_main(const declaration_t *const decl, const function_type_t *const func_type)
{
if (decl->storage_class == STORAGE_CLASS_STATIC) {
- warningf(decl->source_position, "'main' is normally a non-static function");
+ warningf(&decl->source_position,
+ "'main' is normally a non-static function");
}
if (skip_typeref(func_type->return_type) != type_int) {
- warningf(decl->source_position, "return type of 'main' should be 'int', but is '%T'", func_type->return_type);
+ warningf(&decl->source_position,
+ "return type of 'main' should be 'int', but is '%T'",
+ func_type->return_type);
}
const function_parameter_t *parm = func_type->parameters;
if (parm != NULL) {
type_t *const first_type = parm->type;
if (!types_compatible(skip_typeref(first_type), type_int)) {
- warningf(decl->source_position, "first argument of 'main' should be 'int', but is '%T'", first_type);
+ warningf(&decl->source_position,
+ "first argument of 'main' should be 'int', but is '%T'", first_type);
}
parm = parm->next;
if (parm != NULL) {
type_t *const second_type = parm->type;
if (!types_compatible(skip_typeref(second_type), type_char_ptr_ptr)) {
- warningf(decl->source_position, "second argument of 'main' should be 'char**', but is '%T'", second_type);
+ warningf(&decl->source_position,
+ "second argument of 'main' should be 'char**', but is '%T'", second_type);
}
parm = parm->next;
if (parm != NULL) {
type_t *const third_type = parm->type;
if (!types_compatible(skip_typeref(third_type), type_char_ptr_ptr)) {
- warningf(decl->source_position, "third argument of 'main' should be 'char**', but is '%T'", third_type);
+ warningf(&decl->source_position,
+ "third argument of 'main' should be 'char**', but is '%T'", third_type);
}
parm = parm->next;
if (parm != NULL) {
- warningf(decl->source_position, "'main' takes only zero, two or three arguments");
+ warningf(&decl->source_position, "'main' takes only zero, two or three arguments");
}
}
} else {
- warningf(decl->source_position, "'main' takes only zero, two or three arguments");
+ warningf(&decl->source_position, "'main' takes only zero, two or three arguments");
}
}
}
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) {
- warningf(declaration->source_position,
+ warning.strict_prototypes &&
+ previous_declaration == NULL) {
+ warningf(&declaration->source_position,
"function declaration '%#T' is not a prototype",
orig_type, declaration->symbol);
}
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, "<builtin>") != 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)) {
- warningf(declaration->source_position,
+ warningf(&declaration->source_position,
"no previous prototype for '%#T'", orig_type, symbol);
} else if (warning.missing_declarations && !is_sym_main(symbol)) {
- warningf(declaration->source_position,
+ warningf(&declaration->source_position,
"no previous declaration for '%#T'", orig_type,
symbol);
}
declaration->storage_class == STORAGE_CLASS_NONE ||
declaration->storage_class == STORAGE_CLASS_THREAD
)) {
- warningf(declaration->source_position,
+ warningf(&declaration->source_position,
"no previous declaration for '%#T'", orig_type, symbol);
}
}
static void parser_error_multiple_definition(declaration_t *declaration,
- const source_position_t source_position)
+ const source_position_t *source_position)
{
errorf(source_position, "multiple definition of symbol '%Y' (declared %P)",
- declaration->symbol, declaration->source_position);
+ declaration->symbol, &declaration->source_position);
}
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;
type_t *type = skip_typeref(orig_type);
if(declaration->init.initializer != NULL) {
- parser_error_multiple_definition(declaration, token.source_position);
+ parser_error_multiple_definition(declaration, HERE);
}
bool must_be_constant = false;
}
if(is_type_function(type)) {
- errorf(declaration->source_position,
+ errorf(&declaration->source_position,
"initializers not allowed for function types at declator '%Y' (type '%T')",
declaration->symbol, orig_type);
} else {
declaration->type = specifiers->type;
declaration->declared_storage_class = specifiers->declared_storage_class;
declaration->source_position = specifiers->source_position;
- declaration->modifiers = specifiers->decl_modifiers;
+ declaration->modifiers = specifiers->modifiers;
if (declaration->declared_storage_class != STORAGE_CLASS_NONE) {
- warningf(declaration->source_position, "useless storage class in empty declaration");
+ warningf(&declaration->source_position,
+ "useless storage class in empty declaration");
}
declaration->storage_class = STORAGE_CLASS_NONE;
case TYPE_COMPOUND_STRUCT:
case TYPE_COMPOUND_UNION: {
if (type->compound.declaration->symbol == NULL) {
- warningf(declaration->source_position, "unnamed struct/union that defines no instances");
+ warningf(&declaration->source_position,
+ "unnamed struct/union that defines no instances");
}
break;
}
break;
default:
- warningf(declaration->source_position, "empty declaration");
+ warningf(&declaration->source_position, "empty declaration");
break;
}
if (type->kind != TYPE_FUNCTION &&
declaration->is_inline &&
is_type_valid(type)) {
- warningf(declaration->source_position,
+ warningf(&declaration->source_position,
"variable '%Y' declared 'inline'\n", declaration->symbol);
}
}
}
+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 */
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);
}
/* 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;
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]));
}
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) {
label->used = true;
if (label->source_position.input_name == NULL) {
print_in_function();
- errorf(goto_statement->base.source_position,
+ errorf(&goto_statement->base.source_position,
"label '%Y' used but not defined", label->symbol);
}
}
if (! label->used) {
print_in_function();
- warningf(label_statement->base.source_position,
+ warningf(&label_statement->base.source_position,
"label '%Y' defined but not used", label->symbol);
}
}
for (; parameter != NULL; parameter = parameter->next) {
if (! parameter->used) {
print_in_function();
- warningf(parameter->source_position,
- "unused parameter '%Y'", parameter->symbol);
+ warningf(¶meter->source_position,
+ "unused parameter '%Y'", parameter->symbol);
}
}
}
parse_kr_declaration_list(ndeclaration);
if(token.type != '{') {
- parse_error_expected("while parsing function definition", '{', 0);
+ parse_error_expected("while parsing function definition", '{', NULL);
eat_until_matching_token(';');
return;
}
/* § 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;
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);
}
if(declaration->init.statement != NULL) {
- parser_error_multiple_definition(declaration, token.source_position);
+ parser_error_multiple_definition(declaration, HERE);
eat_block();
goto end_of_parse_external_declaration;
} else {
declaration_t *old_current_function = current_function;
current_function = declaration;
- declaration->init.statement = parse_compound_statement();
+ declaration->init.statement = parse_compound_statement(false);
first_err = true;
check_labels();
check_declarations();
environment_pop_to(top);
}
-static type_t *make_bitfield_type(type_t *base, expression_t *size,
- source_position_t source_position)
+static type_t *make_bitfield_type(type_t *base_type, expression_t *size,
+ source_position_t *source_position)
{
- type_t *type = allocate_type_zero(TYPE_BITFIELD, source_position);
- type->bitfield.base = base;
- type->bitfield.size = size;
+ type_t *type = allocate_type_zero(TYPE_BITFIELD, source_position);
+
+ type->bitfield.base_type = base_type;
+ type->bitfield.size = size;
return type;
}
declaration_t *declaration;
if(token.type == ':') {
- source_position_t source_position = HERE;
+ source_position_t source_position = *HERE;
next_token();
type_t *base_type = specifiers->type;
base_type);
}
- type_t *type = make_bitfield_type(base_type, size, source_position);
+ type_t *type = make_bitfield_type(base_type, size, &source_position);
declaration = allocate_declaration_zero();
declaration->namespc = NAMESPACE_NORMAL;
declaration->declared_storage_class = STORAGE_CLASS_NONE;
declaration->storage_class = STORAGE_CLASS_NONE;
declaration->source_position = source_position;
- declaration->modifiers = specifiers->decl_modifiers;
+ declaration->modifiers = specifiers->modifiers;
declaration->type = type;
} else {
declaration = parse_declarator(specifiers,/*may_be_abstract=*/true);
type_t *type = skip_typeref(orig_type);
if(token.type == ':') {
- source_position_t source_position = HERE;
+ source_position_t source_position = *HERE;
next_token();
expression_t *size = parse_constant_expression();
"integer type", orig_type);
}
- type_t *bitfield_type = make_bitfield_type(orig_type, size, source_position);
+ type_t *bitfield_type = make_bitfield_type(orig_type, size, &source_position);
declaration->type = bitfield_type;
} else {
/* TODO we ignore arrays for now... what is missing is a check
if(prev_decl != NULL) {
assert(prev_decl->symbol == symbol);
- errorf(declaration->source_position,
+ errorf(&declaration->source_position,
"multiple declarations of symbol '%Y' (declared %P)",
- symbol, prev_decl->source_position);
+ symbol, &prev_decl->source_position);
}
}
static expression_t *parse_int_const(void)
{
expression_t *cnst = allocate_expression_zero(EXPR_CONST);
- cnst->base.source_position = HERE;
+ cnst->base.source_position = *HERE;
cnst->base.type = token.datatype;
cnst->conste.v.int_value = token.v.intvalue;
{
expression_t *cnst = allocate_expression_zero(EXPR_CHARACTER_CONSTANT);
- cnst->base.source_position = HERE;
+ cnst->base.source_position = *HERE;
cnst->base.type = token.datatype;
cnst->conste.v.character = token.v.string;
{
expression_t *cnst = allocate_expression_zero(EXPR_WIDE_CHARACTER_CONSTANT);
- cnst->base.source_position = HERE;
+ cnst->base.source_position = *HERE;
cnst->base.type = token.datatype;
cnst->conste.v.wide_character = token.v.wide_string;
}
static declaration_t *create_implicit_function(symbol_t *symbol,
- const source_position_t source_position)
+ const source_position_t *source_position)
{
type_t *ntype = allocate_type_zero(TYPE_FUNCTION, source_position);
ntype->function.return_type = type_int;
declaration->declared_storage_class = STORAGE_CLASS_EXTERN;
declaration->type = type;
declaration->symbol = symbol;
- declaration->source_position = source_position;
- declaration->parent_scope = global_scope;
+ declaration->source_position = *source_position;
+
+ bool strict_prototypes_old = warning.strict_prototypes;
+ warning.strict_prototypes = false;
+ record_declaration(declaration);
+ warning.strict_prototypes = strict_prototypes_old;
- scope_t *old_scope = scope;
- set_scope(global_scope);
+ return declaration;
+}
- environment_push(declaration);
- /* prepends the declaration to the global declarations list */
- declaration->next = scope->declarations;
- scope->declarations = declaration;
+/**
+ * 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;
- assert(scope == global_scope);
- set_scope(old_scope);
+ function_parameter_t *parameter1
+ = obstack_alloc(type_obst, sizeof(parameter1[0]));
+ memset(parameter1, 0, sizeof(parameter1[0]));
+ parameter1->type = argument_type1;
+ parameter1->next = parameter2;
- return declaration;
+ 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;
}
/**
memset(parameter, 0, sizeof(parameter[0]));
parameter->type = argument_type;
- type_t *type = allocate_type_zero(TYPE_FUNCTION, builtin_source_position);
+ type_t *type = allocate_type_zero(TYPE_FUNCTION, &builtin_source_position);
type->function.return_type = return_type;
type->function.parameters = parameter;
return result;
}
-/**
- * Creates a function type for some function like builtins.
- *
- * @param symbol the symbol describing the builtin
- */
-static type_t *get_builtin_symbol_type(symbol_t *symbol)
+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.
+ *
+ * @param symbol the symbol describing the builtin
+ */
+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:
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");
}
if(is_type_array(type)) {
array_type_t *array_type = &type->array;
type_t *element_type = array_type->element_type;
- unsigned qualifiers = array_type->type.qualifiers;
+ unsigned qualifiers = array_type->base.qualifiers;
return make_pointer_type(element_type, qualifiers);
}
expression_t *expression = allocate_expression_zero(EXPR_REFERENCE);
reference_expression_t *ref = &expression->reference;
- ref->symbol = token.v.symbol;
+ symbol_t *const symbol = token.v.symbol;
- declaration_t *declaration = get_declaration(ref->symbol, NAMESPACE_NORMAL);
+ declaration_t *declaration = get_declaration(symbol, NAMESPACE_NORMAL);
source_position_t source_position = token.source_position;
next_token();
/* an implicitly defined function */
if (warning.implicit_function_declaration) {
warningf(HERE, "implicit declaration of function '%Y'",
- ref->symbol);
+ symbol);
}
- declaration = create_implicit_function(ref->symbol,
- source_position);
+ declaration = create_implicit_function(symbol,
+ &source_position);
} else {
- errorf(HERE, "unknown symbol '%Y' found.", ref->symbol);
+ errorf(HERE, "unknown symbol '%Y' found.", symbol);
return create_invalid_expression();
}
}
prefix = "function ";
if (declaration->deprecated_string != NULL) {
- warningf(source_position,
+ warningf(&source_position,
"%s'%Y' was declared 'deprecated(\"%s\")'", prefix, declaration->symbol,
declaration->deprecated_string);
} else {
- warningf(source_position,
+ warningf(&source_position,
"%s'%Y' was declared 'deprecated'", prefix, declaration->symbol);
}
}
{
expression_t *expression = allocate_expression_zero(EXPR_STATEMENT);
- statement_t *statement = parse_compound_statement();
+ statement_t *statement = parse_compound_statement(true);
expression->statement.statement = statement;
expression->base.source_position = statement->base.source_position;
type = stmt->expression.expression->base.type;
}
} else {
- warningf(expression->base.source_position, "empty statement expression ({})");
+ warningf(&expression->base.source_position, "empty statement expression ({})");
}
expression->base.type = type;
static designator_t *parse_designator(void)
{
designator_t *result = allocate_ast_zero(sizeof(result[0]));
- result->source_position = HERE;
+ result->source_position = *HERE;
if(token.type != T_IDENTIFIER) {
parse_error_expected("while parsing member designator",
- T_IDENTIFIER, 0);
+ T_IDENTIFIER, NULL);
return NULL;
}
result->symbol = token.v.symbol;
next_token();
if(token.type != T_IDENTIFIER) {
parse_error_expected("while parsing member designator",
- T_IDENTIFIER, 0);
+ T_IDENTIFIER, NULL);
return NULL;
}
designator_t *designator = allocate_ast_zero(sizeof(result[0]));
- designator->source_position = HERE;
+ designator->source_position = *HERE;
designator->symbol = token.v.symbol;
next_token();
next_token();
add_anchor_token(']');
designator_t *designator = allocate_ast_zero(sizeof(result[0]));
- designator->source_position = HERE;
+ designator->source_position = *HERE;
designator->array_index = parse_expression();
rem_anchor_token(']');
expect(']');
return expression;
}
}
- errorf(expr->base.source_position, "second argument of 'va_start' must be last parameter of the current function");
+ errorf(&expr->base.source_position,
+ "second argument of 'va_start' must be last parameter of the current function");
end_error:
return create_invalid_expression();
}
internal_errorf(HERE, "invalid compare builtin found");
break;
}
- expression->base.source_position = HERE;
+ expression->base.source_position = *HERE;
next_token();
expect('(');
if(!is_type_float(type_left) && !is_type_float(type_right)) {
if (is_type_valid(type_left) && is_type_valid(type_right)) {
type_error_incompatible("invalid operands in comparison",
- expression->base.source_position, orig_type_left, orig_type_right);
+ &expression->base.source_position, orig_type_left, orig_type_right);
}
} else {
semantic_comparison(&expression->binary);
return create_invalid_expression();
}
+#if 0
/**
* Parses a __builtin_expect() expression.
*/
end_error:
return create_invalid_expression();
}
+#endif
/**
* Parses a MS assume() expression.
* Parse a microsoft __noop expression.
*/
static expression_t *parse_noop_expression(void) {
- source_position_t source_position = HERE;
+ source_position_t source_position = *HERE;
eat(T___noop);
if (token.type == '(') {
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:
if (is_type_atomic(base_type, ATOMIC_TYPE_CHAR) &&
warning.char_subscripts) {
- warningf(expression->base.source_position,
- "array subscript has type '%T'", type);
+ warningf(&expression->base.source_position,
+ "array subscript has type '%T'", type);
}
}
rem_anchor_token(']');
if(token.type != ']') {
- parse_error_expected("Problem while parsing array access", ']', 0);
+ parse_error_expected("Problem while parsing array access", ']', NULL);
return expression;
}
next_token();
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;
+
+ char const* const what = kind == EXPR_SIZEOF ? "sizeof" : "alignof";
- if(token.type == '(' && is_declaration_specifier(look_ahead(1), true)) {
+ 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;
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,
expression_t *select = allocate_expression_zero(EXPR_SELECT);
select->select.compound = compound;
- if(token.type != T_IDENTIFIER) {
- parse_error_expected("while parsing select", T_IDENTIFIER, 0);
+ if (token.type != T_IDENTIFIER) {
+ parse_error_expected("while parsing select", T_IDENTIFIER, NULL);
return select;
}
symbol_t *symbol = token.v.symbol;
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);
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();
}
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;
-
- 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 '( ... )'.
*
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();
type_t *const condition_type = skip_typeref(condition_type_orig);
if (!is_type_scalar(condition_type) && is_type_valid(condition_type)) {
type_error("expected a scalar type in conditional condition",
- expression->base.source_position, condition_type_orig);
+ &expression->base.source_position, condition_type_orig);
}
expression_t *true_expression = parse_expression();
if(is_type_atomic(true_type, ATOMIC_TYPE_VOID) ||
is_type_atomic(false_type, ATOMIC_TYPE_VOID)) {
if (!is_type_atomic(true_type, ATOMIC_TYPE_VOID)
- || !is_type_atomic(false_type, ATOMIC_TYPE_VOID)) {
- warningf(expression->base.source_position,
+ || !is_type_atomic(false_type, ATOMIC_TYPE_VOID)) {
+ warningf(&expression->base.source_position,
"ISO C forbids conditional expression with only one void side");
}
result_type = type_void;
} else if (is_type_arithmetic(true_type)
- && is_type_arithmetic(false_type)) {
+ && is_type_arithmetic(false_type)) {
result_type = semantic_arithmetic(true_type, false_type);
true_expression = create_implicit_cast(true_expression, result_type);
other_expression = true_expression;
}
- if(is_type_pointer(other_type)) {
- if(!pointers_compatible(true_type, false_type)) {
- warningf(expression->base.source_position,
- "pointer types '%T' and '%T' in conditional expression are incompatible", 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);
+ 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)) {
- warningf(expression->base.source_position,
+ warningf(&expression->base.source_position,
"pointer/integer type mismatch in conditional expression ('%T' and '%T')", true_type, false_type);
result_type = pointer_type;
} else {
type_error_incompatible("while parsing conditional",
- expression->base.source_position, true_type, false_type);
+ &expression->base.source_position, true_type, false_type);
result_type = type_error_type;
}
} else {
if (is_type_valid(true_type) && is_type_valid(false_type)) {
type_error_incompatible("while parsing conditional",
- expression->base.source_position, true_type,
+ &expression->base.source_position, true_type,
false_type);
}
result_type = type_error_type;
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;
}
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.
*/
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);
}
\
expression_t *unary_expression \
= allocate_expression_zero(unexpression_type); \
- unary_expression->base.source_position = HERE; \
+ unary_expression->base.source_position = *HERE; \
unary_expression->unary.value = parse_sub_expression(precedence); \
\
sfunc(&unary_expression->unary); \
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);
}
}
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);
}
}
/* TODO non-arithmetic types */
if(is_type_arithmetic(type_left) && is_type_arithmetic(type_right)) {
+ /* test for signed vs unsigned compares */
if (warning.sign_compare &&
(expression->base.kind != EXPR_BINARY_EQUAL &&
expression->base.kind != EXPR_BINARY_NOTEQUAL) &&
(is_type_signed(type_left) != is_type_signed(type_right))) {
- warningf(expression->base.source_position,
+
+ /* check if 1 of the operands is a constant, in this case we just
+ * check wether we can safely represent the resulting constant in
+ * the type of the other operand. */
+ expression_t *const_expr = NULL;
+ expression_t *other_expr = NULL;
+
+ if(is_constant_expression(left)) {
+ const_expr = left;
+ other_expr = right;
+ } else if(is_constant_expression(right)) {
+ const_expr = right;
+ other_expr = left;
+ }
+
+ if(const_expr != NULL) {
+ 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;
+ }
+ warningf(&expression->base.source_position,
"comparison between signed and unsigned");
}
type_t *arithmetic_type = semantic_arithmetic(type_left, type_right);
(expression->base.kind == EXPR_BINARY_EQUAL ||
expression->base.kind == EXPR_BINARY_NOTEQUAL) &&
is_type_float(arithmetic_type)) {
- warningf(expression->base.source_position,
+ warningf(&expression->base.source_position,
"comparing floating point with == or != is unsafe");
}
} else if (is_type_pointer(type_left) && is_type_pointer(type_right)) {
expression->left = create_implicit_cast(left, type_right);
} else if (is_type_valid(type_left) && is_type_valid(type_right)) {
type_error_incompatible("invalid operands in comparison",
- expression->base.source_position,
+ &expression->base.source_position,
type_left, type_right);
}
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;
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);
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.
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);
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.
*/
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);
- return;
- }
- if(is_type_incomplete(type_left)) {
- errorf(HERE,
- "left-hand side of assignment '%E' has incomplete type '%T'",
- left, orig_type_left);
+ if (!is_valid_assignment_lhs(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,
- "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);
- }
+ 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);
+ expression->right = create_implicit_cast(expression->right, orig_type_left);
expression->base.type = orig_type_left;
}
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;
if (warning.unused_value) {
const expression_t *const left = expression->left;
if (!expression_has_effect(left)) {
- warningf(left->base.source_position, "left-hand operand of comma expression has no effect");
+ warningf(&left->base.source_position,
+ "left-hand operand of comma expression has no effect");
}
}
expression->base.type = expression->right->base.type;
expression_t *left) \
{ \
eat(token_type); \
- source_position_t pos = HERE; \
+ source_position_t pos = *HERE; \
\
expression_t *right = parse_sub_expression(precedence + lr); \
\
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);
}
/**
- * 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",
- T_IDENTIFIER, 0);
+ 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(',');
}
}
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;
expect(':');
if (! is_constant_expression(statement->case_label.expression)) {
- errorf(statement->base.source_position,
- "case label does not reduce to an integer constant");
+ errorf(&statement->base.source_position,
+ "case label does not reduce to an integer constant");
} else {
/* TODO: check if the case label is already known */
if (current_switch != NULL) {
current_switch->last_case->next = &statement->case_label;
}
} else {
- errorf(statement->base.source_position,
- "case label not within a switch statement");
+ errorf(&statement->base.source_position,
+ "case label not within a switch statement");
}
}
statement->case_label.statement = parse_statement();
if (current_switch != NULL) {
const case_label_statement_t *def_label = find_default_label(current_switch);
if (def_label != NULL) {
- errorf(HERE, "multiple default labels in one switch");
- errorf(def_label->base.source_position,
- "this is the first default label");
+ errorf(HERE, "multiple default labels in one switch (previous declared %P)",
+ &def_label->base.source_position);
} else {
/* link all cases into the switch statement */
if (current_switch->last_case == NULL) {
}
}
} else {
- errorf(statement->base.source_position,
+ errorf(&statement->base.source_position,
"'default' label not within a switch statement");
}
statement->case_label.statement = parse_statement();
* otherwise it was just mentioned in a goto so far */
if(label->source_position.input_name != NULL) {
errorf(HERE, "duplicate label '%Y' (declared %P)",
- symbol, label->source_position);
+ symbol, &label->source_position);
} else {
label->source_position = token.source_position;
}
if (is_type_integer(type)) {
type = promote_integer(type);
} else if (is_type_valid(type)) {
- errorf(expr->base.source_position,
+ errorf(&expr->base.source_position,
"switch quantity is not an integer, but '%T'", type);
type = type_error_type;
}
statement->switchs.body = parse_statement();
current_switch = rem;
- if (warning.switch_default
- && find_default_label(&statement->switchs) == NULL) {
- warningf(statement->base.source_position, "switch has no default case");
+ if(warning.switch_default &&
+ find_default_label(&statement->switchs) == NULL) {
+ warningf(&statement->base.source_position, "switch has no default case");
}
return statement;
if(is_declaration_specifier(&token, false)) {
parse_declaration(record_declaration);
} else {
+ add_anchor_token(';');
expression_t *const init = parse_expression();
statement->fors.initialisation = init;
- if (warning.unused_value && !expression_has_effect(init)) {
- warningf(init->base.source_position,
+ if (warning.unused_value && !expression_has_effect(init)) {
+ warningf(&init->base.source_position,
"initialisation of 'for'-statement has no effect");
}
+ rem_anchor_token(';');
expect(';');
}
} else {
}
if(token.type != ';') {
+ add_anchor_token(';');
statement->fors.condition = parse_expression();
+ rem_anchor_token(';');
}
expect(';');
if(token.type != ')') {
expression_t *const step = parse_expression();
statement->fors.step = step;
- if (warning.unused_value && !expression_has_effect(step)) {
- warningf(step->base.source_position,
+ if (warning.unused_value && !expression_has_effect(step)) {
+ warningf(&step->base.source_position,
"step of 'for'-statement has no effect");
}
}
eat(T_goto);
if(token.type != T_IDENTIFIER) {
- parse_error_expected("while parsing goto", T_IDENTIFIER, 0);
+ parse_error_expected("while parsing goto", T_IDENTIFIER, NULL);
eat_statement();
- return NULL;
+ goto end_error;
}
symbol_t *symbol = token.v.symbol;
next_token();
statement_t *statement;
if (current_loop == NULL) {
errorf(HERE, "continue statement not within loop");
- statement = NULL;
+ statement = create_invalid_statement();
} else {
statement = allocate_statement_zero(STATEMENT_CONTINUE);
statement_t *statement;
if (current_switch == NULL && current_loop == NULL) {
errorf(HERE, "break statement not within loop or switch");
- statement = NULL;
+ statement = create_invalid_statement();
} else {
statement = allocate_statement_zero(STATEMENT_BREAK);
return create_invalid_statement();
}
+/**
+ * Parse a __leave statement.
+ */
+static statement_t *parse_leave(void)
+{
+ statement_t *statement;
+ if (current_try == NULL) {
+ errorf(HERE, "__leave statement not within __try");
+ statement = create_invalid_statement();
+ } else {
+ statement = allocate_statement_zero(STATEMENT_LEAVE);
+
+ statement->base.source_position = token.source_position;
+ }
+
+ eat(T___leave);
+ expect(';');
+
+ return statement;
+end_error:
+ return create_invalid_statement();
+}
+
/**
* Check if a given declaration represents a local variable.
*/
if(is_type_atomic(return_type, ATOMIC_TYPE_VOID)
&& !is_type_atomic(return_value_type, ATOMIC_TYPE_VOID)) {
- warningf(statement->base.source_position,
+ warningf(&statement->base.source_position,
"'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,
+ warningf(&statement->base.source_position,
"function returns address of local variable");
}
}
} else {
if(!is_type_atomic(return_type, ATOMIC_TYPE_VOID)) {
- warningf(statement->base.source_position,
+ warningf(&statement->base.source_position,
"'return' without value, in function returning non-void");
}
}
expression_t *const expr = parse_expression();
statement->expression.expression = expr;
- if (warning.unused_value && !expression_has_effect(expr)) {
- warningf(expr->base.source_position, "statement has no effect");
- }
-
expect(';');
return statement;
return create_invalid_statement();
}
+/**
+ * Parse a microsoft __try { } __finally { } or
+ * __try{ } __except() { }
+ */
+static statement_t *parse_ms_try_statment(void) {
+ statement_t *statement = allocate_statement_zero(STATEMENT_MS_TRY);
+
+ statement->base.source_position = token.source_position;
+ eat(T___try);
+
+ ms_try_statement_t *rem = current_try;
+ current_try = &statement->ms_try;
+ statement->ms_try.try_statement = parse_compound_statement(false);
+ current_try = rem;
+
+ if(token.type == T___except) {
+ eat(T___except);
+ expect('(');
+ add_anchor_token(')');
+ expression_t *const expr = parse_expression();
+ type_t * type = skip_typeref(expr->base.type);
+ if (is_type_integer(type)) {
+ type = promote_integer(type);
+ } else if (is_type_valid(type)) {
+ errorf(&expr->base.source_position,
+ "__expect expression is not an integer, but '%T'", type);
+ type = type_error_type;
+ }
+ statement->ms_try.except_expression = create_implicit_cast(expr, type);
+ rem_anchor_token(')');
+ expect(')');
+ statement->ms_try.final_statement = parse_compound_statement(false);
+ } else if(token.type == T__finally) {
+ eat(T___finally);
+ statement->ms_try.final_statement = parse_compound_statement(false);
+ } else {
+ parse_error_expected("while parsing __try statement", T___except, T___finally, NULL);
+ return create_invalid_statement();
+ }
+ return statement;
+end_error:
+ return create_invalid_statement();
+}
+
/**
* Parse a statement.
+ * There's also parse_statement() which additionally checks for
+ * "statement has no effect" warnings
*/
-static statement_t *parse_statement(void)
+static statement_t *intern_parse_statement(void)
{
- statement_t *statement = NULL;
+ statement_t *statement = NULL;
/* declaration or statement */
add_anchor_token(';');
break;
case '{':
- statement = parse_compound_statement();
+ statement = parse_compound_statement(false);
break;
case T_if:
statement = parse_break();
break;
+ case T___leave:
+ statement = parse_leave();
+ break;
+
case T_return:
statement = parse_return();
break;
statement = parse_declaration_statement();
break;
+ case T___try:
+ statement = parse_ms_try_statment();
+ break;
+
default:
statement = parse_expression_statement();
break;
return statement;
}
+/**
+ * parse a statement and emits "statement has no effect" warning if needed
+ * (This is really a wrapper around intern_parse_statement with check for 1
+ * single warning. It is needed, because for statement expressions we have
+ * to avoid the warning on the last statement)
+ */
+static statement_t *parse_statement(void)
+{
+ statement_t *statement = intern_parse_statement();
+
+ if(statement->kind == STATEMENT_EXPRESSION && warning.unused_value) {
+ expression_t *expression = statement->expression.expression;
+ if(!expression_has_effect(expression)) {
+ warningf(&expression->base.source_position,
+ "statement has no effect");
+ }
+ }
+
+ return statement;
+}
+
/**
* Parse a compound statement.
*/
-static statement_t *parse_compound_statement(void)
+static statement_t *parse_compound_statement(bool inside_expression_statement)
{
statement_t *statement = allocate_statement_zero(STATEMENT_COMPOUND);
statement_t *last_statement = NULL;
while(token.type != '}' && token.type != T_EOF) {
- statement_t *sub_statement = parse_statement();
+ statement_t *sub_statement = intern_parse_statement();
if(is_invalid_statement(sub_statement)) {
/* an error occurred. if we are at an anchor, return */
if(at_anchor())
if(token.type == '}') {
next_token();
} else {
- errorf(statement->base.source_position,
+ errorf(&statement->base.source_position,
"end of file while looking for closing '}'");
}
+ /* look over all statements again to produce no effect warnings */
+ if(warning.unused_value) {
+ statement_t *sub_statement = statement->compound.statements;
+ for( ; sub_statement != NULL; sub_statement = sub_statement->base.next) {
+ if(sub_statement->kind != STATEMENT_EXPRESSION)
+ continue;
+ /* don't emit a warning for the last expression in an expression
+ * statement as it has always an effect */
+ if(inside_expression_statement && sub_statement->base.next == NULL)
+ continue;
+
+ expression_t *expression = sub_statement->expression.expression;
+ if(!expression_has_effect(expression)) {
+ warningf(&expression->base.source_position,
+ "statement has no effect");
+ }
+ }
+ }
+
end_error:
rem_anchor_token('}');
assert(scope == &statement->compound.scope);
s = "defined";
}
- warningf(decl->source_position, "'%#T' %s but not used",
+ warningf(&decl->source_position, "'%#T' %s but not used",
type, decl->symbol, s);
}
}
/**
* 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 */
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;
}
/**
*
* @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);
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();
}
/**