source_position_t source_position;
unsigned char declared_storage_class;
unsigned char alignment; /**< Alignment, 0 if not set. */
- bool is_inline;
+ unsigned int is_inline : 1;
+ unsigned int deprecated : 1;
decl_modifiers_t decl_modifiers; /**< MS __declspec extended modifier mask */
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. */
case T_restrict: \
case T_volatile: \
case T_inline: \
- case T_forceinline:
+ case T__forceinline:
#ifdef PROVIDE_COMPLEX
#define COMPLEX_SPECIFIERS \
case T_enum: \
case T___typeof__: \
case T___builtin_va_list: \
- case T_declspec: \
+ case T__declspec: \
COMPLEX_SPECIFIERS \
IMAGINARY_SPECIFIERS
return sizes[kind];
}
-/**
- * Allocate a statement node of given kind and initialize all
- * fields with zero.
- */
-static statement_t *allocate_statement_zero(statement_kind_t kind)
-{
- size_t size = get_statement_struct_size(kind);
- statement_t *res = allocate_ast_zero(size);
-
- res->base.kind = kind;
- return res;
-}
-
-/**
- * Creates a new invalid statement.
- */
-static statement_t *create_invalid_statement(void)
-{
- statement_t *statement = allocate_statement_zero(STATEMENT_INVALID);
- statement->base.source_position = token.source_position;
- return statement;
-}
-
-/**
- * Allocate a new empty statement.
- */
-static statement_t *create_empty_statement(void)
-{
- statement_t *statement = allocate_statement_zero(STATEMENT_EMPTY);
- statement->base.source_position = token.source_position;
- return statement;
-}
-
/**
* Returns the size of an expression node.
*
[EXPR_SIZEOF] = sizeof(typeprop_expression_t),
[EXPR_ALIGNOF] = sizeof(typeprop_expression_t),
[EXPR_CLASSIFY_TYPE] = sizeof(classify_type_expression_t),
- [EXPR_FUNCTION] = sizeof(string_literal_expression_t),
- [EXPR_PRETTY_FUNCTION] = sizeof(string_literal_expression_t),
+ [EXPR_FUNCNAME] = sizeof(funcname_expression_t),
[EXPR_BUILTIN_SYMBOL] = sizeof(builtin_symbol_expression_t),
[EXPR_BUILTIN_CONSTANT_P] = sizeof(builtin_constant_expression_t),
[EXPR_BUILTIN_PREFETCH] = sizeof(builtin_prefetch_expression_t),
return sizes[kind];
}
+/**
+ * Allocate a statement node of given kind and initialize all
+ * fields with zero.
+ */
+static statement_t *allocate_statement_zero(statement_kind_t kind)
+{
+ size_t size = get_statement_struct_size(kind);
+ statement_t *res = allocate_ast_zero(size);
+
+ res->base.kind = kind;
+ return res;
+}
+
/**
* Allocate an expression node of given kind and initialize all
* fields with zero.
return res;
}
+/**
+ * Creates a new invalid expression.
+ */
+static expression_t *create_invalid_expression(void)
+{
+ expression_t *expression = allocate_expression_zero(EXPR_INVALID);
+ expression->base.source_position = token.source_position;
+ return expression;
+}
+
+/**
+ * Creates a new invalid statement.
+ */
+static statement_t *create_invalid_statement(void)
+{
+ statement_t *statement = allocate_statement_zero(STATEMENT_INVALID);
+ statement->base.source_position = token.source_position;
+ return statement;
+}
+
+/**
+ * Allocate a new empty statement.
+ */
+static statement_t *create_empty_statement(void)
+{
+ statement_t *statement = allocate_statement_zero(STATEMENT_EMPTY);
+ statement->base.source_position = token.source_position;
+ return statement;
+}
+
/**
* Returns the size of a type node.
*
/** Implements the rules from ยง 6.5.16.1 */
static type_t *semantic_assign(type_t *orig_type_left,
const expression_t *const right,
- const char *context)
+ const char *context,
+ 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);
- if ((is_type_arithmetic(type_left) && is_type_arithmetic(type_right)) ||
- (is_type_pointer(type_left) && is_null_pointer_constant(right)) ||
- (is_type_atomic(type_left, ATOMIC_TYPE_BOOL)
- && is_type_pointer(type_right))) {
- return orig_type_left;
- }
+ if(is_type_pointer(type_left)) {
+ if(is_null_pointer_constant(right)) {
+ return orig_type_left;
+ } else if(is_type_pointer(type_right)) {
+ 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;
+ 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;
+ }
- if (is_type_pointer(type_left) && is_type_pointer(type_right)) {
- type_t *points_to_left = skip_typeref(type_left->pointer.points_to);
- type_t *points_to_right = skip_typeref(type_right->pointer.points_to);
+ points_to_left = get_unqualified_type(points_to_left);
+ points_to_right = get_unqualified_type(points_to_right);
- /* the left type has all qualifiers from the right type */
- unsigned missing_qualifiers
- = points_to_right->base.qualifiers & ~points_to_left->base.qualifiers;
- if(missing_qualifiers != 0) {
- errorf(HERE, "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;
- }
+ if (is_type_atomic(points_to_left, ATOMIC_TYPE_VOID) ||
+ is_type_atomic(points_to_right, ATOMIC_TYPE_VOID)) {
+ return orig_type_left;
+ }
- points_to_left = get_unqualified_type(points_to_left);
- points_to_right = get_unqualified_type(points_to_right);
+ 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);
+ }
- if (is_type_atomic(points_to_left, ATOMIC_TYPE_VOID) ||
- is_type_atomic(points_to_right, ATOMIC_TYPE_VOID)) {
+ return orig_type_left;
+ } 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;
}
-
- if (!types_compatible(points_to_left, points_to_right)) {
- warningf(right->base.source_position,
- "destination type '%T' in %s is incompatible with '%E' of type '%T'",
- orig_type_left, context, right, orig_type_right);
- }
-
+ } 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;
- }
-
- if ((is_type_compound(type_left) && is_type_compound(type_right))
+ } 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;
}
+ } 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;
}
if (!is_type_valid(type_left))
return result;
}
-static void parse_attributes(void)
+typedef enum gnu_attribute_kind_t {
+ GNU_AK_CONST,
+ GNU_AK_VOLATILE,
+ GNU_AK_CDECL,
+ GNU_AK_STDCALL,
+ GNU_AK_FASTCALL,
+ GNU_AK_DEPRECATED,
+ GNU_AK_NOINLINE,
+ GNU_AK_NORETURN,
+ GNU_AK_NAKED,
+ GNU_AK_PURE,
+ GNU_AK_ALWAYS_INLINE,
+ GNU_AK_MALLOC,
+ GNU_AK_WEAK,
+ GNU_AK_CONSTRUCTOR,
+ GNU_AK_DESTRUCTOR,
+ GNU_AK_NOTHROW,
+ GNU_AK_ALIGNED,
+ GNU_AK_ALIAS,
+ GNU_AK_SECTION,
+ GNU_AK_FORMAT,
+ GNU_AK_FORMAT_ARG,
+ GNU_AK_WEAKREF,
+ GNU_AK_NONNULL,
+ GNU_AK_LAST
+} gnu_attribute_kind_t;
+
+static const char *gnu_attribute_names[GNU_AK_LAST] = {
+ [GNU_AK_CONST] = "const",
+ [GNU_AK_VOLATILE] = "volatile",
+ [GNU_AK_CDECL] = "cdecl",
+ [GNU_AK_STDCALL] = "stdcall",
+ [GNU_AK_FASTCALL] = "fastcall",
+ [GNU_AK_DEPRECATED] = "deprecated",
+ [GNU_AK_NOINLINE] = "noinline",
+ [GNU_AK_NORETURN] = "noreturn",
+ [GNU_AK_NAKED] = "naked",
+ [GNU_AK_PURE] = "pure",
+ [GNU_AK_ALWAYS_INLINE] = "always_inline",
+ [GNU_AK_MALLOC] = "malloc",
+ [GNU_AK_WEAK] = "weak",
+ [GNU_AK_CONSTRUCTOR] = "constructor",
+ [GNU_AK_DESTRUCTOR] = "destructor",
+ [GNU_AK_NOTHROW] = "nothrow",
+ [GNU_AK_ALIGNED] = "aligned",
+ [GNU_AK_ALIAS] = "alias",
+ [GNU_AK_SECTION] = "section",
+ [GNU_AK_FORMAT] = "format",
+ [GNU_AK_FORMAT_ARG] = "format_arg",
+ [GNU_AK_WEAKREF] = "weakref",
+ [GNU_AK_NONNULL] = "nonnull"
+};
+
+/**
+ * compare two string, ignoring double underscores on the second.
+ */
+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;
+ }
+ return strncmp(s1, s2, l1);
+ }
+ return strcmp(s1, s2);
+}
+
+/**
+ * parse one constant expression argument.
+ */
+static expression_t *parse_gnu_attribute_const_arg(void) {
+ expression_t *expression;
+ add_anchor_token(')');
+ expression = parse_constant_expression();
+ rem_anchor_token(')');
+ expect(')');
+ return expression;
+end_error:
+ return create_invalid_expression();
+}
+
+/**
+ * parse a list of constant expressions argumnets.
+ */
+static expression_t *parse_gnu_attribute_const_arg_list(void) {
+ expression_t *expression;
+ add_anchor_token(')');
+ add_anchor_token(',');
+ while(true){
+ expression = parse_constant_expression();
+ if(token.type != ',')
+ break;
+ next_token();
+ }
+ rem_anchor_token(',');
+ rem_anchor_token(')');
+ expect(')');
+ return expression;
+end_error:
+ return create_invalid_expression();
+}
+
+/**
+ * parse one string literal argument.
+ */
+static string_t parse_gnu_attribute_string_arg(void) {
+ string_t string = { NULL, 0 };
+ add_anchor_token('(');
+ if(token.type != T_STRING_LITERAL) {
+ parse_error_expected("while parsing attribute directive", T_STRING_LITERAL);
+ goto end_error;
+ }
+ string = parse_string_literals();
+ rem_anchor_token('(');
+ expect(')');
+end_error:
+ return string;
+}
+
+/**
+ * parse ( identifier, const expression, const expression )
+ */
+static void parse_gnu_attribute_format_args(void) {
+ static const char *format_names[] = {
+ "printf",
+ "scanf",
+ "strftime",
+ "strfmon"
+ };
+ int i;
+
+ if(token.type != T_IDENTIFIER) {
+ parse_error_expected("while parsing format attribute directive", T_IDENTIFIER);
+ goto end_error;
+ }
+ const char *name = token.v.symbol->string;
+ for(i = 0; i < 4; ++i) {
+ if(strcmp_underscore(format_names[i], name) == 0)
+ break;
+ }
+ if(i >= 4) {
+ if(warning.attribute)
+ warningf(HERE, "'%s' is an unrecognized format function type", name);
+ }
+ next_token();
+
+ expect(',');
+ add_anchor_token(')');
+ add_anchor_token(',');
+ parse_constant_expression();
+ rem_anchor_token(',');
+ rem_anchor_token('(');
+
+ expect(',');
+ add_anchor_token(')');
+ parse_constant_expression();
+ rem_anchor_token('(');
+ expect(')');
+ return;
+end_error:
+ return;
+}
+
+/**
+ * Parse one GNU attribute.
+ *
+ * Note that attribute names can be specified WITH or WITHOUT
+ * double underscores, ie const or __const__.
+ *
+ * The following attributes are parsed without arguments
+ * const
+ * volatile
+ * cdecl
+ * stdcall
+ * fastcall
+ * deprecated
+ * noinline
+ * noreturn
+ * naked
+ * pure
+ * always_inline
+ * malloc
+ * weak
+ * constructor
+ * destructor
+ * nothrow
+ *
+ * The following attributes are parsed with arguments
+ * aligned( const expression )
+ * alias( string literal )
+ * section( string literal )
+ * format( identifier, const expression, const expression )
+ * format_arg( const expression )
+ *
+ * The following attributes might have arguments
+ * weak_ref( string literal )
+ * non_null( const expression // ',' )
+ */
+static void parse_gnu_attribute(void)
{
- while(true) {
- switch(token.type) {
- case T___attribute__: {
+ eat(T___attribute__);
+ expect('(');
+ expect('(');
+ if(token.type != ')') {
+ /* non-empty attribute list */
+ while(true) {
+ const char *name;
+ 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);
+ break;
+ }
+ const symbol_t *sym = token.v.symbol;
+ name = sym->string;
next_token();
- expect('(');
- int depth = 1;
- while(depth > 0) {
- switch(token.type) {
- case T_EOF:
- errorf(HERE, "EOF while parsing attribute");
+ gnu_attribute_kind_t kind;
+ for(kind = 0; kind < GNU_AK_LAST; ++kind) {
+ if(strcmp_underscore(gnu_attribute_names[kind], name) == 0)
break;
- case '(':
+ }
+
+ if(kind == GNU_AK_LAST) {
+ if(warning.attribute)
+ warningf(HERE, "'%s' attribute directive ignored", name);
+
+ /* skip possible arguments */
+ if(token.type == '(') {
+ eat_until_matching_token(')');
+ }
+ } else {
+ /* check for arguments */
+ bool have_args = false;
+ if(token.type == '(') {
next_token();
- depth++;
+ if(token.type == ')') {
+ /* empty args are allowed */
+ next_token();
+ } else
+ have_args = true;
+ }
+
+ switch(kind) {
+ case GNU_AK_CONST:
+ case GNU_AK_VOLATILE:
+ case GNU_AK_CDECL:
+ 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:
+ if(have_args) {
+ /* should have no arguments */
+ errorf(HERE, "wrong number of arguments specified for '%s' attribute", name);
+ eat_until_matching_token('(');
+ /* we have already consumend '(', so we stop before ')', eat it */
+ eat(')');
+ }
break;
- case ')':
- next_token();
- depth--;
+
+ case GNU_AK_ALIGNED:
+ case GNU_AK_FORMAT_ARG:
+ if(!have_args) {
+ /* should have arguments */
+ errorf(HERE, "wrong number of arguments specified for '%s' attribute", name);
+ } else
+ parse_gnu_attribute_const_arg();
+ break;
+ case GNU_AK_ALIAS:
+ case GNU_AK_SECTION:
+ if(!have_args) {
+ /* should have arguments */
+ errorf(HERE, "wrong number of arguments specified for '%s' attribute", name);
+ } else
+ parse_gnu_attribute_string_arg();
+ break;
+ case GNU_AK_FORMAT:
+ if(!have_args) {
+ /* should have arguments */
+ errorf(HERE, "wrong number of arguments specified for '%s' attribute", name);
+ } else
+ parse_gnu_attribute_format_args();
+ break;
+ case GNU_AK_WEAKREF:
+ /* may have one string argument */
+ if(have_args)
+ parse_gnu_attribute_string_arg();
+ break;
+ case GNU_AK_NONNULL:
+ if(have_args)
+ parse_gnu_attribute_const_arg_list();
+ case GNU_AK_LAST:
+ /* already handled */
break;
- default:
- next_token();
}
}
+ if(token.type != ',')
+ break;
+ next_token();
+ }
+ }
+ expect(')');
+ expect(')');
+end_error:
+ return;
+}
+
+/**
+ * Parse GNU attributes.
+ */
+static void parse_attributes(void)
+{
+ while(true) {
+ switch(token.type) {
+ case T___attribute__: {
+ parse_gnu_attribute();
break;
}
case T_asm:
}
}
- type_t *const res_type = semantic_assign(type, expression, "initializer");
+ type_t *const res_type = semantic_assign(type, expression, "initializer",
+ expression->base.source_position);
if (res_type == NULL)
return NULL;
if(initializer == NULL) {
errorf(expression->base.source_position,
- "expression '%E' doesn't match expected type '%T'",
- expression, type);
+ "expression '%E' (type '%T') doesn't match expected type '%T'",
+ expression, expression->base.type, type);
/* TODO */
return NULL;
}
}
fprintf(stderr, ".%s", entry->v.compound_entry->symbol->string);
} else if(is_type_array(type)) {
- fprintf(stderr, "[%u]", entry->v.index);
+ fprintf(stderr, "[%zd]", entry->v.index);
} else {
fprintf(stderr, "-INVALID-");
}
SPECIFIER_FLOAT = 1 << 8,
SPECIFIER_BOOL = 1 << 9,
SPECIFIER_VOID = 1 << 10,
+ SPECIFIER_INT8 = 1 << 11,
+ SPECIFIER_INT16 = 1 << 12,
+ SPECIFIER_INT32 = 1 << 13,
+ SPECIFIER_INT64 = 1 << 14,
+ SPECIFIER_INT128 = 1 << 15,
#ifdef PROVIDE_COMPLEX
- SPECIFIER_COMPLEX = 1 << 11,
- SPECIFIER_IMAGINARY = 1 << 12,
+ SPECIFIER_COMPLEX = 1 << 16,
+ SPECIFIER_IMAGINARY = 1 << 17,
#endif
} specifiers_t;
expect(')');
} else if(symbol == sym_deprecated) {
next_token();
- DET_MOD(deprecated, DM_DEPRECATED);
- if(token.type == '(') {
+ if(specifiers->deprecated != 0)
+ warningf(HERE, "deprecated used more than once");
+ specifiers->deprecated = 1;
+ if(token.type == '(') {
next_token();
if(token.type == T_STRING_LITERAL) {
specifiers->deprecated_string = token.v.string.begin;
MATCH_STORAGE_CLASS(T_auto, STORAGE_CLASS_AUTO)
MATCH_STORAGE_CLASS(T_register, STORAGE_CLASS_REGISTER)
- case T_declspec:
+ case T__declspec:
next_token();
expect('(');
add_anchor_token(')');
MATCH_TYPE_QUALIFIER(T_const, TYPE_QUALIFIER_CONST);
MATCH_TYPE_QUALIFIER(T_restrict, TYPE_QUALIFIER_RESTRICT);
MATCH_TYPE_QUALIFIER(T_volatile, TYPE_QUALIFIER_VOLATILE);
+ MATCH_TYPE_QUALIFIER(T__w64, TYPE_QUALIFIER_W64);
+ MATCH_TYPE_QUALIFIER(T___ptr32, TYPE_QUALIFIER_PTR32);
+ MATCH_TYPE_QUALIFIER(T___ptr64, TYPE_QUALIFIER_PTR64);
+ MATCH_TYPE_QUALIFIER(T___uptr, TYPE_QUALIFIER_UPTR);
+ MATCH_TYPE_QUALIFIER(T___sptr, TYPE_QUALIFIER_SPTR);
case T___extension__:
/* TODO */
MATCH_SPECIFIER(T_signed, SPECIFIER_SIGNED, "signed")
MATCH_SPECIFIER(T_unsigned, SPECIFIER_UNSIGNED, "unsigned")
MATCH_SPECIFIER(T__Bool, SPECIFIER_BOOL, "_Bool")
+ MATCH_SPECIFIER(T__int8, SPECIFIER_INT8, "_int8")
+ MATCH_SPECIFIER(T__int16, SPECIFIER_INT16, "_int16")
+ 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:
+ case T__forceinline:
/* only in microsoft mode */
specifiers->decl_modifiers |= DM_FORCEINLINE;
| SPECIFIER_INT:
atomic_type = ATOMIC_TYPE_ULONGLONG;
break;
+
+ case SPECIFIER_UNSIGNED | SPECIFIER_INT8:
+ atomic_type = unsigned_int8_type_kind;
+ break;
+
+ case SPECIFIER_UNSIGNED | SPECIFIER_INT16:
+ atomic_type = unsigned_int16_type_kind;
+ break;
+
+ case SPECIFIER_UNSIGNED | SPECIFIER_INT32:
+ atomic_type = unsigned_int32_type_kind;
+ break;
+
+ case SPECIFIER_UNSIGNED | SPECIFIER_INT64:
+ atomic_type = unsigned_int64_type_kind;
+ break;
+
+ case SPECIFIER_UNSIGNED | SPECIFIER_INT128:
+ atomic_type = unsigned_int128_type_kind;
+ break;
+
+ case SPECIFIER_INT8:
+ case SPECIFIER_SIGNED | SPECIFIER_INT8:
+ atomic_type = int8_type_kind;
+ break;
+
+ case SPECIFIER_INT16:
+ case SPECIFIER_SIGNED | SPECIFIER_INT16:
+ atomic_type = int16_type_kind;
+ break;
+
+ case SPECIFIER_INT32:
+ case SPECIFIER_SIGNED | SPECIFIER_INT32:
+ atomic_type = int32_type_kind;
+ break;
+
+ case SPECIFIER_INT64:
+ case SPECIFIER_SIGNED | SPECIFIER_INT64:
+ atomic_type = int64_type_kind;
+ break;
+
+ case SPECIFIER_INT128:
+ case SPECIFIER_SIGNED | SPECIFIER_INT128:
+ atomic_type = int128_type_kind;
+ break;
+
case SPECIFIER_FLOAT:
atomic_type = ATOMIC_TYPE_FLOAT;
break;
}
type->base.qualifiers = type_qualifiers;
+ /* FIXME: check type qualifiers here */
type_t *result = typehash_insert(type);
if(newtype && result != type) {
MATCH_TYPE_QUALIFIER(T_const, TYPE_QUALIFIER_CONST);
MATCH_TYPE_QUALIFIER(T_restrict, TYPE_QUALIFIER_RESTRICT);
MATCH_TYPE_QUALIFIER(T_volatile, TYPE_QUALIFIER_VOLATILE);
+ /* microsoft extended type modifiers */
+ MATCH_TYPE_QUALIFIER(T__w64, TYPE_QUALIFIER_W64);
+ MATCH_TYPE_QUALIFIER(T___ptr32, TYPE_QUALIFIER_PTR32);
+ MATCH_TYPE_QUALIFIER(T___ptr64, TYPE_QUALIFIER_PTR64);
+ MATCH_TYPE_QUALIFIER(T___uptr, TYPE_QUALIFIER_UPTR);
+ MATCH_TYPE_QUALIFIER(T___sptr, TYPE_QUALIFIER_SPTR);
default:
return type_qualifiers;
declaration_t *const declaration = allocate_declaration_zero();
declaration->declared_storage_class = specifiers->declared_storage_class;
declaration->modifiers = specifiers->decl_modifiers;
+ declaration->deprecated = specifiers->deprecated;
declaration->deprecated_string = specifiers->deprecated_string;
declaration->get_property_sym = specifiers->get_property_sym;
declaration->put_property_sym = specifiers->put_property_sym;
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 "
- "previous declaration '%#T'",
- orig_type, symbol, previous_declaration->type, symbol);
- errorf(previous_declaration->source_position,
- "previous declaration of '%Y' was here", symbol);
+ "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'", symbol);
- errorf(previous_declaration->source_position, "previous declaration of '%Y' was here", symbol);
+ errorf(declaration->source_position, "redeclaration of enum entry '%Y' (declared %P)",
+ symbol, previous_declaration->source_position);
return previous_declaration;
}
warn_redundant_declaration:
if (warning.redundant_decls) {
warningf(declaration->source_position,
- "redundant declaration for '%Y'", symbol);
- warningf(previous_declaration->source_position,
- "previous declaration of '%Y' was here",
- symbol);
+ "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",
- symbol);
- errorf(previous_declaration->source_position,
- "previous declaration of '%Y' was here", symbol);
+ "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 == new_storage_class) {
errorf(declaration->source_position,
- "redeclaration of '%Y'", symbol);
+ "redeclaration of '%Y' (declared %P)",
+ symbol, previous_declaration->source_position);
} else {
errorf(declaration->source_position,
- "redeclaration of '%Y' with different linkage",
- symbol);
+ "redeclaration of '%Y' with different linkage (declared %P)",
+ symbol, previous_declaration->source_position);
}
- errorf(previous_declaration->source_position,
- "previous declaration of '%Y' was here", symbol);
}
}
return previous_declaration;
static void parser_error_multiple_definition(declaration_t *declaration,
const source_position_t source_position)
{
- errorf(source_position, "multiple definition of symbol '%Y'",
- declaration->symbol);
- errorf(declaration->source_position,
- "this is the location of the previous definition.");
+ errorf(source_position, "multiple definition of symbol '%Y' (declared %P)",
+ declaration->symbol, declaration->source_position);
}
static bool is_declaration_specifier(const token_t *token,
if(prev_decl != NULL) {
assert(prev_decl->symbol == symbol);
errorf(declaration->source_position,
- "multiple declarations of symbol '%Y'", symbol);
- errorf(prev_decl->source_position,
- "previous declaration of '%Y' was here", symbol);
+ "multiple declarations of symbol '%Y' (declared %P)",
+ symbol, prev_decl->source_position);
}
}
expression_parser_function_t expression_parsers[T_LAST_TOKEN];
-/**
- * Creates a new invalid expression.
- */
-static expression_t *create_invalid_expression(void)
-{
- expression_t *expression = allocate_expression_zero(EXPR_INVALID);
- expression->base.source_position = token.source_position;
- return expression;
-}
-
/**
* Prints an error message if an expression was expected but not read
*/
declaration->used = true;
/* check for deprecated functions */
- if(declaration->modifiers & DM_DEPRECATED) {
+ if(declaration->deprecated != 0) {
const char *prefix = "";
if (is_type_function(declaration->type))
prefix = "function ";
errorf(HERE, "'__func__' used outside of a function");
}
- expression_t *expression = allocate_expression_zero(EXPR_FUNCTION);
- expression->base.type = type_char_ptr;
+ expression_t *expression = allocate_expression_zero(EXPR_FUNCNAME);
+ expression->base.type = type_char_ptr;
+ expression->funcname.kind = FUNCNAME_FUNCTION;
return expression;
}
static expression_t *parse_pretty_function_keyword(void)
{
eat(T___PRETTY_FUNCTION__);
- /* TODO */
if (current_function == NULL) {
errorf(HERE, "'__PRETTY_FUNCTION__' used outside of a function");
}
- expression_t *expression = allocate_expression_zero(EXPR_PRETTY_FUNCTION);
- expression->base.type = type_char_ptr;
+ expression_t *expression = allocate_expression_zero(EXPR_FUNCNAME);
+ expression->base.type = type_char_ptr;
+ expression->funcname.kind = FUNCNAME_PRETTY_FUNCTION;
+
+ return expression;
+}
+
+static expression_t *parse_funcsig_keyword(void)
+{
+ eat(T___FUNCSIG__);
+
+ if (current_function == NULL) {
+ errorf(HERE, "'__FUNCSIG__' used outside of a function");
+ }
+
+ expression_t *expression = allocate_expression_zero(EXPR_FUNCNAME);
+ expression->base.type = type_char_ptr;
+ expression->funcname.kind = FUNCNAME_FUNCSIG;
+
+ return expression;
+}
+
+static expression_t *parse_funcdname_keyword(void)
+{
+ eat(T___FUNCDNAME__);
+
+ if (current_function == NULL) {
+ errorf(HERE, "'__FUNCDNAME__' used outside of a function");
+ }
+
+ expression_t *expression = allocate_expression_zero(EXPR_FUNCNAME);
+ expression->base.type = type_char_ptr;
+ expression->funcname.kind = FUNCNAME_FUNCDNAME;
return expression;
}
* Parses a MS assume() expression.
*/
static expression_t *parse_assume(void) {
- eat(T_assume);
+ eat(T__assume);
expression_t *expression
= allocate_expression_zero(EXPR_UNARY_ASSUME);
return create_invalid_expression();
}
+/**
+ * Parse a microsoft __noop expression.
+ */
+static expression_t *parse_noop_expression(void) {
+ source_position_t source_position = HERE;
+ eat(T___noop);
+
+ if (token.type == '(') {
+ /* parse arguments */
+ eat('(');
+ add_anchor_token(')');
+ add_anchor_token(',');
+
+ if(token.type != ')') {
+ while(true) {
+ (void)parse_assignment_expression();
+ if(token.type != ',')
+ break;
+ next_token();
+ }
+ }
+ }
+ rem_anchor_token(',');
+ rem_anchor_token(')');
+ expect(')');
+
+ /* the result is a (int)0 */
+ expression_t *cnst = allocate_expression_zero(EXPR_CONST);
+ cnst->base.source_position = source_position;
+ cnst->base.type = type_int;
+ cnst->conste.v.int_value = 0;
+ cnst->conste.is_ms_noop = true;
+
+ return cnst;
+
+end_error:
+ return create_invalid_expression();
+}
+
/**
* Parses a primary expression.
*/
case T___FUNCTION__:
case T___func__: return parse_function_keyword();
case T___PRETTY_FUNCTION__: return parse_pretty_function_keyword();
+ case T___FUNCSIG__: return parse_funcsig_keyword();
+ case T___FUNCDNAME__: return parse_funcdname_keyword();
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_isunordered: return parse_compare_builtin();
case T___builtin_constant_p: return parse_builtin_constant();
case T___builtin_prefetch: return parse_builtin_prefetch();
- case T_assume: return parse_assume();
+ case T__assume: return parse_assume();
case '(': return parse_brace_expression();
+ case T___noop: return parse_noop_expression();
}
errorf(HERE, "unexpected token %K, expected an expression", &token);
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");
+ 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,
/* 6.5.15.3 */
type_t *result_type;
- if (is_type_arithmetic(true_type) && is_type_arithmetic(false_type)) {
+ 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,
+ "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)) {
result_type = semantic_arithmetic(true_type, false_type);
true_expression = create_implicit_cast(true_expression, result_type);
conditional->true_expression = true_expression;
conditional->false_expression = false_expression;
conditional->base.type = result_type;
- } else if (same_compound_type(true_type, false_type) || (
- is_type_atomic(true_type, ATOMIC_TYPE_VOID) &&
- is_type_atomic(false_type, ATOMIC_TYPE_VOID)
- )) {
+ } else if (same_compound_type(true_type, false_type)) {
/* just take 1 of the 2 types */
result_type = true_type;
- } else if (is_type_pointer(true_type) && is_type_pointer(false_type)
- && pointers_compatible(true_type, false_type)) {
- /* ok */
- result_type = true_type;
- } else if (is_type_pointer(true_type)
- && is_null_pointer_constant(false_expression)) {
- result_type = true_type;
- } else if (is_type_pointer(false_type)
- && is_null_pointer_constant(true_expression)) {
- result_type = false_type;
+ } else if (is_type_pointer(true_type) || is_type_pointer(false_type)) {
+ type_t *pointer_type;
+ type_t *other_type;
+ expression_t *other_expression;
+ if (is_type_pointer(true_type)) {
+ pointer_type = true_type;
+ other_type = false_type;
+ other_expression = false_expression;
+ } else {
+ pointer_type = false_type;
+ other_type = true_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);
+ }
+ result_type = true_type;
+ } else if(is_null_pointer_constant(other_expression)) {
+ result_type = pointer_type;
+ } else if(is_type_integer(other_type)) {
+ 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);
+ result_type = type_error_type;
+ }
} else {
/* TODO: one pointer to void*, other some pointer */
}
type_t *const res_type = semantic_assign(orig_type_left, expression->right,
- "assignment");
+ "assignment", left->base.source_position);
if (res_type == NULL) {
errorf(expression->base.source_position,
"cannot assign to '%T' from '%T'",
case EXPR_UNKNOWN: break;
case EXPR_INVALID: return true; /* do NOT warn */
case EXPR_REFERENCE: return false;
- case EXPR_CONST: return false;
+ /* suppress the warning for microsoft __noop operations */
+ case EXPR_CONST: return expr->conste.is_ms_noop;
case EXPR_CHARACTER_CONSTANT: return false;
case EXPR_WIDE_CHARACTER_CONSTANT: return false;
case EXPR_STRING_LITERAL: return false;
case EXPR_CLASSIFY_TYPE: return false;
case EXPR_ALIGNOF: return false;
- case EXPR_FUNCTION: return false;
- case EXPR_PRETTY_FUNCTION: return false;
+ case EXPR_FUNCNAME: return false;
case EXPR_BUILTIN_SYMBOL: break; /* handled in EXPR_CALL */
case EXPR_BUILTIN_CONSTANT_P: return false;
case EXPR_BUILTIN_PREFETCH: return true;
/* if source position is already set then the label is defined twice,
* otherwise it was just mentioned in a goto so far */
if(label->source_position.input_name != NULL) {
- errorf(HERE, "duplicate label '%Y'", symbol);
- errorf(label->source_position, "previous definition of '%Y' was here",
- symbol);
+ errorf(HERE, "duplicate label '%Y' (declared %P)",
+ symbol, label->source_position);
} else {
label->source_position = token.source_position;
}
*/
static statement_t *parse_return(void)
{
- eat(T_return);
-
statement_t *statement = allocate_statement_zero(STATEMENT_RETURN);
statement->base.source_position = token.source_position;
+ eat(T_return);
+
expression_t *return_value = NULL;
if(token.type != ';') {
return_value = parse_expression();
return_value = NULL;
} else {
type_t *const res_type = semantic_assign(return_type,
- return_value, "'return'");
+ 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'",
projects / cparser / blobdiff