+/*
+ * This file is part of cparser.
+ * Copyright (C) 2007-2008 Matthias Braun <matze@braunis.de>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ * 02111-1307, USA.
+ */
#include <config.h>
#include <assert.h>
#include <stdarg.h>
#include <stdbool.h>
+#include "parser.h"
#include "diagnostic.h"
#include "format_check.h"
-#include "parser.h"
#include "lexer.h"
+#include "symbol_t.h"
#include "token_t.h"
#include "types.h"
#include "type_t.h"
typedef struct declaration_specifiers_t declaration_specifiers_t;
struct declaration_specifiers_t {
source_position_t source_position;
- unsigned char storage_class;
+ unsigned char declared_storage_class;
+ unsigned char alignment; /**< Alignment, 0 if not set. */
bool is_inline;
- decl_modifiers_t decl_modifiers;
+ 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. */
+ symbol_t *put_property_sym; /**< the name of the put property if set. */
type_t *type;
};
+/**
+ * An environment for parsing initializers (and compound literals).
+ */
+typedef struct parse_initializer_env_t {
+ type_t *type; /**< the type of the initializer. In case of an
+ array type with unspecified size this gets
+ adjusted to the actual size. */
+ declaration_t *declaration; /**< the declaration that is initialized if any */
+ bool must_be_constant;
+} parse_initializer_env_t;
+
typedef declaration_t* (*parsed_declaration_func) (declaration_t *declaration);
static token_t token;
static goto_statement_t *goto_last = NULL;
static label_statement_t *label_first = NULL;
static label_statement_t *label_last = NULL;
-static struct obstack temp_obst;
+static struct obstack temp_obst;
+
+/* symbols for Microsoft extended-decl-modifier */
+static const symbol_t *sym_align = NULL;
+static const symbol_t *sym_allocate = NULL;
+static const symbol_t *sym_dllimport = NULL;
+static const symbol_t *sym_dllexport = NULL;
+static const symbol_t *sym_naked = NULL;
+static const symbol_t *sym_noinline = NULL;
+static const symbol_t *sym_noreturn = NULL;
+static const symbol_t *sym_nothrow = NULL;
+static const symbol_t *sym_novtable = NULL;
+static const symbol_t *sym_property = NULL;
+static const symbol_t *sym_get = NULL;
+static const symbol_t *sym_put = NULL;
+static const symbol_t *sym_selectany = NULL;
+static const symbol_t *sym_thread = NULL;
+static const symbol_t *sym_uuid = NULL;
+static const symbol_t *sym_deprecated = NULL;
/** The current source position. */
#define HERE token.source_position
static expression_t *parse_expression(void);
static type_t *parse_typename(void);
-static void parse_compound_type_entries(void);
+static void parse_compound_type_entries(declaration_t *compound_declaration);
static declaration_t *parse_declarator(
const declaration_specifiers_t *specifiers, bool may_be_abstract);
static declaration_t *record_declaration(declaration_t *declaration);
static declaration_t *allocate_declaration_zero(void)
{
- declaration_t *declaration = allocate_ast_zero(sizeof(*allocate_declaration_zero()));
- declaration->type = type_error_type;
+ declaration_t *declaration = allocate_ast_zero(sizeof(declaration_t));
+ declaration->type = type_error_type;
+ declaration->alignment = 0;
return declaration;
}
static size_t get_expression_struct_size(expression_kind_t kind)
{
static const size_t sizes[] = {
- [EXPR_INVALID] = sizeof(expression_base_t),
- [EXPR_REFERENCE] = sizeof(reference_expression_t),
- [EXPR_CONST] = sizeof(const_expression_t),
- [EXPR_STRING_LITERAL] = sizeof(string_literal_expression_t),
- [EXPR_WIDE_STRING_LITERAL] = sizeof(wide_string_literal_expression_t),
- [EXPR_CALL] = sizeof(call_expression_t),
- [EXPR_UNARY_FIRST] = sizeof(unary_expression_t),
- [EXPR_BINARY_FIRST] = sizeof(binary_expression_t),
- [EXPR_CONDITIONAL] = sizeof(conditional_expression_t),
- [EXPR_SELECT] = sizeof(select_expression_t),
- [EXPR_ARRAY_ACCESS] = sizeof(array_access_expression_t),
- [EXPR_SIZEOF] = sizeof(sizeof_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_BUILTIN_SYMBOL] = sizeof(builtin_symbol_expression_t),
- [EXPR_BUILTIN_CONSTANT_P] = sizeof(builtin_constant_expression_t),
- [EXPR_BUILTIN_PREFETCH] = sizeof(builtin_prefetch_expression_t),
- [EXPR_OFFSETOF] = sizeof(offsetof_expression_t),
- [EXPR_VA_START] = sizeof(va_start_expression_t),
- [EXPR_VA_ARG] = sizeof(va_arg_expression_t),
- [EXPR_STATEMENT] = sizeof(statement_expression_t),
+ [EXPR_INVALID] = sizeof(expression_base_t),
+ [EXPR_REFERENCE] = sizeof(reference_expression_t),
+ [EXPR_CONST] = sizeof(const_expression_t),
+ [EXPR_CHARACTER_CONSTANT] = sizeof(const_expression_t),
+ [EXPR_WIDE_CHARACTER_CONSTANT] = sizeof(const_expression_t),
+ [EXPR_STRING_LITERAL] = sizeof(string_literal_expression_t),
+ [EXPR_WIDE_STRING_LITERAL] = sizeof(wide_string_literal_expression_t),
+ [EXPR_COMPOUND_LITERAL] = sizeof(compound_literal_expression_t),
+ [EXPR_CALL] = sizeof(call_expression_t),
+ [EXPR_UNARY_FIRST] = sizeof(unary_expression_t),
+ [EXPR_BINARY_FIRST] = sizeof(binary_expression_t),
+ [EXPR_CONDITIONAL] = sizeof(conditional_expression_t),
+ [EXPR_SELECT] = sizeof(select_expression_t),
+ [EXPR_ARRAY_ACCESS] = sizeof(array_access_expression_t),
+ [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_BUILTIN_SYMBOL] = sizeof(builtin_symbol_expression_t),
+ [EXPR_BUILTIN_CONSTANT_P] = sizeof(builtin_constant_expression_t),
+ [EXPR_BUILTIN_PREFETCH] = sizeof(builtin_prefetch_expression_t),
+ [EXPR_OFFSETOF] = sizeof(offsetof_expression_t),
+ [EXPR_VA_START] = sizeof(va_start_expression_t),
+ [EXPR_VA_ARG] = sizeof(va_arg_expression_t),
+ [EXPR_STATEMENT] = sizeof(statement_expression_t),
};
if(kind >= EXPR_UNARY_FIRST && kind <= EXPR_UNARY_LAST) {
return sizes[EXPR_UNARY_FIRST];
size_t size = get_expression_struct_size(kind);
expression_t *res = allocate_ast_zero(size);
- res->base.kind = kind;
- res->base.datatype = type_error_type;
+ res->base.kind = kind;
+ res->base.type = type_error_type;
return res;
}
* Allocate a type node of given kind and initialize all
* fields with zero.
*/
-static type_t *allocate_type_zero(type_kind_t kind)
+static type_t *allocate_type_zero(type_kind_t kind, 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.kind = kind;
+ res->base.source_position = source_position;
return res;
}
[INITIALIZER_VALUE] = sizeof(initializer_value_t),
[INITIALIZER_STRING] = sizeof(initializer_string_t),
[INITIALIZER_WIDE_STRING] = sizeof(initializer_wide_string_t),
- [INITIALIZER_LIST] = sizeof(initializer_list_t)
+ [INITIALIZER_LIST] = sizeof(initializer_list_t),
+ [INITIALIZER_DESIGNATOR] = sizeof(initializer_designator_t)
};
assert(kind < sizeof(sizes) / sizeof(*sizes));
assert(sizes[kind] != 0);
}
va_list ap;
va_start(ap, message);
- errorf(HERE, "got '%K', expected %#k", &token, &ap, ", ");
+ errorf(HERE, "got %K, expected %#k", &token, &ap, ", ");
va_end(ap);
}
if(token.type == ')' || token.type == ';' || token.type == '}') {
return;
}
+ if(token.type == ')') {
+ next_token();
+ return;
+ }
if(token.type == '(') {
eat_paren();
continue;
}
next_token();
}
- eat(')');
}
+/**
+ * Expect the the current token is the expected token.
+ * 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); \
eat_statement(); \
- return NULL; \
+ goto end_error; \
} \
- next_token();
+ next_token(); \
+ } while(0)
#define expect_block(expected) \
+ do { \
if(UNLIKELY(token.type != (expected))) { \
parse_error_expected(NULL, (expected), 0); \
eat_block(); \
return NULL; \
} \
- next_token();
-
-#define expect_void(expected) \
- if(UNLIKELY(token.type != (expected))) { \
- parse_error_expected(NULL, (expected), 0); \
- eat_statement(); \
- return; \
- } \
- next_token();
+ next_token(); \
+ } while(0)
static void set_scope(scope_t *new_scope)
{
+ if(scope != NULL) {
+ scope->last_declaration = last_declaration;
+ }
scope = new_scope;
- last_declaration = new_scope->declarations;
- if(last_declaration != NULL) {
- while(last_declaration->next != NULL) {
- last_declaration = last_declaration->next;
- }
- }
+ last_declaration = new_scope->last_declaration;
}
/**
* Search a symbol in a given namespace and returns its declaration or
* NULL if this symbol was not found.
*/
-static declaration_t *get_declaration(const symbol_t *const symbol, const namespace_t namespc)
+static declaration_t *get_declaration(const symbol_t *const symbol,
+ const namespace_t namespc)
{
declaration_t *declaration = symbol->declaration;
for( ; declaration != NULL; declaration = declaration->symbol_next) {
*/
static void stack_push(stack_entry_t **stack_ptr, declaration_t *declaration)
{
- symbol_t *symbol = declaration->symbol;
- namespace_t namespc = (namespace_t)declaration->namespc;
-
- /* remember old declaration */
- stack_entry_t entry;
- entry.symbol = symbol;
- entry.old_declaration = symbol->declaration;
- entry.namespc = (unsigned short) namespc;
- ARR_APP1(stack_entry_t, *stack_ptr, entry);
+ symbol_t *symbol = declaration->symbol;
+ namespace_t namespc = (namespace_t) declaration->namespc;
/* replace/add declaration into declaration list of the symbol */
- if(symbol->declaration == NULL) {
+ declaration_t *iter = symbol->declaration;
+ if (iter == NULL) {
symbol->declaration = declaration;
} else {
declaration_t *iter_last = NULL;
- declaration_t *iter = symbol->declaration;
for( ; iter != NULL; iter_last = iter, iter = iter->symbol_next) {
/* replace an entry? */
if(iter->namespc == namespc) {
iter_last->symbol_next = declaration;
}
}
+
+ /* remember old declaration */
+ stack_entry_t entry;
+ entry.symbol = symbol;
+ entry.old_declaration = iter;
+ entry.namespc = (unsigned short) namespc;
+ ARR_APP1(stack_entry_t, *stack_ptr, entry);
}
static void environment_push(declaration_t *declaration)
if(iter->namespc == namespc) {
assert(iter_last != NULL);
iter_last->symbol_next = old_declaration;
- old_declaration->symbol_next = iter->symbol_next;
+ if(old_declaration != NULL) {
+ old_declaration->symbol_next = iter->symbol_next;
+ }
break;
}
}
{
expression_t *cast = allocate_expression_zero(EXPR_UNARY_CAST_IMPLICIT);
- cast->unary.value = expression;
- cast->base.datatype = dest_type;
+ cast->unary.value = expression;
+ cast->base.type = dest_type;
return cast;
}
if (expression->kind != EXPR_CONST)
return false;
- type_t *const type = skip_typeref(expression->base.datatype);
+ type_t *const type = skip_typeref(expression->base.type);
if (!is_type_integer(type))
return false;
static expression_t *create_implicit_cast(expression_t *expression,
type_t *dest_type)
{
- type_t *const source_type = expression->base.datatype;
+ type_t *const source_type = expression->base.type;
if (source_type == dest_type)
return expression;
const expression_t *const right,
const char *context)
{
- type_t *const orig_type_right = right->base.datatype;
+ 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);
points_to_left = get_unqualified_type(points_to_left);
points_to_right = get_unqualified_type(points_to_right);
- if(!is_type_atomic(points_to_left, ATOMIC_TYPE_VOID)
- && !is_type_atomic(points_to_right, ATOMIC_TYPE_VOID)
- && !types_compatible(points_to_left, points_to_right)) {
- return NULL;
+ if (is_type_atomic(points_to_left, ATOMIC_TYPE_VOID) ||
+ is_type_atomic(points_to_right, ATOMIC_TYPE_VOID)) {
+ 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);
}
return orig_type_left;
}
- if (is_type_compound(type_left) && is_type_compound(type_right)) {
+ 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)) {
symbol_t *const symbol = symbol_table_insert(name);
declaration_t *const declaration = allocate_declaration_zero();
- declaration->namespc = NAMESPACE_NORMAL;
- declaration->storage_class = STORAGE_CLASS_TYPEDEF;
- declaration->type = type;
- declaration->symbol = symbol;
- declaration->source_position = builtin_source_position;
+ declaration->namespc = NAMESPACE_NORMAL;
+ declaration->storage_class = STORAGE_CLASS_TYPEDEF;
+ declaration->declared_storage_class = STORAGE_CLASS_TYPEDEF;
+ declaration->type = type;
+ declaration->symbol = symbol;
+ declaration->source_position = builtin_source_position;
record_declaration(declaration);
- type_t *typedef_type = allocate_type_zero(TYPE_TYPEDEF);
+ type_t *typedef_type = allocate_type_zero(TYPE_TYPEDEF, builtin_source_position);
typedef_type->typedeft.declaration = declaration;
return typedef_type;
case T___attribute__: {
next_token();
- expect_void('(');
+ expect('(');
int depth = 1;
while(depth > 0) {
switch(token.type) {
}
case T_asm:
next_token();
- expect_void('(');
+ expect('(');
if(token.type != T_STRING_LITERAL) {
parse_error_expected("while parsing assembler attribute",
T_STRING_LITERAL);
} else {
parse_string_literals();
}
- expect_void(')');
+ expect(')');
break;
default:
goto attributes_finished;
}
}
+end_error:
attributes_finished:
;
}
-#if 0
static designator_t *parse_designation(void)
{
- if(token.type != '[' && token.type != '.')
- return NULL;
-
designator_t *result = NULL;
designator_t *last = NULL;
- while(1) {
+ while(true) {
designator_t *designator;
switch(token.type) {
case '[':
designator = allocate_ast_zero(sizeof(designator[0]));
+ designator->source_position = token.source_position;
next_token();
- designator->array_access = parse_constant_expression();
+ designator->array_index = parse_constant_expression();
expect(']');
break;
case '.':
designator = allocate_ast_zero(sizeof(designator[0]));
+ designator->source_position = token.source_position;
next_token();
if(token.type != T_IDENTIFIER) {
parse_error_expected("while parsing designator",
}
last = designator;
}
+end_error:
+ return NULL;
}
-#endif
static initializer_t *initializer_from_string(array_type_t *type,
const string_t *const string)
return initializer;
}
-static initializer_t *initializer_from_expression(type_t *type,
+/**
+ * Build an initializer from a given expression.
+ */
+static initializer_t *initializer_from_expression(type_t *orig_type,
expression_t *expression)
{
/* TODO check that expression is a constant expression */
/* § 6.7.8.14/15 char array may be initialized by string literals */
- type_t *const expr_type = expression->base.datatype;
+ type_t *type = skip_typeref(orig_type);
+ type_t *expr_type_orig = expression->base.type;
+ type_t *expr_type = skip_typeref(expr_type_orig);
if (is_type_array(type) && expr_type->kind == TYPE_POINTER) {
array_type_t *const array_type = &type->array;
type_t *const element_type = skip_typeref(array_type->element_type);
if (element_type->kind == TYPE_ATOMIC) {
+ atomic_type_kind_t akind = element_type->atomic.akind;
switch (expression->kind) {
case EXPR_STRING_LITERAL:
- if (element_type->atomic.akind == ATOMIC_TYPE_CHAR) {
+ if (akind == ATOMIC_TYPE_CHAR
+ || akind == ATOMIC_TYPE_SCHAR
+ || akind == ATOMIC_TYPE_UCHAR) {
return initializer_from_string(array_type,
&expression->string.value);
}
return result;
}
-static initializer_t *parse_sub_initializer(type_t *type,
- expression_t *expression);
+/**
+ * Checks if a given expression can be used as an constant initializer.
+ */
+static bool is_initializer_constant(const expression_t *expression)
+{
+ return is_constant_expression(expression)
+ || is_address_constant(expression);
+}
-static initializer_t *parse_sub_initializer_elem(type_t *type)
+/**
+ * Parses an scalar initializer.
+ *
+ * § 6.7.8.11; eat {} without warning
+ */
+static initializer_t *parse_scalar_initializer(type_t *type,
+ bool must_be_constant)
{
- if(token.type == '{') {
- return parse_sub_initializer(type, NULL);
+ /* there might be extra {} hierarchies */
+ int braces = 0;
+ while(token.type == '{') {
+ next_token();
+ if(braces == 0) {
+ warningf(HERE, "extra curly braces around scalar initializer");
+ }
+ braces++;
}
expression_t *expression = parse_assignment_expression();
- return parse_sub_initializer(type, expression);
+ if(must_be_constant && !is_initializer_constant(expression)) {
+ 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,
+ "expression '%E' doesn't match expected type '%T'",
+ expression, type);
+ /* TODO */
+ return NULL;
+ }
+
+ bool additional_warning_displayed = false;
+ while(braces > 0) {
+ if(token.type == ',') {
+ next_token();
+ }
+ if(token.type != '}') {
+ if(!additional_warning_displayed) {
+ warningf(HERE, "additional elements in scalar initializer");
+ additional_warning_displayed = true;
+ }
+ }
+ eat_block();
+ braces--;
+ }
+
+ return initializer;
}
-static bool had_initializer_brace_warning;
+/**
+ * An entry in the type path.
+ */
+typedef struct type_path_entry_t type_path_entry_t;
+struct type_path_entry_t {
+ type_t *type; /**< the upper top type. restored to path->top_tye if this entry is popped. */
+ union {
+ size_t index; /**< For array types: the current index. */
+ declaration_t *compound_entry; /**< For compound types: the current declaration. */
+ } v;
+};
+
+/**
+ * A type path expression a position inside compound or array types.
+ */
+typedef struct type_path_t type_path_t;
+struct type_path_t {
+ type_path_entry_t *path; /**< An flexible array containing the current path. */
+ type_t *top_type; /**< type of the element the path points */
+ size_t max_index; /**< largest index in outermost array */
+};
-static void skip_designator(void)
+/**
+ * Prints a type path for debugging.
+ */
+static __attribute__((unused)) void debug_print_type_path(
+ const type_path_t *path)
{
- while(1) {
- if(token.type == '.') {
- next_token();
- if(token.type == T_IDENTIFIER)
- next_token();
- } else if(token.type == '[') {
- next_token();
- parse_constant_expression();
- if(token.type == ']')
- next_token();
+ size_t len = ARR_LEN(path->path);
+
+ for(size_t i = 0; i < len; ++i) {
+ const type_path_entry_t *entry = & path->path[i];
+
+ type_t *type = skip_typeref(entry->type);
+ if(is_type_compound(type)) {
+ /* in gcc mode structs can have no members */
+ if(entry->v.compound_entry == NULL) {
+ assert(i == len-1);
+ continue;
+ }
+ fprintf(stderr, ".%s", entry->v.compound_entry->symbol->string);
+ } else if(is_type_array(type)) {
+ fprintf(stderr, "[%u]", entry->v.index);
} else {
- break;
+ fprintf(stderr, "-INVALID-");
}
}
+ if(path->top_type != NULL) {
+ fprintf(stderr, " (");
+ print_type(path->top_type);
+ fprintf(stderr, ")");
+ }
}
-static initializer_t *parse_sub_initializer(type_t *type,
- expression_t *expression)
+/**
+ * Return the top type path entry, ie. in a path
+ * (type).a.b returns the b.
+ */
+static type_path_entry_t *get_type_path_top(const type_path_t *path)
{
- if(is_type_scalar(type)) {
- /* there might be extra {} hierarchies */
- if(token.type == '{') {
- next_token();
- if(!had_initializer_brace_warning) {
- warningf(HERE, "braces around scalar initializer");
- had_initializer_brace_warning = true;
+ size_t len = ARR_LEN(path->path);
+ assert(len > 0);
+ return &path->path[len-1];
+}
+
+/**
+ * Enlarge the type path by an (empty) element.
+ */
+static type_path_entry_t *append_to_type_path(type_path_t *path)
+{
+ size_t len = ARR_LEN(path->path);
+ ARR_RESIZE(type_path_entry_t, path->path, len+1);
+
+ type_path_entry_t *result = & path->path[len];
+ memset(result, 0, sizeof(result[0]));
+ return result;
+}
+
+/**
+ * Descending into a sub-type. Enter the scope of the current
+ * top_type.
+ */
+static void descend_into_subtype(type_path_t *path)
+{
+ type_t *orig_top_type = path->top_type;
+ type_t *top_type = skip_typeref(orig_top_type);
+
+ assert(is_type_compound(top_type) || is_type_array(top_type));
+
+ type_path_entry_t *top = append_to_type_path(path);
+ top->type = top_type;
+
+ if(is_type_compound(top_type)) {
+ declaration_t *declaration = top_type->compound.declaration;
+ declaration_t *entry = declaration->scope.declarations;
+ top->v.compound_entry = entry;
+
+ if(entry != NULL) {
+ path->top_type = entry->type;
+ } else {
+ path->top_type = NULL;
+ }
+ } else {
+ assert(is_type_array(top_type));
+
+ top->v.index = 0;
+ path->top_type = top_type->array.element_type;
+ }
+}
+
+/**
+ * Pop an entry from the given type path, ie. returning from
+ * (type).a.b to (type).a
+ */
+static void ascend_from_subtype(type_path_t *path)
+{
+ type_path_entry_t *top = get_type_path_top(path);
+
+ path->top_type = top->type;
+
+ size_t len = ARR_LEN(path->path);
+ ARR_RESIZE(type_path_entry_t, path->path, len-1);
+}
+
+/**
+ * Pop entries from the given type path until the given
+ * path level is reached.
+ */
+static void ascend_to(type_path_t *path, size_t top_path_level)
+{
+ size_t len = ARR_LEN(path->path);
+
+ while(len > top_path_level) {
+ ascend_from_subtype(path);
+ len = ARR_LEN(path->path);
+ }
+}
+
+static bool walk_designator(type_path_t *path, const designator_t *designator,
+ bool used_in_offsetof)
+{
+ for( ; designator != NULL; designator = designator->next) {
+ type_path_entry_t *top = get_type_path_top(path);
+ type_t *orig_type = top->type;
+
+ type_t *type = skip_typeref(orig_type);
+
+ if(designator->symbol != NULL) {
+ symbol_t *symbol = designator->symbol;
+ if(!is_type_compound(type)) {
+ if(is_type_valid(type)) {
+ errorf(designator->source_position,
+ "'.%Y' designator used for non-compound type '%T'",
+ symbol, orig_type);
+ }
+ goto failed;
}
- initializer_t *result = parse_sub_initializer(type, NULL);
- if(token.type == ',') {
- next_token();
- /* TODO: warn about excessive elements */
+
+ declaration_t *declaration = type->compound.declaration;
+ declaration_t *iter = declaration->scope.declarations;
+ for( ; iter != NULL; iter = iter->next) {
+ if(iter->symbol == symbol) {
+ break;
+ }
}
- expect_block('}');
- return result;
+ if(iter == NULL) {
+ 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,
+ "offsetof designator '%Y' may not specify bitfield",
+ symbol);
+ goto failed;
+ }
+ }
+
+ top->type = orig_type;
+ top->v.compound_entry = iter;
+ orig_type = iter->type;
+ } else {
+ expression_t *array_index = designator->array_index;
+ assert(designator->array_index != NULL);
+
+ if(!is_type_array(type)) {
+ if(is_type_valid(type)) {
+ errorf(designator->source_position,
+ "[%E] designator used for non-array type '%T'",
+ array_index, orig_type);
+ }
+ goto failed;
+ }
+ if(!is_type_valid(array_index->base.type)) {
+ goto failed;
+ }
+
+ long index = fold_constant(array_index);
+ if(!used_in_offsetof) {
+ if(index < 0) {
+ 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);
+ goto failed;
+ }
+ }
+ }
+
+ top->type = orig_type;
+ top->v.index = (size_t) index;
+ orig_type = type->array.element_type;
}
+ path->top_type = orig_type;
- if(expression == NULL) {
- expression = parse_assignment_expression();
+ if(designator->next != NULL) {
+ descend_into_subtype(path);
}
- return initializer_from_expression(type, expression);
}
+ return true;
- /* does the expression match the currently looked at object to initialize */
- if(expression != NULL) {
- initializer_t *result = initializer_from_expression(type, expression);
- if(result != NULL)
- return result;
+failed:
+ return false;
+}
+
+static void advance_current_object(type_path_t *path, size_t top_path_level)
+{
+ type_path_entry_t *top = get_type_path_top(path);
+
+ type_t *type = skip_typeref(top->type);
+ if(is_type_union(type)) {
+ /* in unions only the first element is initialized */
+ top->v.compound_entry = NULL;
+ } else if(is_type_struct(type)) {
+ declaration_t *entry = top->v.compound_entry;
+
+ entry = entry->next;
+ top->v.compound_entry = entry;
+ if(entry != NULL) {
+ path->top_type = entry->type;
+ return;
+ }
+ } else {
+ assert(is_type_array(type));
+
+ top->v.index++;
+
+ if(!type->array.size_constant || top->v.index < type->array.size) {
+ return;
+ }
}
- bool read_paren = false;
- if(token.type == '{') {
+ /* we're past the last member of the current sub-aggregate, try if we
+ * can ascend in the type hierarchy and continue with another subobject */
+ size_t len = ARR_LEN(path->path);
+
+ if(len > top_path_level) {
+ ascend_from_subtype(path);
+ advance_current_object(path, top_path_level);
+ } else {
+ path->top_type = NULL;
+ }
+}
+
+/**
+ * skip until token is found.
+ */
+static void skip_until(int type) {
+ while(token.type != type) {
+ if(token.type == T_EOF)
+ return;
next_token();
- read_paren = true;
}
+}
- /* descend into subtype */
- initializer_t *result = NULL;
- initializer_t **elems;
- if(is_type_array(type)) {
- if(token.type == '.') {
- errorf(HERE,
- "compound designator in initializer for array type '%T'",
- type);
- skip_designator();
+/**
+ * skip any {...} blocks until a closing braket is reached.
+ */
+static void skip_initializers(void)
+{
+ if(token.type == '{')
+ next_token();
+
+ while(token.type != '}') {
+ if(token.type == T_EOF)
+ return;
+ if(token.type == '{') {
+ eat_block();
+ continue;
}
+ next_token();
+ }
+}
- type_t *const element_type = skip_typeref(type->array.element_type);
+/**
+ * Parse a part of an initialiser for a struct or union,
+ */
+static initializer_t *parse_sub_initializer(type_path_t *path,
+ type_t *outer_type, size_t top_path_level,
+ parse_initializer_env_t *env)
+{
+ if(token.type == '}') {
+ /* empty initializer */
+ return NULL;
+ }
- initializer_t *sub;
- had_initializer_brace_warning = false;
- if(expression == NULL) {
- sub = parse_sub_initializer_elem(element_type);
- } else {
- sub = parse_sub_initializer(element_type, expression);
- }
+ type_t *orig_type = path->top_type;
+ type_t *type = NULL;
- /* didn't match the subtypes -> try the parent type */
- if(sub == NULL) {
- assert(!read_paren);
+ if (orig_type == NULL) {
+ /* We are initializing an empty compound. */
+ } else {
+ type = skip_typeref(orig_type);
+
+ /* we can't do usefull stuff if we didn't even parse the type. Skip the
+ * initializers in this case. */
+ if(!is_type_valid(type)) {
+ skip_initializers();
return NULL;
}
+ }
- elems = NEW_ARR_F(initializer_t*, 0);
- ARR_APP1(initializer_t*, elems, sub);
-
- while(true) {
- if(token.type == '}')
- break;
- expect_block(',');
- if(token.type == '}')
- break;
+ initializer_t **initializers = NEW_ARR_F(initializer_t*, 0);
- sub = parse_sub_initializer_elem(element_type);
- if(sub == NULL) {
- /* TODO error, do nicer cleanup */
- errorf(HERE, "member initializer didn't match");
- DEL_ARR_F(elems);
- return NULL;
+ while(true) {
+ designator_t *designator = NULL;
+ if(token.type == '.' || token.type == '[') {
+ designator = parse_designation();
+
+ /* reset path to toplevel, evaluate designator from there */
+ ascend_to(path, top_path_level);
+ if(!walk_designator(path, designator, false)) {
+ /* can't continue after designation error */
+ goto end_error;
}
- ARR_APP1(initializer_t*, elems, sub);
- }
- } else {
- assert(is_type_compound(type));
- scope_t *const scope = &type->compound.declaration->scope;
- if(token.type == '[') {
- errorf(HERE,
- "array designator in initializer for compound type '%T'",
- type);
- skip_designator();
+ initializer_t *designator_initializer
+ = allocate_initializer_zero(INITIALIZER_DESIGNATOR);
+ designator_initializer->designator.designator = designator;
+ ARR_APP1(initializer_t*, initializers, designator_initializer);
}
- declaration_t *first = scope->declarations;
- if(first == NULL)
- return NULL;
- type_t *first_type = first->type;
- first_type = skip_typeref(first_type);
-
initializer_t *sub;
- had_initializer_brace_warning = false;
- if(expression == NULL) {
- sub = parse_sub_initializer_elem(first_type);
+
+ if(token.type == '{') {
+ if(type != NULL && is_type_scalar(type)) {
+ sub = parse_scalar_initializer(type, env->must_be_constant);
+ } else {
+ eat('{');
+ if(type == NULL) {
+ if (env->declaration != NULL)
+ errorf(HERE, "extra brace group at end of initializer for '%Y'",
+ env->declaration->symbol);
+ else
+ errorf(HERE, "extra brace group at end of initializer");
+ } else
+ descend_into_subtype(path);
+
+ sub = parse_sub_initializer(path, orig_type, top_path_level+1,
+ env);
+
+ if(type != NULL) {
+ ascend_from_subtype(path);
+ expect_block('}');
+ } else {
+ expect_block('}');
+ goto error_parse_next;
+ }
+ }
} else {
- sub = parse_sub_initializer(first_type, expression);
- }
+ /* must be an expression */
+ expression_t *expression = parse_assignment_expression();
- /* didn't match the subtypes -> try our parent type */
- if(sub == NULL) {
- assert(!read_paren);
- return NULL;
- }
+ if(env->must_be_constant && !is_initializer_constant(expression)) {
+ errorf(expression->base.source_position,
+ "Initialisation expression '%E' is not constant\n",
+ expression);
+ }
- elems = NEW_ARR_F(initializer_t*, 0);
- ARR_APP1(initializer_t*, elems, sub);
+ if(type == NULL) {
+ /* we are already outside, ... */
+ goto error_excess;
+ }
- declaration_t *iter = first->next;
- for( ; iter != NULL; iter = iter->next) {
- if(iter->symbol == NULL)
- continue;
- if(iter->namespc != NAMESPACE_NORMAL)
- continue;
+ /* handle { "string" } special case */
+ if((expression->kind == EXPR_STRING_LITERAL
+ || expression->kind == EXPR_WIDE_STRING_LITERAL)
+ && outer_type != NULL) {
+ sub = initializer_from_expression(outer_type, expression);
+ if(sub != NULL) {
+ if(token.type == ',') {
+ next_token();
+ }
+ if(token.type != '}') {
+ warningf(HERE, "excessive elements in initializer for type '%T'",
+ orig_type);
+ }
+ /* TODO: eat , ... */
+ return sub;
+ }
+ }
- if(token.type == '}')
- break;
- expect_block(',');
- if(token.type == '}')
- break;
+ /* descend into subtypes until expression matches type */
+ while(true) {
+ orig_type = path->top_type;
+ type = skip_typeref(orig_type);
- type_t *iter_type = iter->type;
- iter_type = skip_typeref(iter_type);
+ sub = initializer_from_expression(orig_type, expression);
+ if(sub != NULL) {
+ break;
+ }
+ if(!is_type_valid(type)) {
+ goto end_error;
+ }
+ if(is_type_scalar(type)) {
+ errorf(expression->base.source_position,
+ "expression '%E' doesn't match expected type '%T'",
+ expression, orig_type);
+ goto end_error;
+ }
- sub = parse_sub_initializer_elem(iter_type);
- if(sub == NULL) {
- /* TODO error, do nicer cleanup */
- errorf(HERE, "member initializer didn't match");
- DEL_ARR_F(elems);
- return NULL;
+ descend_into_subtype(path);
}
- ARR_APP1(initializer_t*, elems, sub);
}
- }
-
- int len = ARR_LEN(elems);
- size_t elems_size = sizeof(initializer_t*) * len;
- initializer_list_t *init = allocate_ast_zero(sizeof(init[0]) + elems_size);
+ /* update largest index of top array */
+ const type_path_entry_t *first = &path->path[0];
+ type_t *first_type = first->type;
+ first_type = skip_typeref(first_type);
+ if(is_type_array(first_type)) {
+ size_t index = first->v.index;
+ if(index > path->max_index)
+ path->max_index = index;
+ }
- init->initializer.kind = INITIALIZER_LIST;
- init->len = len;
- memcpy(init->initializers, elems, elems_size);
- DEL_ARR_F(elems);
+ if(type != NULL) {
+ /* append to initializers list */
+ ARR_APP1(initializer_t*, initializers, sub);
+ } else {
+error_excess:
+ if(env->declaration != NULL)
+ warningf(HERE, "excess elements in struct initializer for '%Y'",
+ env->declaration->symbol);
+ else
+ warningf(HERE, "excess elements in struct initializer");
+ }
- result = (initializer_t*) init;
+error_parse_next:
+ if(token.type == '}') {
+ break;
+ }
+ expect(',');
+ if(token.type == '}') {
+ break;
+ }
- if(read_paren) {
- if(token.type == ',')
- next_token();
- expect('}');
+ if(type != NULL) {
+ /* advance to the next declaration if we are not at the end */
+ advance_current_object(path, top_path_level);
+ orig_type = path->top_type;
+ if(orig_type != NULL)
+ type = skip_typeref(orig_type);
+ else
+ type = NULL;
+ }
}
+
+ size_t len = ARR_LEN(initializers);
+ size_t size = sizeof(initializer_list_t) + len * sizeof(initializers[0]);
+ initializer_t *result = allocate_ast_zero(size);
+ result->kind = INITIALIZER_LIST;
+ result->list.len = len;
+ memcpy(&result->list.initializers, initializers,
+ len * sizeof(initializers[0]));
+
+ DEL_ARR_F(initializers);
+ ascend_to(path, top_path_level);
+
return result;
+
+end_error:
+ skip_initializers();
+ DEL_ARR_F(initializers);
+ ascend_to(path, top_path_level);
+ return NULL;
}
-static initializer_t *parse_initializer(type_t *const orig_type)
+/**
+ * Parses an initializer. Parsers either a compound literal
+ * (env->declaration == NULL) or an initializer of a declaration.
+ */
+static initializer_t *parse_initializer(parse_initializer_env_t *env)
{
- initializer_t *result;
-
- type_t *const type = skip_typeref(orig_type);
-
- if(token.type != '{') {
- expression_t *expression = parse_assignment_expression();
- initializer_t *initializer = initializer_from_expression(type, expression);
- if(initializer == NULL) {
- errorf(HERE,
- "initializer expression '%E' of type '%T' is incompatible with type '%T'",
- expression, expression->base.datatype, orig_type);
- }
- return initializer;
- }
+ type_t *type = skip_typeref(env->type);
+ initializer_t *result = NULL;
+ size_t max_index;
if(is_type_scalar(type)) {
- /* § 6.7.8.11 */
+ result = parse_scalar_initializer(type, env->must_be_constant);
+ } else if(token.type == '{') {
eat('{');
- expression_t *expression = parse_assignment_expression();
- result = initializer_from_expression(type, expression);
+ type_path_t path;
+ memset(&path, 0, sizeof(path));
+ path.top_type = env->type;
+ path.path = NEW_ARR_F(type_path_entry_t, 0);
- if(token.type == ',')
- next_token();
+ descend_into_subtype(&path);
+
+ result = parse_sub_initializer(&path, env->type, 1, env);
+
+ max_index = path.max_index;
+ DEL_ARR_F(path.path);
expect('}');
- return result;
} else {
- result = parse_sub_initializer(type, NULL);
+ /* parse_scalar_initializer() also works in this case: we simply
+ * have an expression without {} around it */
+ result = parse_scalar_initializer(type, env->must_be_constant);
+ }
+
+ /* § 6.7.5 (22) array initializers for arrays with unknown size determine
+ * the array type size */
+ if(is_type_array(type) && type->array.size_expression == NULL
+ && result != NULL) {
+ size_t size;
+ switch (result->kind) {
+ case INITIALIZER_LIST:
+ size = max_index + 1;
+ break;
+
+ case INITIALIZER_STRING:
+ size = result->string.string.size;
+ break;
+
+ case INITIALIZER_WIDE_STRING:
+ size = result->wide_string.string.size;
+ break;
+
+ default:
+ panic("invalid initializer type");
+ }
+
+ expression_t *cnst = allocate_expression_zero(EXPR_CONST);
+ cnst->base.type = type_size_t;
+ cnst->conste.v.int_value = size;
+
+ type_t *new_type = duplicate_type(type);
+
+ new_type->array.size_expression = cnst;
+ new_type->array.size_constant = true;
+ new_type->array.size = size;
+ env->type = new_type;
}
return result;
+end_error:
+ return NULL;
}
static declaration_t *append_declaration(declaration_t *declaration);
if(token.type == '{') {
if(declaration->init.is_defined) {
assert(symbol != NULL);
- errorf(HERE, "multiple definition of '%s %Y'",
+ errorf(HERE, "multiple definitions of '%s %Y'",
is_struct ? "struct" : "union", symbol);
declaration->scope.declarations = NULL;
}
declaration->init.is_defined = true;
- int top = environment_top();
- scope_t *last_scope = scope;
- set_scope(&declaration->scope);
-
- parse_compound_type_entries();
+ parse_compound_type_entries(declaration);
parse_attributes();
-
- assert(scope == &declaration->scope);
- set_scope(last_scope);
- environment_pop_to(top);
}
return declaration;
if(token.type == '=') {
next_token();
- entry->init.enum_value = parse_constant_expression();
+ expression_t *value = parse_constant_expression();
+
+ value = create_implicit_cast(value, enum_type);
+ entry->init.enum_value = value;
/* TODO semantic */
}
next_token();
} while(token.type != '}');
- expect_void('}');
+ expect('}');
+
+end_error:
+ ;
}
static type_t *parse_enum_specifier(void)
declaration->parent_scope = scope;
}
- type_t *const type = allocate_type_zero(TYPE_ENUM);
+ type_t *const type = allocate_type_zero(TYPE_ENUM, declaration->source_position);
type->enumt.declaration = declaration;
if(token.type == '{') {
type = parse_typename();
} else {
expression = parse_expression();
- type = expression->base.datatype;
+ type = expression->base.type;
}
break;
default:
expression = parse_expression();
- type = expression->base.datatype;
+ type = expression->base.type;
break;
}
expect(')');
- type_t *typeof_type = allocate_type_zero(TYPE_TYPEOF);
+ type_t *typeof_type = allocate_type_zero(TYPE_TYPEOF, expression->base.source_position);
typeof_type->typeoft.expression = expression;
typeof_type->typeoft.typeof_type = type;
return typeof_type;
+end_error:
+ return NULL;
}
typedef enum {
static type_t *create_builtin_type(symbol_t *const symbol,
type_t *const real_type)
{
- type_t *type = allocate_type_zero(TYPE_BUILTIN);
+ type_t *type = allocate_type_zero(TYPE_BUILTIN, builtin_source_position);
type->builtin.symbol = symbol;
type->builtin.real_type = real_type;
|| declaration->storage_class != STORAGE_CLASS_TYPEDEF)
return NULL;
- type_t *type = allocate_type_zero(TYPE_TYPEDEF);
+ type_t *type = allocate_type_zero(TYPE_TYPEDEF, declaration->source_position);
type->typedeft.declaration = declaration;
return type;
}
+/**
+ * check for the allowed MS alignment values.
+ */
+static bool check_elignment_value(long long intvalue) {
+ if(intvalue < 1 || intvalue > 8192) {
+ errorf(HERE, "illegal alignment value");
+ return false;
+ }
+ unsigned v = (unsigned)intvalue;
+ for(unsigned i = 1; i <= 8192; i += i) {
+ if (i == v)
+ return true;
+ }
+ errorf(HERE, "alignment must be power of two");
+ return false;
+}
+
+#define DET_MOD(name, tag) do { \
+ if(*modifiers & tag) warningf(HERE, #name " used more than once"); \
+ *modifiers |= tag; \
+} while(0)
+
+static void parse_microsoft_extended_decl_modifier(declaration_specifiers_t *specifiers)
+{
+ symbol_t *symbol;
+ decl_modifiers_t *modifiers = &specifiers->decl_modifiers;
+
+ while(token.type == T_IDENTIFIER) {
+ symbol = token.v.symbol;
+ if(symbol == sym_align) {
+ next_token();
+ expect('(');
+ if(token.type != T_INTEGER)
+ goto end_error;
+ if(check_elignment_value(token.v.intvalue)) {
+ if(specifiers->alignment != 0)
+ warningf(HERE, "align used more than once");
+ specifiers->alignment = (unsigned char)token.v.intvalue;
+ }
+ next_token();
+ expect(')');
+ } else if(symbol == sym_allocate) {
+ next_token();
+ expect('(');
+ if(token.type != T_IDENTIFIER)
+ goto end_error;
+ (void)token.v.symbol;
+ expect(')');
+ } else if(symbol == sym_dllimport) {
+ next_token();
+ DET_MOD(dllimport, DM_DLLIMPORT);
+ } else if(symbol == sym_dllexport) {
+ next_token();
+ DET_MOD(dllexport, DM_DLLEXPORT);
+ } else if(symbol == sym_thread) {
+ next_token();
+ DET_MOD(thread, DM_THREAD);
+ } else if(symbol == sym_naked) {
+ next_token();
+ DET_MOD(naked, DM_NAKED);
+ } else if(symbol == sym_noinline) {
+ next_token();
+ DET_MOD(noinline, DM_NOINLINE);
+ } else if(symbol == sym_noreturn) {
+ next_token();
+ DET_MOD(noreturn, DM_NORETURN);
+ } else if(symbol == sym_nothrow) {
+ next_token();
+ DET_MOD(nothrow, DM_NOTHROW);
+ } else if(symbol == sym_novtable) {
+ next_token();
+ DET_MOD(novtable, DM_NOVTABLE);
+ } else if(symbol == sym_property) {
+ next_token();
+ expect('(');
+ for(;;) {
+ bool is_get = false;
+ if(token.type != T_IDENTIFIER)
+ goto end_error;
+ if(token.v.symbol == sym_get) {
+ is_get = true;
+ } else if(token.v.symbol == sym_put) {
+ } else {
+ errorf(HERE, "Bad property name '%Y'", token.v.symbol);
+ goto end_error;
+ }
+ next_token();
+ expect('=');
+ if(token.type != T_IDENTIFIER)
+ goto end_error;
+ if(is_get) {
+ if(specifiers->get_property_sym != NULL) {
+ errorf(HERE, "get property name already specified");
+ } else {
+ specifiers->get_property_sym = token.v.symbol;
+ }
+ } else {
+ if(specifiers->put_property_sym != NULL) {
+ errorf(HERE, "put property name already specified");
+ } else {
+ specifiers->put_property_sym = token.v.symbol;
+ }
+ }
+ next_token();
+ if(token.type == ',') {
+ next_token();
+ continue;
+ }
+ break;
+ }
+ expect(')');
+ } else if(symbol == sym_selectany) {
+ next_token();
+ DET_MOD(selectany, DM_SELECTANY);
+ } else if(symbol == sym_uuid) {
+ next_token();
+ expect('(');
+ if(token.type != T_STRING_LITERAL)
+ goto end_error;
+ next_token();
+ expect(')');
+ } else if(symbol == sym_deprecated) {
+ next_token();
+ DET_MOD(deprecated, DM_DEPRECATED);
+ if(token.type == '(') {
+ next_token();
+ if(token.type == T_STRING_LITERAL) {
+ specifiers->deprecated_string = token.v.string.begin;
+ next_token();
+ } else {
+ errorf(HERE, "string literal expected");
+ }
+ expect(')');
+ }
+ } else {
+ warningf(HERE, "Unknown modifier %Y ignored", token.v.symbol);
+ next_token();
+ if(token.type == '(')
+ skip_until(')');
+ }
+ if (token.type == ',')
+ next_token();
+ }
+end_error:
+ return;
+}
+
static void parse_declaration_specifiers(declaration_specifiers_t *specifiers)
{
type_t *type = NULL;
switch(token.type) {
/* storage class */
-#define MATCH_STORAGE_CLASS(token, class) \
- case token: \
- if(specifiers->storage_class != STORAGE_CLASS_NONE) { \
+#define MATCH_STORAGE_CLASS(token, class) \
+ case token: \
+ if(specifiers->declared_storage_class != STORAGE_CLASS_NONE) { \
errorf(HERE, "multiple storage classes in declaration specifiers"); \
- } \
- specifiers->storage_class = class; \
- next_token(); \
+ } \
+ specifiers->declared_storage_class = class; \
+ next_token(); \
break;
MATCH_STORAGE_CLASS(T_typedef, STORAGE_CLASS_TYPEDEF)
MATCH_STORAGE_CLASS(T_auto, STORAGE_CLASS_AUTO)
MATCH_STORAGE_CLASS(T_register, STORAGE_CLASS_REGISTER)
+ case T_declspec:
+ next_token();
+ expect('(');
+ parse_microsoft_extended_decl_modifier(specifiers);
+ expect(')');
+ break;
+
case T___thread:
- switch (specifiers->storage_class) {
- case STORAGE_CLASS_NONE:
- specifiers->storage_class = STORAGE_CLASS_THREAD;
- break;
+ switch (specifiers->declared_storage_class) {
+ case STORAGE_CLASS_NONE:
+ specifiers->declared_storage_class = STORAGE_CLASS_THREAD;
+ break;
- case STORAGE_CLASS_EXTERN:
- specifiers->storage_class = STORAGE_CLASS_THREAD_EXTERN;
- break;
+ case STORAGE_CLASS_EXTERN:
+ specifiers->declared_storage_class = STORAGE_CLASS_THREAD_EXTERN;
+ break;
- case STORAGE_CLASS_STATIC:
- specifiers->storage_class = STORAGE_CLASS_THREAD_STATIC;
- break;
+ case STORAGE_CLASS_STATIC:
+ specifiers->declared_storage_class = STORAGE_CLASS_THREAD_STATIC;
+ break;
- default:
- errorf(HERE, "multiple storage classes in declaration specifiers");
- break;
+ default:
+ errorf(HERE, "multiple storage classes in declaration specifiers");
+ break;
}
next_token();
break;
}
break;
- /* TODO: if is_type_valid(type) for the following rules should issue
- * an error */
case T_struct: {
- type = allocate_type_zero(TYPE_COMPOUND_STRUCT);
+ type = allocate_type_zero(TYPE_COMPOUND_STRUCT, HERE);
type->compound.declaration = parse_compound_type_specifier(true);
break;
}
case T_union: {
- type = allocate_type_zero(TYPE_COMPOUND_STRUCT);
+ type = allocate_type_zero(TYPE_COMPOUND_UNION, HERE);
type->compound.declaration = parse_compound_type_specifier(false);
break;
break;
case T___attribute__:
- /* TODO */
parse_attributes();
break;
case T_IDENTIFIER: {
+ /* only parse identifier if we haven't found a type yet */
+ if(type != NULL || type_specifiers != 0)
+ goto finish_specifiers;
+
type_t *typedef_type = get_typedef_type(token.v.symbol);
if(typedef_type == NULL)
atomic_type = ATOMIC_TYPE_INVALID;
}
- type = allocate_type_zero(TYPE_ATOMIC);
+ type = allocate_type_zero(TYPE_ATOMIC, builtin_source_position);
type->atomic.akind = atomic_type;
newtype = 1;
} else {
}
specifiers->type = result;
+end_error:
+ return;
}
static type_qualifiers_t parse_type_qualifiers(void)
declaration_t *last_declaration = NULL;
do {
declaration_t *const declaration = allocate_declaration_zero();
+ declaration->type = NULL; /* a K&R parameter list has no types, yet */
declaration->source_position = token.source_position;
declaration->symbol = token.v.symbol;
next_token();
{
/* TODO: improve error messages */
- if(declaration->storage_class == STORAGE_CLASS_TYPEDEF) {
+ if(declaration->declared_storage_class == STORAGE_CLASS_TYPEDEF) {
errorf(HERE, "typedef not allowed in parameter list");
- } else if(declaration->storage_class != STORAGE_CLASS_NONE
- && declaration->storage_class != STORAGE_CLASS_REGISTER) {
+ } else if(declaration->declared_storage_class != STORAGE_CLASS_NONE
+ && declaration->declared_storage_class != STORAGE_CLASS_REGISTER) {
errorf(HERE, "parameter may only have none or register storage class");
}
}
if(is_type_incomplete(type)) {
- errorf(HERE, "incomplete type ('%T') not allowed for parameter '%Y'",
+ errorf(HERE, "incomplete type '%T' not allowed for parameter '%Y'",
orig_type, declaration->symbol);
}
}
CONSTRUCT_POINTER,
CONSTRUCT_FUNCTION,
CONSTRUCT_ARRAY
-} construct_type_type_t;
+} construct_type_kind_t;
typedef struct construct_type_t construct_type_t;
struct construct_type_t {
- construct_type_type_t type;
+ construct_type_kind_t kind;
construct_type_t *next;
};
parsed_pointer_t *pointer = obstack_alloc(&temp_obst, sizeof(pointer[0]));
memset(pointer, 0, sizeof(pointer[0]));
- pointer->construct_type.type = CONSTRUCT_POINTER;
+ pointer->construct_type.kind = CONSTRUCT_POINTER;
pointer->type_qualifiers = parse_type_qualifiers();
return (construct_type_t*) pointer;
parsed_array_t *array = obstack_alloc(&temp_obst, sizeof(array[0]));
memset(array, 0, sizeof(array[0]));
- array->construct_type.type = CONSTRUCT_ARRAY;
+ array->construct_type.kind = CONSTRUCT_ARRAY;
if(token.type == T_static) {
array->is_static = true;
expect(']');
return (construct_type_t*) array;
+end_error:
+ return NULL;
}
static construct_type_t *parse_function_declarator(declaration_t *declaration)
{
eat('(');
- type_t *type = allocate_type_zero(TYPE_FUNCTION);
+ type_t *type;
+ if(declaration != NULL) {
+ type = allocate_type_zero(TYPE_FUNCTION, declaration->source_position);
+ } else {
+ type = allocate_type_zero(TYPE_FUNCTION, token.source_position);
+ }
declaration_t *parameters = parse_parameters(&type->function);
if(declaration != NULL) {
construct_function_type_t *construct_function_type =
obstack_alloc(&temp_obst, sizeof(construct_function_type[0]));
memset(construct_function_type, 0, sizeof(construct_function_type[0]));
- construct_function_type->construct_type.type = CONSTRUCT_FUNCTION;
+ construct_function_type->construct_type.kind = CONSTRUCT_FUNCTION;
construct_function_type->function_type = type;
expect(')');
+end_error:
return (construct_type_t*) construct_function_type;
}
}
return first;
+end_error:
+ return NULL;
}
static type_t *construct_declarator_type(construct_type_t *construct_list,
{
construct_type_t *iter = construct_list;
for( ; iter != NULL; iter = iter->next) {
- switch(iter->type) {
+ switch(iter->kind) {
case CONSTRUCT_INVALID:
panic("invalid type construction found");
case CONSTRUCT_FUNCTION: {
case CONSTRUCT_POINTER: {
parsed_pointer_t *parsed_pointer = (parsed_pointer_t*) iter;
- type_t *pointer_type = allocate_type_zero(TYPE_POINTER);
+ type_t *pointer_type = allocate_type_zero(TYPE_POINTER, (source_position_t){NULL, 0});
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);
+ type_t *array_type = allocate_type_zero(TYPE_ARRAY, (source_position_t){NULL, 0});
- array_type->base.qualifiers = parsed_array->type_qualifiers;
- array_type->array.element_type = type;
- array_type->array.is_static = parsed_array->is_static;
- array_type->array.is_variable = parsed_array->is_variable;
- array_type->array.size = parsed_array->size;
+ expression_t *size_expression = parsed_array->size;
+ if(size_expression != NULL) {
+ size_expression
+ = create_implicit_cast(size_expression, type_size_t);
+ }
+
+ array_type->base.qualifiers = parsed_array->type_qualifiers;
+ array_type->array.element_type = type;
+ array_type->array.is_static = parsed_array->is_static;
+ array_type->array.is_variable = parsed_array->is_variable;
+ array_type->array.size_expression = size_expression;
+
+ if(size_expression != NULL) {
+ if(is_constant_expression(size_expression)) {
+ array_type->array.size_constant = true;
+ array_type->array.size
+ = fold_constant(size_expression);
+ } else {
+ array_type->array.is_vla = true;
+ }
+ }
type_t *skipped_type = skip_typeref(type);
if (is_type_atomic(skipped_type, ATOMIC_TYPE_VOID)) {
if(hashed_type != type) {
/* the function type was constructed earlier freeing it here will
* destroy other types... */
- if(iter->type != CONSTRUCT_FUNCTION) {
+ if(iter->kind != CONSTRUCT_FUNCTION) {
free_type(type);
}
type = hashed_type;
static declaration_t *parse_declarator(
const declaration_specifiers_t *specifiers, bool may_be_abstract)
{
- declaration_t *const declaration = allocate_declaration_zero();
- declaration->storage_class = specifiers->storage_class;
- declaration->modifiers = specifiers->decl_modifiers;
- declaration->is_inline = specifiers->is_inline;
+ declaration_t *const declaration = allocate_declaration_zero();
+ declaration->declared_storage_class = specifiers->declared_storage_class;
+ declaration->modifiers = specifiers->decl_modifiers;
+ declaration->deprecated_string = specifiers->deprecated_string;
+ declaration->get_property_sym = specifiers->get_property_sym;
+ declaration->put_property_sym = specifiers->put_property_sym;
+ declaration->is_inline = specifiers->is_inline;
+
+ declaration->storage_class = specifiers->declared_storage_class;
+ if(declaration->storage_class == STORAGE_CLASS_NONE
+ && scope != global_scope) {
+ declaration->storage_class = STORAGE_CLASS_AUTO;
+ }
+
+ if(specifiers->alignment != 0) {
+ /* TODO: add checks here */
+ declaration->alignment = specifiers->alignment;
+ }
construct_type_t *construct_type
= parse_inner_declarator(declaration, may_be_abstract);
const symbol_t *const symbol = declaration->symbol;
const namespace_t namespc = (namespace_t)declaration->namespc;
- type_t *const orig_type = declaration->type;
- const type_t *const type = skip_typeref(orig_type);
+ 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) {
check_type_of_main(declaration, &type->function);
}
- declaration_t *const previous_declaration = get_declaration(symbol, namespc);
+ 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) {
previous_declaration->type = declaration->type;
}
- const type_t *const prev_type = skip_typeref(previous_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 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 "
+ "previous declaration '%#T'",
+ orig_type, symbol, previous_declaration->type, symbol);
+ errorf(previous_declaration->source_position,
+ "previous declaration of '%Y' was here", symbol);
} 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);
+ return previous_declaration;
+ }
+
unsigned new_storage_class = declaration->storage_class;
- /* pretend no storage class means extern for function declarations
- * (except if the previous declaration is neither none nor extern) */
+ if(is_type_incomplete(prev_type)) {
+ 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:
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);
+ 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;
new_storage_class == STORAGE_CLASS_EXTERN) {
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);
+ warningf(declaration->source_position,
+ "redundant declaration for '%Y'", symbol);
+ warningf(previous_declaration->source_position,
+ "previous declaration of '%Y' was here",
+ symbol);
}
} 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);
+ 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);
} 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'", symbol);
+ errorf(declaration->source_position,
+ "redeclaration of '%Y'", symbol);
} else {
- errorf(declaration->source_position, "redeclaration of '%Y' with different linkage", symbol);
+ errorf(declaration->source_position,
+ "redeclaration of '%Y' with different linkage",
+ symbol);
}
- errorf(previous_declaration->source_position, "previous declaration of '%Y' was here", symbol);
+ errorf(previous_declaration->source_position,
+ "previous declaration of '%Y' was here", symbol);
}
}
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, "no previous prototype for '%#T'", orig_type, symbol);
+ 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, "no previous declaration for '%#T'", orig_type, symbol);
+ warningf(declaration->source_position,
+ "no previous declaration for '%#T'", orig_type,
+ symbol);
}
}
} else if (warning.missing_declarations &&
declaration->storage_class == STORAGE_CLASS_NONE ||
declaration->storage_class == STORAGE_CLASS_THREAD
)) {
- warningf(declaration->source_position, "no previous declaration for '%#T'", orig_type, symbol);
+ warningf(declaration->source_position,
+ "no previous declaration for '%#T'", orig_type, symbol);
}
assert(declaration->parent_scope == NULL);
- assert(declaration->symbol != NULL);
assert(scope != NULL);
declaration->parent_scope = scope;
eat('=');
type_t *orig_type = declaration->type;
- type_t *type = type = skip_typeref(orig_type);
+ type_t *type = skip_typeref(orig_type);
if(declaration->init.initializer != NULL) {
parser_error_multiple_definition(declaration, token.source_position);
}
- initializer_t *initializer = parse_initializer(type);
-
- /* § 6.7.5 (22) array initializers for arrays with unknown size determine
- * the array type size */
- if(is_type_array(type) && initializer != NULL) {
- array_type_t *array_type = &type->array;
-
- if(array_type->size == NULL) {
- expression_t *cnst = allocate_expression_zero(EXPR_CONST);
-
- cnst->base.datatype = type_size_t;
-
- switch (initializer->kind) {
- case INITIALIZER_LIST: {
- cnst->conste.v.int_value = initializer->list.len;
- break;
- }
-
- case INITIALIZER_STRING: {
- cnst->conste.v.int_value = initializer->string.string.size;
- break;
- }
+ bool must_be_constant = false;
+ if(declaration->storage_class == STORAGE_CLASS_STATIC
+ || declaration->storage_class == STORAGE_CLASS_THREAD_STATIC
+ || declaration->parent_scope == global_scope) {
+ must_be_constant = true;
+ }
- case INITIALIZER_WIDE_STRING: {
- cnst->conste.v.int_value = initializer->wide_string.string.size;
- break;
- }
+ parse_initializer_env_t env;
+ env.type = orig_type;
+ env.must_be_constant = must_be_constant;
+ env.declaration = declaration;
- default:
- panic("invalid initializer type");
- }
+ initializer_t *initializer = parse_initializer(&env);
- array_type->size = cnst;
- }
+ if(env.type != orig_type) {
+ orig_type = env.type;
+ type = skip_typeref(orig_type);
+ declaration->type = env.type;
}
if(is_type_function(type)) {
{
eat(';');
- declaration_t *const declaration = allocate_declaration_zero();
- declaration->type = specifiers->type;
- declaration->storage_class = specifiers->storage_class;
- declaration->source_position = specifiers->source_position;
+ declaration_t *const declaration = allocate_declaration_zero();
+ declaration->type = specifiers->type;
+ declaration->declared_storage_class = specifiers->declared_storage_class;
+ declaration->source_position = specifiers->source_position;
+ declaration->modifiers = specifiers->decl_modifiers;
- if (declaration->storage_class != STORAGE_CLASS_NONE) {
+ if (declaration->declared_storage_class != STORAGE_CLASS_NONE) {
warningf(declaration->source_position, "useless storage class in empty declaration");
}
+ declaration->storage_class = STORAGE_CLASS_NONE;
type_t *type = declaration->type;
switch (type->kind) {
ndeclaration = parse_declarator(specifiers, /*may_be_abstract=*/false);
}
- expect_void(';');
+ expect(';');
+
+end_error:
+ ;
}
static declaration_t *finished_kr_declaration(declaration_t *declaration)
}
if(previous_declaration->type == NULL) {
- previous_declaration->type = declaration->type;
- previous_declaration->storage_class = declaration->storage_class;
- previous_declaration->parent_scope = scope;
+ previous_declaration->type = declaration->type;
+ previous_declaration->declared_storage_class = declaration->declared_storage_class;
+ previous_declaration->storage_class = declaration->storage_class;
+ previous_declaration->parent_scope = scope;
return previous_declaration;
} else {
return record_declaration(declaration);
parse_declaration_specifiers(&specifiers);
if(token.type == ';') {
- parse_anonymous_declaration_rest(&specifiers, finished_declaration);
+ parse_anonymous_declaration_rest(&specifiers, append_declaration);
} else {
declaration_t *declaration = parse_declarator(&specifiers, /*may_be_abstract=*/false);
parse_declaration_rest(declaration, &specifiers, finished_declaration);
label->used = true;
if (label->source_position.input_name == NULL) {
print_in_function();
- errorf(goto_statement->statement.source_position,
- "label '%Y' used but not defined", label->symbol);
+ errorf(goto_statement->base.source_position,
+ "label '%Y' used but not defined", label->symbol);
}
}
goto_first = goto_last = NULL;
if (! label->used) {
print_in_function();
- warningf(label_statement->statement.source_position,
+ warningf(label_statement->base.source_position,
"label '%Y' defined but not used", label->symbol);
}
}
environment_pop_to(top);
}
-static type_t *make_bitfield_type(type_t *base, expression_t *size)
+static type_t *make_bitfield_type(type_t *base, expression_t *size,
+ source_position_t source_position)
{
- type_t *type = allocate_type_zero(TYPE_BITFIELD);
+ type_t *type = allocate_type_zero(TYPE_BITFIELD, source_position);
type->bitfield.base = base;
type->bitfield.size = size;
return type;
}
-static void parse_struct_declarators(const declaration_specifiers_t *specifiers)
+static declaration_t *find_compound_entry(declaration_t *compound_declaration,
+ symbol_t *symbol)
{
- /* TODO: check constraints for struct declarations (in specifiers) */
+ declaration_t *iter = compound_declaration->scope.declarations;
+ for( ; iter != NULL; iter = iter->next) {
+ if(iter->namespc != NAMESPACE_NORMAL)
+ continue;
+
+ if(iter->symbol == NULL) {
+ type_t *type = skip_typeref(iter->type);
+ if(is_type_compound(type)) {
+ declaration_t *result
+ = find_compound_entry(type->compound.declaration, symbol);
+ if(result != NULL)
+ return result;
+ }
+ continue;
+ }
+
+ if(iter->symbol == symbol) {
+ return iter;
+ }
+ }
+
+ return NULL;
+}
+
+static void parse_compound_declarators(declaration_t *struct_declaration,
+ const declaration_specifiers_t *specifiers)
+{
+ declaration_t *last_declaration = struct_declaration->scope.declarations;
+ if(last_declaration != NULL) {
+ while(last_declaration->next != NULL) {
+ last_declaration = last_declaration->next;
+ }
+ }
+
while(1) {
declaration_t *declaration;
if(token.type == ':') {
+ source_position_t source_position = HERE;
next_token();
type_t *base_type = specifiers->type;
expression_t *size = parse_constant_expression();
- type_t *type = make_bitfield_type(base_type, size);
+ if(!is_type_integer(skip_typeref(base_type))) {
+ errorf(HERE, "bitfield base type '%T' is not an integer type",
+ base_type);
+ }
- declaration = allocate_declaration_zero();
- declaration->namespc = NAMESPACE_NORMAL;
- declaration->storage_class = STORAGE_CLASS_NONE;
- declaration->source_position = token.source_position;
- declaration->modifiers = specifiers->decl_modifiers;
- declaration->type = type;
+ 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->type = type;
} else {
declaration = parse_declarator(specifiers,/*may_be_abstract=*/true);
+ type_t *orig_type = declaration->type;
+ type_t *type = skip_typeref(orig_type);
+
if(token.type == ':') {
+ source_position_t source_position = HERE;
next_token();
expression_t *size = parse_constant_expression();
- type_t *type = make_bitfield_type(declaration->type, size);
- declaration->type = type;
+ if(!is_type_integer(type)) {
+ errorf(HERE, "bitfield base type '%T' is not an "
+ "integer type", orig_type);
+ }
+
+ 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
+ * that they're at the end of the struct */
+ if(is_type_incomplete(type) && !is_type_array(type)) {
+ errorf(HERE,
+ "compound member '%Y' has incomplete type '%T'",
+ declaration->symbol, orig_type);
+ } else if(is_type_function(type)) {
+ errorf(HERE, "compound member '%Y' must not have function "
+ "type '%T'", declaration->symbol, orig_type);
+ }
}
}
- record_declaration(declaration);
+
+ /* make sure we don't define a symbol multiple times */
+ symbol_t *symbol = declaration->symbol;
+ if(symbol != NULL) {
+ declaration_t *prev_decl
+ = find_compound_entry(struct_declaration, symbol);
+
+ 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);
+ }
+ }
+
+ /* append declaration */
+ if(last_declaration != NULL) {
+ last_declaration->next = declaration;
+ } else {
+ struct_declaration->scope.declarations = declaration;
+ }
+ last_declaration = declaration;
if(token.type != ',')
break;
next_token();
}
- expect_void(';');
+ expect(';');
+
+end_error:
+ ;
}
-static void parse_compound_type_entries(void)
+static void parse_compound_type_entries(declaration_t *compound_declaration)
{
eat('{');
memset(&specifiers, 0, sizeof(specifiers));
parse_declaration_specifiers(&specifiers);
- parse_struct_declarators(&specifiers);
+ parse_compound_declarators(compound_declaration, &specifiers);
}
if(token.type == T_EOF) {
errorf(HERE, "EOF while parsing struct");
declaration_specifiers_t specifiers;
memset(&specifiers, 0, sizeof(specifiers));
parse_declaration_specifiers(&specifiers);
- if(specifiers.storage_class != STORAGE_CLASS_NONE) {
+ if(specifiers.declared_storage_class != STORAGE_CLASS_NONE) {
/* TODO: improve error message, user does probably not know what a
* storage class is...
*/
}
next_token();
- return create_invalid_expression();
+ return create_invalid_expression();
+}
+
+/**
+ * Parse a string constant.
+ */
+static expression_t *parse_string_const(void)
+{
+ wide_string_t wres;
+ if (token.type == T_STRING_LITERAL) {
+ string_t res = token.v.string;
+ next_token();
+ while (token.type == T_STRING_LITERAL) {
+ res = concat_strings(&res, &token.v.string);
+ next_token();
+ }
+ if (token.type != T_WIDE_STRING_LITERAL) {
+ expression_t *const cnst = allocate_expression_zero(EXPR_STRING_LITERAL);
+ /* note: that we use type_char_ptr here, which is already the
+ * automatic converted type. revert_automatic_type_conversion
+ * will construct the array type */
+ cnst->base.type = type_char_ptr;
+ cnst->string.value = res;
+ return cnst;
+ }
+
+ wres = concat_string_wide_string(&res, &token.v.wide_string);
+ } else {
+ wres = token.v.wide_string;
+ }
+ next_token();
+
+ for (;;) {
+ switch (token.type) {
+ case T_WIDE_STRING_LITERAL:
+ wres = concat_wide_strings(&wres, &token.v.wide_string);
+ break;
+
+ case T_STRING_LITERAL:
+ wres = concat_wide_string_string(&wres, &token.v.string);
+ break;
+
+ default: {
+ expression_t *const cnst = allocate_expression_zero(EXPR_WIDE_STRING_LITERAL);
+ cnst->base.type = type_wchar_t_ptr;
+ cnst->wide_string.value = wres;
+ return cnst;
+ }
+ }
+ next_token();
+ }
}
/**
- * Parse a string constant.
+ * Parse an integer constant.
*/
-static expression_t *parse_string_const(void)
+static expression_t *parse_int_const(void)
{
- expression_t *cnst = allocate_expression_zero(EXPR_STRING_LITERAL);
- cnst->base.datatype = type_string;
- cnst->string.value = parse_string_literals();
+ expression_t *cnst = allocate_expression_zero(EXPR_CONST);
+ cnst->base.source_position = HERE;
+ cnst->base.type = token.datatype;
+ cnst->conste.v.int_value = token.v.intvalue;
+
+ next_token();
return cnst;
}
/**
- * Parse a wide string constant.
+ * Parse a character constant.
*/
-static expression_t *parse_wide_string_const(void)
+static expression_t *parse_character_constant(void)
{
- expression_t *const cnst = allocate_expression_zero(EXPR_WIDE_STRING_LITERAL);
- cnst->base.datatype = type_wchar_t_ptr;
- cnst->wide_string.value = token.v.wide_string; /* TODO concatenate */
+ expression_t *cnst = allocate_expression_zero(EXPR_CHARACTER_CONSTANT);
+
+ cnst->base.source_position = HERE;
+ cnst->base.type = token.datatype;
+ cnst->conste.v.character = token.v.string;
+
+ if (cnst->conste.v.character.size != 1) {
+ if (warning.multichar && (c_mode & _GNUC)) {
+ /* TODO */
+ warningf(HERE, "multi-character character constant");
+ } else {
+ errorf(HERE, "more than 1 characters in character constant");
+ }
+ }
next_token();
+
return cnst;
}
/**
- * Parse an integer constant.
+ * Parse a wide character constant.
*/
-static expression_t *parse_int_const(void)
+static expression_t *parse_wide_character_constant(void)
{
- expression_t *cnst = allocate_expression_zero(EXPR_CONST);
- cnst->base.datatype = token.datatype;
- cnst->conste.v.int_value = token.v.intvalue;
+ expression_t *cnst = allocate_expression_zero(EXPR_WIDE_CHARACTER_CONSTANT);
+
+ cnst->base.source_position = HERE;
+ cnst->base.type = token.datatype;
+ cnst->conste.v.wide_character = token.v.wide_string;
+ if (cnst->conste.v.wide_character.size != 1) {
+ if (warning.multichar && (c_mode & _GNUC)) {
+ /* TODO */
+ warningf(HERE, "multi-character character constant");
+ } else {
+ errorf(HERE, "more than 1 characters in character constant");
+ }
+ }
next_token();
return cnst;
static expression_t *parse_float_const(void)
{
expression_t *cnst = allocate_expression_zero(EXPR_CONST);
- cnst->base.datatype = token.datatype;
+ cnst->base.type = token.datatype;
cnst->conste.v.float_value = token.v.floatvalue;
next_token();
static declaration_t *create_implicit_function(symbol_t *symbol,
const source_position_t source_position)
{
- type_t *ntype = allocate_type_zero(TYPE_FUNCTION);
+ type_t *ntype = allocate_type_zero(TYPE_FUNCTION, source_position);
ntype->function.return_type = type_int;
ntype->function.unspecified_parameters = true;
free_type(ntype);
}
- declaration_t *const declaration = allocate_declaration_zero();
- declaration->storage_class = STORAGE_CLASS_EXTERN;
- declaration->type = type;
- declaration->symbol = symbol;
- declaration->source_position = source_position;
- declaration->parent_scope = global_scope;
+ declaration_t *const declaration = allocate_declaration_zero();
+ declaration->storage_class = STORAGE_CLASS_EXTERN;
+ declaration->declared_storage_class = STORAGE_CLASS_EXTERN;
+ declaration->type = type;
+ declaration->symbol = symbol;
+ declaration->source_position = source_position;
+ declaration->parent_scope = global_scope;
scope_t *old_scope = scope;
set_scope(global_scope);
memset(parameter, 0, sizeof(parameter[0]));
parameter->type = argument_type;
- type_t *type = allocate_type_zero(TYPE_FUNCTION);
+ type_t *type = allocate_type_zero(TYPE_FUNCTION, builtin_source_position);
type->function.return_type = return_type;
type->function.parameters = parameter;
case T___builtin_alloca:
return make_function_1_type(type_void_ptr, type_size_t);
case T___builtin_nan:
- return make_function_1_type(type_double, type_string);
+ return make_function_1_type(type_double, type_char_ptr);
case T___builtin_nanf:
- return make_function_1_type(type_float, type_string);
+ return make_function_1_type(type_float, type_char_ptr);
case T___builtin_nand:
- return make_function_1_type(type_long_double, type_string);
+ 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);
default:
case EXPR_UNARY_DEREFERENCE: {
const expression_t *const value = expression->unary.value;
- type_t *const type = skip_typeref(value->base.datatype);
+ type_t *const type = skip_typeref(value->base.type);
assert(is_type_pointer(type));
return type->pointer.points_to;
}
return get_builtin_symbol_type(expression->builtin_symbol.symbol);
case EXPR_ARRAY_ACCESS: {
- const expression_t *const array_ref = expression->array_access.array_ref;
- type_t *const type_left = skip_typeref(array_ref->base.datatype);
+ const expression_t *array_ref = expression->array_access.array_ref;
+ type_t *type_left = skip_typeref(array_ref->base.type);
if (!is_type_valid(type_left))
return type_left;
assert(is_type_pointer(type_left));
return type_left->pointer.points_to;
}
+ case EXPR_STRING_LITERAL: {
+ size_t size = expression->string.value.size;
+ return make_array_type(type_char, size, TYPE_QUALIFIER_NONE);
+ }
+
+ case EXPR_WIDE_STRING_LITERAL: {
+ size_t size = expression->wide_string.value.size;
+ return make_array_type(type_wchar_t, size, TYPE_QUALIFIER_NONE);
+ }
+
+ case EXPR_COMPOUND_LITERAL:
+ return expression->compound_literal.type;
+
default: break;
}
- return expression->base.datatype;
+ return expression->base.type;
}
static expression_t *parse_reference(void)
source_position);
} else {
errorf(HERE, "unknown symbol '%Y' found.", ref->symbol);
- return expression;
+ return create_invalid_expression();
}
}
* code to revert this! */
type = automatic_type_conversion(type);
- ref->declaration = declaration;
- ref->expression.datatype = type;
+ ref->declaration = declaration;
+ ref->base.type = type;
/* this declaration is used */
declaration->used = true;
/* TODO check if explicit cast is allowed and issue warnings/errors */
}
-static expression_t *parse_cast(void)
+static expression_t *parse_compound_literal(type_t *type)
{
- expression_t *cast = allocate_expression_zero(EXPR_UNARY_CAST);
+ expression_t *expression = allocate_expression_zero(EXPR_COMPOUND_LITERAL);
+
+ parse_initializer_env_t env;
+ env.type = type;
+ env.declaration = NULL;
+ env.must_be_constant = false;
+ initializer_t *initializer = parse_initializer(&env);
+ type = env.type;
+
+ expression->compound_literal.initializer = initializer;
+ expression->compound_literal.type = type;
+ expression->base.type = automatic_type_conversion(type);
- cast->base.source_position = token.source_position;
+ return expression;
+}
+
+/**
+ * Parse a cast expression.
+ */
+static expression_t *parse_cast(void)
+{
+ source_position_t source_position = token.source_position;
type_t *type = parse_typename();
expect(')');
+
+ if(token.type == '{') {
+ return parse_compound_literal(type);
+ }
+
+ expression_t *cast = allocate_expression_zero(EXPR_UNARY_CAST);
+ cast->base.source_position = source_position;
+
expression_t *value = parse_sub_expression(20);
check_cast_allowed(value, type);
- cast->base.datatype = type;
- cast->unary.value = value;
+ cast->base.type = type;
+ cast->unary.value = value;
return cast;
+end_error:
+ return create_invalid_expression();
}
+/**
+ * Parse a statement expression.
+ */
static expression_t *parse_statement_expression(void)
{
expression_t *expression = allocate_expression_zero(EXPR_STATEMENT);
stmt = stmt->base.next;
if (stmt->kind == STATEMENT_EXPRESSION) {
- type = stmt->expression.expression->base.datatype;
+ type = stmt->expression.expression->base.type;
}
} else {
warningf(expression->base.source_position, "empty statement expression ({})");
}
- expression->base.datatype = type;
+ expression->base.type = type;
expect(')');
return expression;
+end_error:
+ return create_invalid_expression();
}
+/**
+ * Parse a braced expression.
+ */
static expression_t *parse_brace_expression(void)
{
eat('(');
expect(')');
return result;
+end_error:
+ return create_invalid_expression();
}
static expression_t *parse_function_keyword(void)
errorf(HERE, "'__func__' used outside of a function");
}
- string_literal_expression_t *expression
- = allocate_ast_zero(sizeof(expression[0]));
-
- expression->expression.kind = EXPR_FUNCTION;
- expression->expression.datatype = type_string;
+ expression_t *expression = allocate_expression_zero(EXPR_FUNCTION);
+ expression->base.type = type_char_ptr;
- return (expression_t*) expression;
+ return expression;
}
static expression_t *parse_pretty_function_keyword(void)
errorf(HERE, "'__PRETTY_FUNCTION__' used outside of a function");
}
- string_literal_expression_t *expression
- = allocate_ast_zero(sizeof(expression[0]));
-
- expression->expression.kind = EXPR_PRETTY_FUNCTION;
- expression->expression.datatype = type_string;
+ expression_t *expression = allocate_expression_zero(EXPR_PRETTY_FUNCTION);
+ expression->base.type = type_char_ptr;
- return (expression_t*) expression;
+ return expression;
}
static designator_t *parse_designator(void)
{
- designator_t *result = allocate_ast_zero(sizeof(result[0]));
+ designator_t *result = allocate_ast_zero(sizeof(result[0]));
+ result->source_position = HERE;
if(token.type != T_IDENTIFIER) {
parse_error_expected("while parsing member designator",
eat_paren();
return NULL;
}
- designator_t *designator = allocate_ast_zero(sizeof(result[0]));
- designator->symbol = token.v.symbol;
+ designator_t *designator = allocate_ast_zero(sizeof(result[0]));
+ designator->source_position = HERE;
+ designator->symbol = token.v.symbol;
next_token();
last_designator->next = designator;
}
if(token.type == '[') {
next_token();
- designator_t *designator = allocate_ast_zero(sizeof(result[0]));
- designator->array_access = parse_expression();
- if(designator->array_access == NULL) {
+ designator_t *designator = allocate_ast_zero(sizeof(result[0]));
+ designator->source_position = HERE;
+ designator->array_index = parse_expression();
+ if(designator->array_index == NULL) {
eat_paren();
return NULL;
}
}
return result;
+end_error:
+ return NULL;
}
+/**
+ * Parse the __builtin_offsetof() expression.
+ */
static expression_t *parse_offsetof(void)
{
eat(T___builtin_offsetof);
- expression_t *expression = allocate_expression_zero(EXPR_OFFSETOF);
- expression->base.datatype = type_size_t;
+ expression_t *expression = allocate_expression_zero(EXPR_OFFSETOF);
+ expression->base.type = type_size_t;
expect('(');
- expression->offsetofe.type = parse_typename();
+ type_t *type = parse_typename();
expect(',');
- expression->offsetofe.designator = parse_designator();
+ designator_t *designator = parse_designator();
expect(')');
+ expression->offsetofe.type = type;
+ expression->offsetofe.designator = designator;
+
+ type_path_t path;
+ memset(&path, 0, sizeof(path));
+ path.top_type = type;
+ path.path = NEW_ARR_F(type_path_entry_t, 0);
+
+ descend_into_subtype(&path);
+
+ if(!walk_designator(&path, designator, true)) {
+ return create_invalid_expression();
+ }
+
+ DEL_ARR_F(path.path);
+
return expression;
+end_error:
+ return create_invalid_expression();
}
+/**
+ * Parses a _builtin_va_start() expression.
+ */
static expression_t *parse_va_start(void)
{
eat(T___builtin_va_start);
expression_t *const expr = parse_assignment_expression();
if (expr->kind == EXPR_REFERENCE) {
declaration_t *const decl = expr->reference.declaration;
+ if (decl == NULL)
+ return create_invalid_expression();
if (decl->parent_scope == ¤t_function->scope &&
decl->next == NULL) {
expression->va_starte.parameter = decl;
}
}
errorf(expr->base.source_position, "second argument of 'va_start' must be last parameter of the current function");
-
+end_error:
return create_invalid_expression();
}
+/**
+ * Parses a _builtin_va_arg() expression.
+ */
static expression_t *parse_va_arg(void)
{
eat(T___builtin_va_arg);
expect('(');
expression->va_arge.ap = parse_assignment_expression();
expect(',');
- expression->base.datatype = parse_typename();
+ expression->base.type = parse_typename();
expect(')');
return expression;
+end_error:
+ return create_invalid_expression();
}
static expression_t *parse_builtin_symbol(void)
type_t *type = get_builtin_symbol_type(symbol);
type = automatic_type_conversion(type);
- expression->base.datatype = type;
+ expression->base.type = type;
return expression;
}
+/**
+ * Parses a __builtin_constant() expression.
+ */
static expression_t *parse_builtin_constant(void)
{
eat(T___builtin_constant_p);
expect('(');
expression->builtin_constant.value = parse_assignment_expression();
expect(')');
- expression->base.datatype = type_int;
+ expression->base.type = type_int;
return expression;
+end_error:
+ return create_invalid_expression();
}
+/**
+ * Parses a __builtin_prefetch() expression.
+ */
static expression_t *parse_builtin_prefetch(void)
{
eat(T___builtin_prefetch);
expression->builtin_prefetch.locality = parse_assignment_expression();
}
expect(')');
- expression->base.datatype = type_void;
+ expression->base.type = type_void;
return expression;
+end_error:
+ return create_invalid_expression();
}
+/**
+ * Parses a __builtin_is_*() compare expression.
+ */
static expression_t *parse_compare_builtin(void)
{
expression_t *expression;
expression->binary.right = parse_assignment_expression();
expect(')');
- type_t *const orig_type_left = expression->binary.left->base.datatype;
- type_t *const orig_type_right = expression->binary.right->base.datatype;
+ type_t *const orig_type_left = expression->binary.left->base.type;
+ type_t *const orig_type_right = expression->binary.right->base.type;
type_t *const type_left = skip_typeref(orig_type_left);
type_t *const type_right = skip_typeref(orig_type_right);
}
return expression;
+end_error:
+ return create_invalid_expression();
}
+/**
+ * Parses a __builtin_expect() expression.
+ */
static expression_t *parse_builtin_expect(void)
{
eat(T___builtin_expect);
expression->binary.right = parse_constant_expression();
expect(')');
- expression->base.datatype = expression->binary.left->base.datatype;
+ expression->base.type = expression->binary.left->base.type;
return expression;
+end_error:
+ return create_invalid_expression();
}
+/**
+ * Parses a MS assume() expression.
+ */
static expression_t *parse_assume(void) {
eat(T_assume);
expression->unary.value = parse_assignment_expression();
expect(')');
- expression->base.datatype = type_void;
- return expression;
-}
-
-static expression_t *parse_alignof(void) {
- eat(T___alignof__);
-
- expression_t *expression
- = allocate_expression_zero(EXPR_ALIGNOF);
-
- expect('(');
- expression->alignofe.type = parse_typename();
- expect(')');
-
- expression->base.datatype = type_size_t;
+ expression->base.type = type_void;
return expression;
+end_error:
+ return create_invalid_expression();
}
+/**
+ * Parses a primary expression.
+ */
static expression_t *parse_primary_expression(void)
{
- switch(token.type) {
- case T_INTEGER:
- return parse_int_const();
- case T_FLOATINGPOINT:
- return parse_float_const();
- case T_STRING_LITERAL:
- return parse_string_const();
- case T_WIDE_STRING_LITERAL:
- return parse_wide_string_const();
- case T_IDENTIFIER:
- return parse_reference();
- case T___FUNCTION__:
- case T___func__:
- return parse_function_keyword();
- case T___PRETTY_FUNCTION__:
- return parse_pretty_function_keyword();
- 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_nanf:
- case T___builtin_alloca:
- case T___builtin_va_end:
- return parse_builtin_symbol();
- case T___builtin_isgreater:
- case T___builtin_isgreaterequal:
- case T___builtin_isless:
- case T___builtin_islessequal:
- case T___builtin_islessgreater:
- 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___alignof__:
- return parse_alignof();
- case T_assume:
- return parse_assume();
-
- case '(':
- return parse_brace_expression();
- }
-
- errorf(HERE, "unexpected token '%K'", &token);
+ switch (token.type) {
+ case T_INTEGER: return parse_int_const();
+ case T_CHARACTER_CONSTANT: return parse_character_constant();
+ case T_WIDE_CHARACTER_CONSTANT: return parse_wide_character_constant();
+ case T_FLOATINGPOINT: return parse_float_const();
+ case T_STRING_LITERAL:
+ case T_WIDE_STRING_LITERAL: return parse_string_const();
+ case T_IDENTIFIER: return parse_reference();
+ case T___FUNCTION__:
+ case T___func__: return parse_function_keyword();
+ case T___PRETTY_FUNCTION__: return parse_pretty_function_keyword();
+ 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_alloca:
+ case T___builtin_nan:
+ case T___builtin_nand:
+ case T___builtin_nanf:
+ case T___builtin_va_end: return parse_builtin_symbol();
+ case T___builtin_isgreater:
+ case T___builtin_isgreaterequal:
+ case T___builtin_isless:
+ case T___builtin_islessequal:
+ case T___builtin_islessgreater:
+ 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 '(': return parse_brace_expression();
+ }
+
+ errorf(HERE, "unexpected token %K, expected an expression", &token);
eat_statement();
return create_invalid_expression();
* Check if the expression has the character type and issue a warning then.
*/
static void check_for_char_index_type(const expression_t *expression) {
- type_t *const type = expression->base.datatype;
+ type_t *const type = expression->base.type;
const type_t *const base_type = skip_typeref(type);
if (is_type_atomic(base_type, ATOMIC_TYPE_CHAR) &&
expression_t *inside = parse_expression();
- array_access_expression_t *array_access
- = allocate_ast_zero(sizeof(array_access[0]));
+ expression_t *expression = allocate_expression_zero(EXPR_ARRAY_ACCESS);
- array_access->expression.kind = EXPR_ARRAY_ACCESS;
+ array_access_expression_t *array_access = &expression->array_access;
- type_t *const orig_type_left = left->base.datatype;
- type_t *const orig_type_inside = inside->base.datatype;
+ type_t *const orig_type_left = left->base.type;
+ type_t *const orig_type_inside = inside->base.type;
type_t *const type_left = skip_typeref(orig_type_left);
type_t *const type_inside = skip_typeref(orig_type_inside);
if(token.type != ']') {
parse_error_expected("Problem while parsing array access", ']', 0);
- return (expression_t*) array_access;
+ return expression;
}
next_token();
- return_type = automatic_type_conversion(return_type);
- array_access->expression.datatype = return_type;
+ return_type = automatic_type_conversion(return_type);
+ expression->base.type = return_type;
- return (expression_t*) array_access;
+ return expression;
}
-static expression_t *parse_sizeof(unsigned precedence)
+static expression_t *parse_typeprop(expression_kind_t kind, unsigned precedence)
{
- eat(T_sizeof);
-
- sizeof_expression_t *sizeof_expression
- = allocate_ast_zero(sizeof(sizeof_expression[0]));
- sizeof_expression->expression.kind = EXPR_SIZEOF;
- sizeof_expression->expression.datatype = type_size_t;
+ expression_t *tp_expression = allocate_expression_zero(kind);
+ tp_expression->base.type = type_size_t;
if(token.type == '(' && is_declaration_specifier(look_ahead(1), true)) {
next_token();
- sizeof_expression->type = parse_typename();
+ tp_expression->typeprop.type = parse_typename();
expect(')');
} else {
- expression_t *expression = parse_sub_expression(precedence);
- expression->base.datatype = revert_automatic_type_conversion(expression);
+ expression_t *expression = parse_sub_expression(precedence);
+ expression->base.type = revert_automatic_type_conversion(expression);
- sizeof_expression->type = expression->base.datatype;
- sizeof_expression->size_expression = expression;
+ tp_expression->typeprop.type = expression->base.type;
+ tp_expression->typeprop.tp_expression = expression;
}
- return (expression_t*) sizeof_expression;
+ return tp_expression;
+end_error:
+ return create_invalid_expression();
+}
+
+static expression_t *parse_sizeof(unsigned precedence)
+{
+ eat(T_sizeof);
+ return parse_typeprop(EXPR_SIZEOF, precedence);
+}
+
+static expression_t *parse_alignof(unsigned precedence)
+{
+ eat(T___alignof__);
+ return parse_typeprop(EXPR_SIZEOF, precedence);
}
static expression_t *parse_select_expression(unsigned precedence,
select->select.symbol = symbol;
next_token();
- type_t *const orig_type = compound->base.datatype;
+ type_t *const orig_type = compound->base.type;
type_t *const type = skip_typeref(orig_type);
type_t *type_left = type;
return create_invalid_expression();
}
- declaration_t *iter = declaration->scope.declarations;
- for( ; iter != NULL; iter = iter->next) {
- if(iter->symbol == symbol) {
- break;
- }
- }
+ declaration_t *iter = find_compound_entry(declaration, symbol);
if(iter == NULL) {
errorf(HERE, "'%T' has no member named '%Y'", orig_type, symbol);
return create_invalid_expression();
type_t *expression_type = automatic_type_conversion(iter->type);
select->select.compound_entry = iter;
- select->base.datatype = expression_type;
+ 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.datatype = expression_type->bitfield.base;
+ extract->unary.value = select;
+ extract->base.type = expression_type->bitfield.base;
return extract;
}
call_expression_t *call = &result->call;
call->function = expression;
- type_t *const orig_type = expression->base.datatype;
+ type_t *const orig_type = expression->base.type;
type_t *const type = skip_typeref(orig_type);
function_type_t *function_type = NULL;
type_t *const to_type = skip_typeref(type->pointer.points_to);
if (is_type_function(to_type)) {
- function_type = &to_type->function;
- call->expression.datatype = function_type->return_type;
+ function_type = &to_type->function;
+ call->base.type = function_type->return_type;
}
}
/* 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.datatype, expected_type);
+ arg_expr, arg_expr->base.type, expected_type);
} else {
argument->expression = create_implicit_cast(argument->expression, expected_type);
}
} else {
/* do default promotion */
for( ; argument != NULL; argument = argument->next) {
- type_t *type = argument->expression->base.datatype;
+ type_t *type = argument->expression->base.type;
type = skip_typeref(type);
if(is_type_integer(type)) {
}
return result;
+end_error:
+ return create_invalid_expression();
}
static type_t *semantic_arithmetic(type_t *type_left, type_t *type_right);
conditional->condition = expression;
/* 6.5.15.2 */
- type_t *const condition_type_orig = expression->base.datatype;
+ type_t *const condition_type_orig = expression->base.type;
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",
expect(':');
expression_t *false_expression = parse_sub_expression(precedence);
- conditional->true_expression = true_expression;
- conditional->false_expression = false_expression;
-
- type_t *const orig_true_type = true_expression->base.datatype;
- type_t *const orig_false_type = false_expression->base.datatype;
+ type_t *const orig_true_type = true_expression->base.type;
+ type_t *const orig_false_type = false_expression->base.type;
type_t *const true_type = skip_typeref(orig_true_type);
type_t *const false_type = skip_typeref(orig_false_type);
true_expression = create_implicit_cast(true_expression, result_type);
false_expression = create_implicit_cast(false_expression, result_type);
- conditional->true_expression = true_expression;
- conditional->false_expression = false_expression;
- conditional->expression.datatype = 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)
&& 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 {
- /* TODO */
+ /* TODO: one pointer to void*, other some pointer */
+
if (is_type_valid(true_type) && is_type_valid(false_type)) {
type_error_incompatible("while parsing conditional",
expression->base.source_position, true_type,
result_type = type_error_type;
}
- conditional->expression.datatype = result_type;
+ conditional->true_expression
+ = create_implicit_cast(true_expression, result_type);
+ conditional->false_expression
+ = create_implicit_cast(false_expression, result_type);
+ conditional->base.type = result_type;
return result;
+end_error:
+ return create_invalid_expression();
}
/**
return expression;
}
+/**
+ * Parse a __builtin_classify_type() expression.
+ */
static expression_t *parse_builtin_classify_type(const unsigned precedence)
{
eat(T___builtin_classify_type);
- expression_t *result = allocate_expression_zero(EXPR_CLASSIFY_TYPE);
- result->base.datatype = type_int;
+ expression_t *result = allocate_expression_zero(EXPR_CLASSIFY_TYPE);
+ result->base.type = type_int;
expect('(');
expression_t *expression = parse_sub_expression(precedence);
result->classify_type.type_expression = expression;
return result;
+end_error:
+ return create_invalid_expression();
}
static void semantic_incdec(unary_expression_t *expression)
{
- type_t *const orig_type = expression->value->base.datatype;
+ 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) {
return;
}
- expression->expression.datatype = orig_type;
+ expression->base.type = orig_type;
}
static void semantic_unexpr_arithmetic(unary_expression_t *expression)
{
- type_t *const orig_type = expression->value->base.datatype;
+ type_t *const orig_type = expression->value->base.type;
type_t *const type = skip_typeref(orig_type);
if(!is_type_arithmetic(type)) {
if (is_type_valid(type)) {
return;
}
- expression->expression.datatype = orig_type;
+ expression->base.type = orig_type;
}
static void semantic_unexpr_scalar(unary_expression_t *expression)
{
- type_t *const orig_type = expression->value->base.datatype;
+ type_t *const orig_type = expression->value->base.type;
type_t *const type = skip_typeref(orig_type);
if (!is_type_scalar(type)) {
if (is_type_valid(type)) {
return;
}
- expression->expression.datatype = orig_type;
+ expression->base.type = orig_type;
}
static void semantic_unexpr_integer(unary_expression_t *expression)
{
- type_t *const orig_type = expression->value->base.datatype;
+ type_t *const orig_type = expression->value->base.type;
type_t *const type = skip_typeref(orig_type);
if (!is_type_integer(type)) {
if (is_type_valid(type)) {
return;
}
- expression->expression.datatype = orig_type;
+ expression->base.type = orig_type;
}
static void semantic_dereference(unary_expression_t *expression)
{
- type_t *const orig_type = expression->value->base.datatype;
+ type_t *const orig_type = expression->value->base.type;
type_t *const type = skip_typeref(orig_type);
if(!is_type_pointer(type)) {
if (is_type_valid(type)) {
return;
}
- type_t *result_type = type->pointer.points_to;
- result_type = automatic_type_conversion(result_type);
- expression->expression.datatype = result_type;
+ type_t *result_type = type->pointer.points_to;
+ result_type = automatic_type_conversion(result_type);
+ expression->base.type = result_type;
}
/**
*/
static void semantic_take_addr(unary_expression_t *expression)
{
- expression_t *value = expression->value;
- value->base.datatype = revert_automatic_type_conversion(value);
+ expression_t *value = expression->value;
+ value->base.type = revert_automatic_type_conversion(value);
- type_t *orig_type = value->base.datatype;
+ type_t *orig_type = value->base.type;
if(!is_type_valid(orig_type))
return;
declaration_t *const declaration = value->reference.declaration;
if(declaration != NULL) {
if (declaration->storage_class == STORAGE_CLASS_REGISTER) {
- errorf(expression->expression.source_position,
+ errorf(expression->base.source_position,
"address of register variable '%Y' requested",
declaration->symbol);
}
}
}
- expression->expression.datatype = make_pointer_type(orig_type, TYPE_QUALIFIER_NONE);
+ expression->base.type = make_pointer_type(orig_type, TYPE_QUALIFIER_NONE);
}
#define CREATE_UNARY_EXPRESSION_PARSER(token_type, unexpression_type, sfunc) \
{
expression_t *const left = expression->left;
expression_t *const right = expression->right;
- type_t *const orig_type_left = left->base.datatype;
- type_t *const orig_type_right = right->base.datatype;
+ type_t *const orig_type_left = left->base.type;
+ 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);
}
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->expression.datatype = arithmetic_type;
+ expression->left = create_implicit_cast(left, arithmetic_type);
+ expression->right = create_implicit_cast(right, arithmetic_type);
+ expression->base.type = arithmetic_type;
}
static void semantic_shift_op(binary_expression_t *expression)
{
expression_t *const left = expression->left;
expression_t *const right = expression->right;
- type_t *const orig_type_left = left->base.datatype;
- type_t *const orig_type_right = right->base.datatype;
+ type_t *const orig_type_left = left->base.type;
+ type_t *const orig_type_right = right->base.type;
type_t * type_left = skip_typeref(orig_type_left);
type_t * type_right = skip_typeref(orig_type_right);
type_left = promote_integer(type_left);
type_right = promote_integer(type_right);
- expression->left = create_implicit_cast(left, type_left);
- expression->right = create_implicit_cast(right, type_right);
- expression->expression.datatype = type_left;
+ expression->left = create_implicit_cast(left, type_left);
+ expression->right = create_implicit_cast(right, type_right);
+ expression->base.type = type_left;
}
static void semantic_add(binary_expression_t *expression)
{
expression_t *const left = expression->left;
expression_t *const right = expression->right;
- type_t *const orig_type_left = left->base.datatype;
- type_t *const orig_type_right = right->base.datatype;
+ type_t *const orig_type_left = left->base.type;
+ 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);
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->expression.datatype = arithmetic_type;
+ expression->base.type = arithmetic_type;
return;
} else if(is_type_pointer(type_left) && is_type_integer(type_right)) {
- expression->expression.datatype = type_left;
+ expression->base.type = type_left;
} else if(is_type_pointer(type_right) && is_type_integer(type_left)) {
- expression->expression.datatype = 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);
}
{
expression_t *const left = expression->left;
expression_t *const right = expression->right;
- type_t *const orig_type_left = left->base.datatype;
- type_t *const orig_type_right = right->base.datatype;
+ type_t *const orig_type_left = left->base.type;
+ 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);
/* § 5.6.5 */
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->expression.datatype = arithmetic_type;
+ 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)) {
- expression->expression.datatype = 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')", orig_type_left, orig_type_right);
+ errorf(HERE,
+ "pointers to incompatible objects to binary '-' ('%T', '%T')",
+ orig_type_left, orig_type_right);
} else {
- expression->expression.datatype = type_ptrdiff_t;
+ 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')", orig_type_left, orig_type_right);
+ errorf(HERE, "invalid operands to binary '-' ('%T', '%T')",
+ orig_type_left, orig_type_right);
}
}
{
expression_t *left = expression->left;
expression_t *right = expression->right;
- type_t *orig_type_left = left->base.datatype;
- type_t *orig_type_right = right->base.datatype;
+ type_t *orig_type_left = left->base.type;
+ type_t *orig_type_right = right->base.type;
type_t *type_left = skip_typeref(orig_type_left);
type_t *type_right = skip_typeref(orig_type_right);
/* TODO non-arithmetic types */
if(is_type_arithmetic(type_left) && is_type_arithmetic(type_right)) {
+ 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,
+ "comparison between signed and unsigned");
+ }
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->expression.datatype = arithmetic_type;
+ expression->left = create_implicit_cast(left, arithmetic_type);
+ expression->right = create_implicit_cast(right, arithmetic_type);
+ expression->base.type = arithmetic_type;
if (warning.float_equal &&
- (expression->expression.kind == EXPR_BINARY_EQUAL ||
- expression->expression.kind == EXPR_BINARY_NOTEQUAL) &&
+ (expression->base.kind == EXPR_BINARY_EQUAL ||
+ expression->base.kind == EXPR_BINARY_NOTEQUAL) &&
is_type_float(arithmetic_type)) {
- warningf(expression->expression.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->expression.source_position,
+ expression->base.source_position,
type_left, type_right);
}
- expression->expression.datatype = type_int;
+ expression->base.type = type_int;
}
static void semantic_arithmetic_assign(binary_expression_t *expression)
{
expression_t *left = expression->left;
expression_t *right = expression->right;
- type_t *orig_type_left = left->base.datatype;
- type_t *orig_type_right = right->base.datatype;
+ type_t *orig_type_left = left->base.type;
+ type_t *orig_type_right = right->base.type;
type_t *type_left = skip_typeref(orig_type_left);
type_t *type_right = skip_typeref(orig_type_right);
* for the arithmetic operation and create a cast by itself */
type_t *arithmetic_type = semantic_arithmetic(type_left, type_right);
expression->right = create_implicit_cast(right, arithmetic_type);
- expression->expression.datatype = type_left;
+ expression->base.type = type_left;
}
static void semantic_arithmetic_addsubb_assign(binary_expression_t *expression)
{
expression_t *const left = expression->left;
expression_t *const right = expression->right;
- type_t *const orig_type_left = left->base.datatype;
- type_t *const orig_type_right = right->base.datatype;
+ type_t *const orig_type_left = left->base.type;
+ 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);
* The ast2firm pass has to know that left_type must be right_type
* for the arithmetic operation and create a cast by itself */
type_t *const arithmetic_type = semantic_arithmetic(type_left, type_right);
- expression->right = create_implicit_cast(right, arithmetic_type);
- expression->expression.datatype = type_left;
+ 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)) {
- expression->expression.datatype = 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_t *const left = expression->left;
expression_t *const right = expression->right;
- type_t *const orig_type_left = left->base.datatype;
- type_t *const orig_type_right = right->base.datatype;
+ type_t *const orig_type_left = left->base.type;
+ 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);
return;
}
- expression->expression.datatype = type_int;
+ expression->base.type = type_int;
}
/**
static void semantic_binexpr_assign(binary_expression_t *expression)
{
expression_t *left = expression->left;
- type_t *orig_type_left = left->base.datatype;
+ type_t *orig_type_left = left->base.type;
type_t *type_left = revert_automatic_type_conversion(left);
type_left = skip_typeref(orig_type_left);
type_t *const res_type = semantic_assign(orig_type_left, expression->right,
"assignment");
if (res_type == NULL) {
- errorf(expression->expression.source_position,
+ errorf(expression->base.source_position,
"cannot assign to '%T' from '%T'",
- orig_type_left, expression->right->base.datatype);
+ orig_type_left, expression->right->base.type);
} else {
expression->right = create_implicit_cast(expression->right, res_type);
}
- expression->expression.datatype = orig_type_left;
+ expression->base.type = orig_type_left;
}
+/**
+ * Determine if the outermost operation (or parts thereof) of the given
+ * expression has no effect in order to generate a warning about this fact.
+ * Therefore in some cases this only examines some of the operands of the
+ * expression (see comments in the function and examples below).
+ * Examples:
+ * f() + 23; // warning, because + has no effect
+ * x || f(); // no warning, because x controls execution of f()
+ * x ? y : f(); // warning, because y has no effect
+ * (void)x; // no warning to be able to suppress the warning
+ * This function can NOT be used for an "expression has definitely no effect"-
+ * analysis. */
static bool expression_has_effect(const expression_t *const expr)
{
switch (expr->kind) {
case EXPR_UNKNOWN: break;
- case EXPR_INVALID: break;
+ case EXPR_INVALID: return true; /* do NOT warn */
case EXPR_REFERENCE: return false;
case EXPR_CONST: return false;
+ case EXPR_CHARACTER_CONSTANT: return false;
+ case EXPR_WIDE_CHARACTER_CONSTANT: return false;
case EXPR_STRING_LITERAL: return false;
case EXPR_WIDE_STRING_LITERAL: return false;
+
case EXPR_CALL: {
const call_expression_t *const call = &expr->call;
if (call->function->kind != EXPR_BUILTIN_SYMBOL)
default: return false;
}
}
+
+ /* Generate the warning if either the left or right hand side of a
+ * conditional expression has no effect */
case EXPR_CONDITIONAL: {
const conditional_expression_t *const cond = &expr->conditional;
return
expression_has_effect(cond->true_expression) &&
expression_has_effect(cond->false_expression);
}
+
case EXPR_SELECT: return false;
case EXPR_ARRAY_ACCESS: return false;
case EXPR_SIZEOF: return false;
case EXPR_VA_START: return true;
case EXPR_VA_ARG: return true;
case EXPR_STATEMENT: return true; // TODO
+ case EXPR_COMPOUND_LITERAL: return false;
case EXPR_UNARY_NEGATE: return false;
case EXPR_UNARY_PLUS: return false;
case EXPR_UNARY_POSTFIX_DECREMENT: return true;
case EXPR_UNARY_PREFIX_INCREMENT: return true;
case EXPR_UNARY_PREFIX_DECREMENT: return true;
- case EXPR_UNARY_CAST:
- return is_type_atomic(expr->base.datatype, ATOMIC_TYPE_VOID);
+
+ /* Treat void casts as if they have an effect in order to being able to
+ * suppress the warning */
+ case EXPR_UNARY_CAST: {
+ type_t *const type = skip_typeref(expr->base.type);
+ return is_type_atomic(type, ATOMIC_TYPE_VOID);
+ }
+
case EXPR_UNARY_CAST_IMPLICIT: return true;
case EXPR_UNARY_ASSUME: return true;
case EXPR_UNARY_BITFIELD_EXTRACT: return false;
case EXPR_BINARY_BITWISE_AND_ASSIGN: return true;
case EXPR_BINARY_BITWISE_XOR_ASSIGN: return true;
case EXPR_BINARY_BITWISE_OR_ASSIGN: return true;
+
+ /* Only examine the right hand side of && and ||, because the left hand
+ * side already has the effect of controlling the execution of the right
+ * hand side */
case EXPR_BINARY_LOGICAL_AND:
case EXPR_BINARY_LOGICAL_OR:
+ /* Only examine the right hand side of a comma expression, because the left
+ * hand side has a separate warning */
case EXPR_BINARY_COMMA:
return expression_has_effect(expr->binary.right);
case EXPR_BINARY_ISUNORDERED: return false;
}
- panic("unexpected statement");
+ panic("unexpected expression");
}
static void semantic_comma(binary_expression_t *expression)
warningf(left->base.source_position, "left-hand operand of comma expression has no effect");
}
}
- expression->expression.datatype = expression->right->base.datatype;
+ expression->base.type = expression->right->base.type;
}
#define CREATE_BINEXPR_PARSER(token_type, binexpression_type, sfunc, lr) \
T_PLUSPLUS, 25);
register_expression_parser(parse_EXPR_UNARY_PREFIX_DECREMENT,
T_MINUSMINUS, 25);
- register_expression_parser(parse_sizeof, T_sizeof, 25);
+ register_expression_parser(parse_sizeof, T_sizeof, 25);
+ register_expression_parser(parse_alignof, T___alignof__, 25);
register_expression_parser(parse_extension, T___extension__, 25);
register_expression_parser(parse_builtin_classify_type,
T___builtin_classify_type, 25);
}
return result;
+end_error:
+ return NULL;
}
/**
expect(')');
expect(';');
return statement;
+end_error:
+ return NULL;
}
/**
statement->base.source_position = token.source_position;
statement->case_label.expression = parse_expression();
+ if (c_mode & _GNUC) {
+ if (token.type == T_DOTDOTDOT) {
+ next_token();
+ statement->case_label.end_range = parse_expression();
+ }
+ }
+
expect(':');
if (! is_constant_expression(statement->case_label.expression)) {
"case label not within a switch statement");
}
}
- statement->case_label.label_statement = parse_statement();
+ statement->case_label.statement = parse_statement();
return statement;
+end_error:
+ return NULL;
}
/**
static case_label_statement_t *
find_default_label(const switch_statement_t *statement)
{
- for (case_label_statement_t *label = statement->first_case;
- label != NULL;
- label = label->next) {
+ case_label_statement_t *label = statement->first_case;
+ for ( ; label != NULL; label = label->next) {
if (label->expression == NULL)
return label;
}
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->statement.source_position,
+ errorf(def_label->base.source_position,
"this is the first default label");
} else {
/* link all cases into the switch statement */
errorf(statement->base.source_position,
"'default' label not within a switch statement");
}
- statement->label.label_statement = parse_statement();
+ statement->case_label.statement = parse_statement();
return statement;
+end_error:
+ return NULL;
}
/**
label->source_position = token.source_position;
}
- label_statement_t *label_statement = allocate_ast_zero(sizeof(label[0]));
+ statement_t *statement = allocate_statement_zero(STATEMENT_LABEL);
- label_statement->statement.kind = STATEMENT_LABEL;
- label_statement->statement.source_position = token.source_position;
- label_statement->label = label;
+ statement->base.source_position = token.source_position;
+ statement->label.label = label;
eat(':');
if(token.type == '}') {
/* TODO only warn? */
errorf(HERE, "label at end of compound statement");
- return (statement_t*) label_statement;
+ return statement;
} else {
if (token.type == ';') {
/* eat an empty statement here, to avoid the warning about an empty
* a }. */
next_token();
} else {
- label_statement->label_statement = parse_statement();
+ statement->label.statement = parse_statement();
}
}
/* remember the labels's in a list for later checking */
if (label_last == NULL) {
- label_first = label_last = label_statement;
+ label_first = &statement->label;
} else {
- label_last->next = label_statement;
+ label_last->next = &statement->label;
}
+ label_last = &statement->label;
- return (statement_t*) label_statement;
+ return statement;
}
/**
{
eat(T_if);
- if_statement_t *statement = allocate_ast_zero(sizeof(statement[0]));
- statement->statement.kind = STATEMENT_IF;
- statement->statement.source_position = token.source_position;
+ statement_t *statement = allocate_statement_zero(STATEMENT_IF);
+ statement->base.source_position = token.source_position;
expect('(');
- statement->condition = parse_expression();
+ statement->ifs.condition = parse_expression();
expect(')');
- statement->true_statement = parse_statement();
+ statement->ifs.true_statement = parse_statement();
if(token.type == T_else) {
next_token();
- statement->false_statement = parse_statement();
+ statement->ifs.false_statement = parse_statement();
}
- return (statement_t*) statement;
+ return statement;
+end_error:
+ return NULL;
}
/**
{
eat(T_switch);
- switch_statement_t *statement = allocate_ast_zero(sizeof(statement[0]));
- statement->statement.kind = STATEMENT_SWITCH;
- statement->statement.source_position = token.source_position;
+ statement_t *statement = allocate_statement_zero(STATEMENT_SWITCH);
+ statement->base.source_position = token.source_position;
expect('(');
expression_t *const expr = parse_expression();
- type_t * type = skip_typeref(expr->base.datatype);
+ 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, "switch quantity is not an integer, but '%T'", type);
+ errorf(expr->base.source_position,
+ "switch quantity is not an integer, but '%T'", type);
type = type_error_type;
}
- statement->expression = create_implicit_cast(expr, type);
+ statement->switchs.expression = create_implicit_cast(expr, type);
expect(')');
switch_statement_t *rem = current_switch;
- current_switch = statement;
- statement->body = parse_statement();
- current_switch = rem;
+ current_switch = &statement->switchs;
+ statement->switchs.body = parse_statement();
+ current_switch = rem;
- if (warning.switch_default && find_default_label(statement) == NULL) {
- warningf(statement->statement.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_t*) statement;
+ return statement;
+end_error:
+ return NULL;
}
static statement_t *parse_loop_body(statement_t *const loop)
{
statement_t *const rem = current_loop;
current_loop = loop;
+
statement_t *const body = parse_statement();
+
current_loop = rem;
return body;
}
{
eat(T_while);
- while_statement_t *statement = allocate_ast_zero(sizeof(statement[0]));
- statement->statement.kind = STATEMENT_WHILE;
- statement->statement.source_position = token.source_position;
+ statement_t *statement = allocate_statement_zero(STATEMENT_WHILE);
+ statement->base.source_position = token.source_position;
expect('(');
- statement->condition = parse_expression();
+ statement->whiles.condition = parse_expression();
expect(')');
- statement->body = parse_loop_body((statement_t*)statement);
+ statement->whiles.body = parse_loop_body(statement);
- return (statement_t*) statement;
+ return statement;
+end_error:
+ return NULL;
}
/**
{
eat(T_do);
- do_while_statement_t *statement = allocate_ast_zero(sizeof(statement[0]));
- statement->statement.kind = STATEMENT_DO_WHILE;
- statement->statement.source_position = token.source_position;
+ statement_t *statement = allocate_statement_zero(STATEMENT_DO_WHILE);
+
+ statement->base.source_position = token.source_position;
+
+ statement->do_while.body = parse_loop_body(statement);
- statement->body = parse_loop_body((statement_t*)statement);
expect(T_while);
expect('(');
- statement->condition = parse_expression();
+ statement->do_while.condition = parse_expression();
expect(')');
expect(';');
- return (statement_t*) statement;
+ return statement;
+end_error:
+ return NULL;
}
/**
{
eat(T_for);
- for_statement_t *statement = allocate_ast_zero(sizeof(statement[0]));
- statement->statement.kind = STATEMENT_FOR;
- statement->statement.source_position = token.source_position;
-
- expect('(');
+ statement_t *statement = allocate_statement_zero(STATEMENT_FOR);
+ statement->base.source_position = token.source_position;
int top = environment_top();
scope_t *last_scope = scope;
- set_scope(&statement->scope);
+ set_scope(&statement->fors.scope);
+
+ expect('(');
if(token.type != ';') {
if(is_declaration_specifier(&token, false)) {
parse_declaration(record_declaration);
} else {
- statement->initialisation = parse_expression();
+ expression_t *const init = parse_expression();
+ statement->fors.initialisation = init;
+ if (warning.unused_value && !expression_has_effect(init)) {
+ warningf(init->base.source_position,
+ "initialisation of 'for'-statement has no effect");
+ }
expect(';');
}
} else {
}
if(token.type != ';') {
- statement->condition = parse_expression();
+ statement->fors.condition = parse_expression();
}
expect(';');
if(token.type != ')') {
- statement->step = parse_expression();
+ expression_t *const step = parse_expression();
+ statement->fors.step = step;
+ if (warning.unused_value && !expression_has_effect(step)) {
+ warningf(step->base.source_position,
+ "step of 'for'-statement has no effect");
+ }
}
expect(')');
- statement->body = parse_loop_body((statement_t*)statement);
+ statement->fors.body = parse_loop_body(statement);
+
+ assert(scope == &statement->fors.scope);
+ set_scope(last_scope);
+ environment_pop_to(top);
+
+ return statement;
- assert(scope == &statement->scope);
+end_error:
+ assert(scope == &statement->fors.scope);
set_scope(last_scope);
environment_pop_to(top);
- return (statement_t*) statement;
+ return NULL;
}
/**
declaration_t *label = get_label(symbol);
- goto_statement_t *statement = allocate_ast_zero(sizeof(statement[0]));
-
- statement->statement.kind = STATEMENT_GOTO;
- statement->statement.source_position = token.source_position;
+ statement_t *statement = allocate_statement_zero(STATEMENT_GOTO);
+ statement->base.source_position = token.source_position;
- statement->label = label;
+ statement->gotos.label = label;
/* remember the goto's in a list for later checking */
if (goto_last == NULL) {
- goto_first = goto_last = statement;
+ goto_first = &statement->gotos;
} else {
- goto_last->next = statement;
+ goto_last->next = &statement->gotos;
}
+ goto_last = &statement->gotos;
expect(';');
- return (statement_t*) statement;
+ return statement;
+end_error:
+ return NULL;
}
/**
expect(';');
return statement;
+end_error:
+ return NULL;
}
/**
expect(';');
return statement;
+end_error:
+ return NULL;
}
/**
*/
static bool is_local_var_declaration(const declaration_t *declaration) {
switch ((storage_class_tag_t) declaration->storage_class) {
- case STORAGE_CLASS_NONE:
case STORAGE_CLASS_AUTO:
case STORAGE_CLASS_REGISTER: {
const type_t *type = skip_typeref(declaration->type);
}
}
+/**
+ * Check if a given declaration represents a variable.
+ */
+static bool is_var_declaration(const declaration_t *declaration) {
+ if(declaration->storage_class == STORAGE_CLASS_TYPEDEF)
+ return false;
+
+ const type_t *type = skip_typeref(declaration->type);
+ return !is_type_function(type);
+}
+
/**
* Check if a given expression represents a local variable.
*/
return is_local_var_declaration(declaration);
}
+/**
+ * Check if a given expression represents a local variable and
+ * return its declaration then, else return NULL.
+ */
+declaration_t *expr_is_variable(const expression_t *expression)
+{
+ if (expression->base.kind != EXPR_REFERENCE) {
+ return NULL;
+ }
+ declaration_t *declaration = expression->reference.declaration;
+ if (is_var_declaration(declaration))
+ return declaration;
+ return NULL;
+}
+
/**
* Parse a return statement.
*/
{
eat(T_return);
- return_statement_t *statement = allocate_ast_zero(sizeof(statement[0]));
-
- statement->statement.kind = STATEMENT_RETURN;
- statement->statement.source_position = token.source_position;
+ statement_t *statement = allocate_statement_zero(STATEMENT_RETURN);
+ statement->base.source_position = token.source_position;
expression_t *return_value = NULL;
if(token.type != ';') {
type_t *const return_type = skip_typeref(func_type->function.return_type);
if(return_value != NULL) {
- type_t *return_value_type = skip_typeref(return_value->base.datatype);
+ type_t *return_value_type = skip_typeref(return_value->base.type);
if(is_type_atomic(return_type, ATOMIC_TYPE_VOID)
&& !is_type_atomic(return_value_type, ATOMIC_TYPE_VOID)) {
- warningf(statement->statement.source_position,
- "'return' with a value, in function returning void");
+ 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'");
if (res_type == NULL) {
- errorf(statement->statement.source_position,
- "cannot return something of type '%T' in function returning '%T'",
- return_value->base.datatype, return_type);
+ 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);
}
if (return_value->base.kind == EXPR_UNARY_TAKE_ADDRESS) {
const expression_t *expression = return_value->unary.value;
if (is_local_variable(expression)) {
- warningf(statement->statement.source_position,
- "function returns address of local variable");
+ warningf(statement->base.source_position,
+ "function returns address of local variable");
}
}
} else {
if(!is_type_atomic(return_type, ATOMIC_TYPE_VOID)) {
- warningf(statement->statement.source_position,
- "'return' without value, in function returning non-void");
+ warningf(statement->base.source_position,
+ "'return' without value, in function returning non-void");
}
}
- statement->return_value = return_value;
+ statement->returns.value = return_value;
- return (statement_t*) statement;
+ return statement;
+end_error:
+ return NULL;
}
/**
expect(';');
return statement;
+end_error:
+ return NULL;
}
/**
*/
static statement_t *parse_compound_statement(void)
{
- compound_statement_t *const compound_statement
- = allocate_ast_zero(sizeof(compound_statement[0]));
- compound_statement->statement.kind = STATEMENT_COMPOUND;
- compound_statement->statement.source_position = token.source_position;
+ statement_t *statement = allocate_statement_zero(STATEMENT_COMPOUND);
+
+ statement->base.source_position = token.source_position;
eat('{');
int top = environment_top();
scope_t *last_scope = scope;
- set_scope(&compound_statement->scope);
+ set_scope(&statement->compound.scope);
statement_t *last_statement = NULL;
while(token.type != '}' && token.type != T_EOF) {
- statement_t *statement = parse_statement();
- if(statement == NULL)
+ statement_t *sub_statement = parse_statement();
+ if(sub_statement == NULL)
continue;
if(last_statement != NULL) {
- last_statement->base.next = statement;
+ last_statement->base.next = sub_statement;
} else {
- compound_statement->statements = statement;
+ statement->compound.statements = sub_statement;
}
- while(statement->base.next != NULL)
- statement = statement->base.next;
+ while(sub_statement->base.next != NULL)
+ sub_statement = sub_statement->base.next;
- last_statement = statement;
+ last_statement = sub_statement;
}
if(token.type == '}') {
next_token();
} else {
- errorf(compound_statement->statement.source_position, "end of file while looking for closing '}'");
+ errorf(statement->base.source_position,
+ "end of file while looking for closing '}'");
}
- assert(scope == &compound_statement->scope);
+ assert(scope == &statement->compound.scope);
set_scope(last_scope);
environment_pop_to(top);
- return (statement_t*) compound_statement;
+ return statement;
}
/**
}
/**
- * Check for unused functions in the given scope.
+ * Check for unused global static functions and variables
*/
-static void check_unused_functions(const scope_t *scope) {
- bool first_err = true;
- const declaration_t *declaration = scope->declarations;
+static void check_unused_globals(void)
+{
+ if (!warning.unused_function && !warning.unused_variable)
+ return;
- for (; declaration != NULL; declaration = declaration->next) {
- if (! declaration->used) {
- if (declaration->storage_class == STORAGE_CLASS_STATIC) {
- const type_t *type = declaration->type;
+ for (const declaration_t *decl = global_scope->declarations; decl != NULL; decl = decl->next) {
+ if (decl->used || decl->storage_class != STORAGE_CLASS_STATIC)
+ continue;
- if (is_type_function(type)) {
- if (first_err) {
- first_err = false;
- diagnosticf("%s: At top level:\n",
- declaration->source_position.input_name);
- }
- warningf(declaration->source_position,
- "'%Y' defined but not used",
- declaration->symbol);
- }
- }
+ type_t *const type = decl->type;
+ const char *s;
+ if (is_type_function(skip_typeref(type))) {
+ if (!warning.unused_function || decl->is_inline)
+ continue;
+
+ s = (decl->init.statement != NULL ? "defined" : "declared");
+ } else {
+ if (!warning.unused_variable)
+ continue;
+
+ s = "defined";
}
+
+ warningf(decl->source_position, "'%#T' %s but not used",
+ type, decl->symbol, s);
}
}
last_declaration = NULL;
assert(global_scope == &unit->scope);
- if (warning.unused_function) {
- check_unused_functions(global_scope);
- }
+ check_unused_globals();
global_scope = NULL;
return unit;
*/
void init_parser(void)
{
+ if(c_mode & _MS) {
+ /* add predefined symbols for extended-decl-modifier */
+ sym_align = symbol_table_insert("align");
+ sym_allocate = symbol_table_insert("allocate");
+ sym_dllimport = symbol_table_insert("dllimport");
+ sym_dllexport = symbol_table_insert("dllexport");
+ sym_naked = symbol_table_insert("naked");
+ sym_noinline = symbol_table_insert("noinline");
+ sym_noreturn = symbol_table_insert("noreturn");
+ sym_nothrow = symbol_table_insert("nothrow");
+ sym_novtable = symbol_table_insert("novtable");
+ sym_property = symbol_table_insert("property");
+ sym_get = symbol_table_insert("get");
+ sym_put = symbol_table_insert("put");
+ sym_selectany = symbol_table_insert("selectany");
+ sym_thread = symbol_table_insert("thread");
+ sym_uuid = symbol_table_insert("uuid");
+ sym_deprecated = symbol_table_insert("deprecated");
+ }
init_expression_parsers();
obstack_init(&temp_obst);
projects / cparser / blobdiff