struct declaration_specifiers_t {
source_position_t source_position;
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. */
- initializer_t *initializer; /**< initializer will be filled in here */
- declaration_t *declaration; /**< the declaration that is initialized */
+ declaration_t *declaration; /**< the declaration that is initialized if any */
bool must_be_constant;
} parse_initializer_env_t;
static label_statement_t *label_last = NULL;
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;
+static const symbol_t *sym_restrict = NULL;
+static const symbol_t *sym_noalias = NULL;
+
+/** The token anchor set */
+static unsigned char token_anchor_set[T_LAST_TOKEN];
+
/** The current source position. */
#define HERE token.source_position
static declaration_t *allocate_declaration_zero(void)
{
declaration_t *declaration = allocate_ast_zero(sizeof(declaration_t));
- declaration->type = type_error_type;
+ declaration->type = type_error_type;
+ declaration->alignment = 0;
return declaration;
}
static size_t get_statement_struct_size(statement_kind_t kind)
{
static const size_t sizes[] = {
+ [STATEMENT_INVALID] = sizeof(invalid_statement_t),
+ [STATEMENT_EMPTY] = sizeof(empty_statement_t),
[STATEMENT_COMPOUND] = sizeof(compound_statement_t),
[STATEMENT_RETURN] = sizeof(return_statement_t),
[STATEMENT_DECLARATION] = sizeof(declaration_statement_t),
return res;
}
+/**
+ * Creates a new invalid statement.
+ */
+static statement_t *create_invalid_statement(void)
+{
+ statement_t *statement = allocate_statement_zero(STATEMENT_INVALID);
+ statement->base.source_position = token.source_position;
+ return statement;
+}
+
+/**
+ * Allocate a new empty statement.
+ */
+static statement_t *create_empty_statement(void)
+{
+ statement_t *statement = allocate_statement_zero(STATEMENT_EMPTY);
+ statement->base.source_position = token.source_position;
+ return statement;
+}
+
/**
* Returns the size of an expression node.
*
[EXPR_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_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),
return ARR_LEN(label_stack);
}
-
/**
* Return the next token.
*/
return &lookahead_buffer[pos];
}
+/**
+ * Adds a token to the token anchor set (a multi-set).
+ */
+static void add_anchor_token(int token_type) {
+ assert(0 <= token_type && token_type < T_LAST_TOKEN);
+ ++token_anchor_set[token_type];
+}
+
+/**
+ * Remove a token from the token anchor set (a multi-set).
+ */
+static void rem_anchor_token(int token_type) {
+ assert(0 <= token_type && token_type < T_LAST_TOKEN);
+ --token_anchor_set[token_type];
+}
+
+static bool at_anchor(void) {
+ if(token.type < 0)
+ return false;
+ return token_anchor_set[token.type];
+}
+
+/**
+ * Eat tokens until a matching token is found.
+ */
+static void eat_until_matching_token(int type) {
+ unsigned parenthesis_count = 0;
+ unsigned brace_count = 0;
+ unsigned bracket_count = 0;
+ int end_token = type;
+
+ if(type == '(')
+ end_token = ')';
+ else if(type == '{')
+ end_token = '}';
+ else if(type == '[')
+ end_token = ']';
+
+ while(token.type != end_token ||
+ (parenthesis_count > 0 || brace_count > 0 || bracket_count > 0)) {
+
+ switch(token.type) {
+ case T_EOF: return;
+ case '(': ++parenthesis_count; break;
+ case '{': ++brace_count; break;
+ case '[': ++bracket_count; break;
+ case ')':
+ if(parenthesis_count > 0)
+ --parenthesis_count;
+ break;
+ case '}':
+ if(brace_count > 0)
+ --brace_count;
+ break;
+ case ']':
+ if(bracket_count > 0)
+ --bracket_count;
+ break;
+ default:
+ break;
+ }
+ next_token();
+ }
+}
+
+/**
+ * Eat input tokens until an anchor is found.
+ */
+static void eat_until_anchor(void) {
+ if(token.type == T_EOF)
+ return;
+ while(token_anchor_set[token.type] == 0) {
+ if(token.type == '(' || token.type == '{' || token.type == '[')
+ eat_until_matching_token(token.type);
+ if(token.type == T_EOF)
+ break;
+ next_token();
+ }
+}
+
+static void eat_block(void) {
+ eat_until_matching_token('{');
+ if(token.type == '}')
+ next_token();
+}
+
+/**
+ * eat all token until a ';' is reached
+ * or a stop token is found.
+ */
+static void eat_statement(void) {
+ eat_until_matching_token(';');
+ if(token.type == ';')
+ next_token();
+}
+
#define eat(token_type) do { assert(token.type == token_type); next_token(); } while(0)
/**
}
va_list ap;
va_start(ap, message);
- errorf(HERE, "got %K, expected %#k", &token, &ap, ", ");
+ errorf(HERE, "got %K, expected %#k", &token, &ap, "a ");
va_end(ap);
}
errorf(source_position, "%s, incompatible types: '%T' - '%T'", msg, type1, type2);
}
-/**
- * Eat an complete block, ie. '{ ... }'.
- */
-static void eat_block(void)
-{
- if(token.type == '{')
- next_token();
-
- while(token.type != '}') {
- if(token.type == T_EOF)
- return;
- if(token.type == '{') {
- eat_block();
- continue;
- }
- next_token();
- }
- eat('}');
-}
-
-/**
- * Eat a statement until an ';' token.
- */
-static void eat_statement(void)
-{
- while(token.type != ';') {
- if(token.type == T_EOF)
- return;
- if(token.type == '}')
- return;
- if(token.type == '{') {
- eat_block();
- continue;
- }
- next_token();
- }
- eat(';');
-}
-
-/**
- * Eat a parenthesed term, ie. '( ... )'.
- */
-static void eat_paren(void)
-{
- if(token.type == '(')
- next_token();
-
- while(token.type != ')') {
- if(token.type == T_EOF)
- return;
- if(token.type == ')' || token.type == ';' || token.type == '}') {
- return;
- }
- if(token.type == ')') {
- next_token();
- return;
- }
- if(token.type == '(') {
- eat_paren();
- continue;
- }
- if(token.type == '{') {
- eat_block();
- continue;
- }
- next_token();
- }
-}
-
/**
* Expect the the current token is the expected token.
* If not, generate an error, eat the current statement,
do { \
if(UNLIKELY(token.type != (expected))) { \
parse_error_expected(NULL, (expected), 0); \
- eat_statement(); \
+ add_anchor_token(expected); \
+ eat_until_anchor(); \
+ rem_anchor_token(expected); \
goto end_error; \
} \
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(); \
- } while(0)
-
-#define expect_void(expected) \
- do { \
- if(UNLIKELY(token.type != (expected))) { \
- parse_error_expected(NULL, (expected), 0); \
- eat_statement(); \
- return; \
- } \
- next_token(); \
- } while(0)
-
static void set_scope(scope_t *new_scope)
{
if(scope != NULL) {
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);
- eat_paren();
+ eat_until_matching_token('(');
break;
} else {
parse_string_literals();
}
- expect_void(')');
+ expect(')');
break;
default:
goto attributes_finished;
}
}
+end_error:
attributes_finished:
;
}
designator = allocate_ast_zero(sizeof(designator[0]));
designator->source_position = token.source_position;
next_token();
+ add_anchor_token(']');
designator->array_index = parse_constant_expression();
+ rem_anchor_token(']');
expect(']');
break;
case '.':
return initializer;
}
+/**
+ * Build an initializer from a given expression.
+ */
static initializer_t *initializer_from_expression(type_t *orig_type,
expression_t *expression)
{
return initializer;
}
+/**
+ * An entry in the type path.
+ */
typedef struct type_path_entry_t type_path_entry_t;
struct type_path_entry_t {
- type_t *type;
+ type_t *type; /**< the upper top type. restored to path->top_tye if this entry is popped. */
union {
- size_t index;
- declaration_t *compound_entry;
+ 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;
+ 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 */
- bool invalid;
};
+/**
+ * Prints a type path for debugging.
+ */
static __attribute__((unused)) void debug_print_type_path(
const type_path_t *path)
{
size_t len = ARR_LEN(path->path);
- if(path->invalid) {
- fprintf(stderr, "invalid path");
- return;
- }
-
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->symbol->string) {
+ if(entry->v.compound_entry == NULL) {
assert(i == len-1);
continue;
}
fprintf(stderr, "-INVALID-");
}
}
- if (path->top_type != NULL) {
+ if(path->top_type != NULL) {
fprintf(stderr, " (");
print_type(path->top_type);
fprintf(stderr, ")");
}
}
+/**
+ * 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)
{
size_t len = ARR_LEN(path->path);
assert(len > 0);
- return & path->path[len-1];
+ 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);
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;
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) {
- top->v.compound_entry = entry;
- path->top_type = entry->type;
+ path->top_type = entry->type;
} else {
- top->v.compound_entry = NULL;
- path->top_type = NULL;
+ path->top_type = NULL;
}
} else {
assert(is_type_array(top_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);
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);
- assert(len >= top_path_level);
while(len > top_path_level) {
ascend_from_subtype(path);
descend_into_subtype(path);
}
}
-
- path->invalid = false;
return true;
failed:
static void advance_current_object(type_path_t *path, size_t top_path_level)
{
- if(path->invalid)
- return;
-
type_path_entry_t *top = get_type_path_top(path);
type_t *type = skip_typeref(top->type);
ascend_from_subtype(path);
advance_current_object(path, top_path_level);
} else {
- path->invalid = true;
+ 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();
+ }
+}
+
+/**
+ * skip any {...} blocks until a closing braket is reached.
+ */
static void skip_initializers(void)
{
if(token.type == '{')
}
}
+static initializer_t *create_empty_initializer(void)
+{
+ static initializer_t empty_initializer
+ = { .list = { { INITIALIZER_LIST }, 0 } };
+ return &empty_initializer;
+}
+
+/**
+ * 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)
{
- type_t *orig_type = path->top_type;
-
- if(orig_type == NULL) {
- /* We don't have declarations in this scope. Issue an error and skip
- * initializers in this case. */
- if (env->declaration != NULL)
- warningf(HERE, "excess elements in struct initializer for '%Y'",
- env->declaration->symbol);
- else
- warningf(HERE, "excess elements in struct initializer");
- skip_initializers();
- return NULL;
+ if(token.type == '}') {
+ /* empty initializer */
+ return create_empty_initializer();
}
- type_t *type = skip_typeref(orig_type);
+ type_t *orig_type = path->top_type;
+ type_t *type = NULL;
- /* 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;
+ 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 create_empty_initializer();
+ }
}
initializer_t **initializers = NEW_ARR_F(initializer_t*, 0);
initializer_t *sub;
if(token.type == '{') {
- if(is_type_scalar(type)) {
+ if(type != NULL && is_type_scalar(type)) {
sub = parse_scalar_initializer(type, env->must_be_constant);
} else {
eat('{');
- descend_into_subtype(path);
-
+ 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);
+
+ add_anchor_token('}');
sub = parse_sub_initializer(path, orig_type, top_path_level+1,
env);
+ rem_anchor_token('}');
- ascend_from_subtype(path);
-
- expect_block('}');
+ if(type != NULL) {
+ ascend_from_subtype(path);
+ expect('}');
+ } else {
+ expect('}');
+ goto error_parse_next;
+ }
}
} else {
/* must be an expression */
expression);
}
+ if(type == NULL) {
+ /* we are already outside, ... */
+ goto error_excess;
+ }
+
/* handle { "string" } special case */
if((expression->kind == EXPR_STRING_LITERAL
|| expression->kind == EXPR_WIDE_STRING_LITERAL)
path->max_index = index;
}
- /* append to initializers list */
- ARR_APP1(initializer_t*, initializers, sub);
+ 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");
+ }
+error_parse_next:
if(token.type == '}') {
break;
}
break;
}
- advance_current_object(path, top_path_level);
- orig_type = path->top_type;
- type = skip_typeref(orig_type);
+ 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);
memcpy(&result->list.initializers, initializers,
len * sizeof(initializers[0]));
+ DEL_ARR_F(initializers);
ascend_to(path, top_path_level);
return result;
}
/**
- * Parses an initializer.
+ * Parses an initializer. Parsers either a compound literal
+ * (env->declaration == NULL) or an initializer of a declaration.
*/
-static void parse_initializer(parse_initializer_env_t *env)
+static initializer_t *parse_initializer(parse_initializer_env_t *env)
{
type_t *type = skip_typeref(env->type);
initializer_t *result = NULL;
descend_into_subtype(&path);
+ add_anchor_token('}');
result = parse_sub_initializer(&path, env->type, 1, env);
+ rem_anchor_token('}');
max_index = path.max_index;
DEL_ARR_F(path.path);
- expect_void('}');
+ expect('}');
} else {
- /* parse_scalar_initializer also works in this case: we simply
+ /* 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);
}
break;
default:
- panic("invalid initializer type");
+ internal_errorf(HERE, "invalid initializer type");
}
expression_t *cnst = allocate_expression_zero(EXPR_CONST);
env->type = new_type;
}
- env->initializer = result;
+ return result;
+end_error:
+ return NULL;
}
static declaration_t *append_declaration(declaration_t *declaration);
return;
}
+ add_anchor_token('}');
do {
if(token.type != T_IDENTIFIER) {
parse_error_expected("while parsing enum entry", T_IDENTIFIER, 0);
eat_block();
+ rem_anchor_token('}');
return;
}
break;
next_token();
} while(token.type != '}');
+ rem_anchor_token('}');
+
+ expect('}');
- expect_void('}');
+end_error:
+ ;
}
static type_t *parse_enum_specifier(void)
type_t *type;
expect('(');
+ add_anchor_token(')');
expression_t *expression = NULL;
break;
}
+ rem_anchor_token(')');
expect(')');
type_t *typeof_type = allocate_type_zero(TYPE_TYPEOF, expression->base.source_position);
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)
+{
+ decl_modifiers_t *modifiers = &specifiers->decl_modifiers;
+
+ while(true) {
+ if(token.type == T_restrict) {
+ next_token();
+ DET_MOD(restrict, DM_RESTRICT);
+ goto end_loop;
+ } else if(token.type != T_IDENTIFIER)
+ break;
+ symbol_t *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 if(symbol == sym_noalias) {
+ next_token();
+ DET_MOD(noalias, DM_NOALIAS);
+ } else {
+ warningf(HERE, "Unknown modifier %Y ignored", token.v.symbol);
+ next_token();
+ if(token.type == '(')
+ skip_until(')');
+ }
+end_loop:
+ if (token.type == ',')
+ next_token();
+ }
+end_error:
+ return;
+}
+
static void parse_declaration_specifiers(declaration_specifiers_t *specifiers)
{
type_t *type = NULL;
MATCH_STORAGE_CLASS(T_auto, STORAGE_CLASS_AUTO)
MATCH_STORAGE_CLASS(T_register, STORAGE_CLASS_REGISTER)
+ case T_declspec:
+ next_token();
+ expect('(');
+ add_anchor_token(')');
+ parse_microsoft_extended_decl_modifier(specifiers);
+ rem_anchor_token(')');
+ expect(')');
+ break;
+
case T___thread:
switch (specifiers->declared_storage_class) {
case STORAGE_CLASS_NONE:
}
specifiers->type = result;
+end_error:
+ return;
}
static type_qualifiers_t parse_type_qualifiers(void)
static construct_type_t *parse_array_declarator(void)
{
eat('[');
+ add_anchor_token(']');
parsed_array_t *array = obstack_alloc(&temp_obst, sizeof(array[0]));
memset(array, 0, sizeof(array[0]));
array->size = parse_assignment_expression();
}
+ rem_anchor_token(']');
expect(']');
return (construct_type_t*) array;
static construct_type_t *parse_function_declarator(declaration_t *declaration)
{
eat('(');
+ add_anchor_token(')');
type_t *type;
if(declaration != NULL) {
construct_function_type->construct_type.kind = CONSTRUCT_FUNCTION;
construct_function_type->function_type = type;
+ rem_anchor_token(')');
expect(')');
- return (construct_type_t*) construct_function_type;
end_error:
- return NULL;
+ return (construct_type_t*) construct_function_type;
}
static construct_type_t *parse_inner_declarator(declaration_t *declaration,
break;
case '(':
next_token();
+ add_anchor_token(')');
inner_types = parse_inner_declarator(declaration, may_be_abstract);
+ rem_anchor_token(')');
expect(')');
break;
default:
for( ; iter != NULL; iter = iter->next) {
switch(iter->kind) {
case CONSTRUCT_INVALID:
- panic("invalid type construction found");
+ internal_errorf(HERE, "invalid type construction found");
case CONSTRUCT_FUNCTION: {
construct_function_type_t *construct_function_type
= (construct_function_type_t*) iter;
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;
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);
type_t *const type = specifiers->type;
errorf(previous_declaration->source_position,
"previous declaration of '%Y' was here", symbol);
} else {
- unsigned old_storage_class
- = previous_declaration->storage_class;
+ 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;
if(is_type_incomplete(prev_type)) {
env.type = orig_type;
env.must_be_constant = must_be_constant;
env.declaration = declaration;
- parse_initializer(&env);
+
+ initializer_t *initializer = parse_initializer(&env);
if(env.type != orig_type) {
orig_type = env.type;
"initializers not allowed for function types at declator '%Y' (type '%T')",
declaration->symbol, orig_type);
} else {
- declaration->init.initializer = env.initializer;
+ declaration->init.initializer = initializer;
}
}
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->declared_storage_class != STORAGE_CLASS_NONE) {
warningf(declaration->source_position, "useless storage class in empty declaration");
const declaration_specifiers_t *specifiers,
parsed_declaration_func finished_declaration)
{
+ add_anchor_token(';');
+ add_anchor_token('=');
+ add_anchor_token(',');
while(true) {
declaration_t *declaration = finished_declaration(ndeclaration);
ndeclaration = parse_declarator(specifiers, /*may_be_abstract=*/false);
}
- expect_void(';');
+ expect(';');
+
+end_error:
+ rem_anchor_token(';');
+ rem_anchor_token('=');
+ rem_anchor_token(',');
}
static declaration_t *finished_kr_declaration(declaration_t *declaration)
* specifiers */
declaration_specifiers_t specifiers;
memset(&specifiers, 0, sizeof(specifiers));
+
+ add_anchor_token(';');
parse_declaration_specifiers(&specifiers);
+ rem_anchor_token(';');
/* must be a declaration */
if(token.type == ';') {
return;
}
+ add_anchor_token(',');
+ add_anchor_token('=');
+ rem_anchor_token(';');
+
/* declarator is common to both function-definitions and declarations */
declaration_t *ndeclaration = parse_declarator(&specifiers, /*may_be_abstract=*/false);
+ rem_anchor_token(',');
+ rem_anchor_token('=');
+ rem_anchor_token(';');
+
/* must be a declaration */
if(token.type == ',' || token.type == '=' || token.type == ';') {
parse_declaration_rest(ndeclaration, &specifiers, record_declaration);
if(token.type != '{') {
parse_error_expected("while parsing function definition", '{', 0);
- eat_statement();
+ eat_until_matching_token(';');
return;
}
break;
next_token();
}
- expect_void(';');
+ expect(';');
+
+end_error:
+ ;
}
static void parse_compound_type_entries(declaration_t *compound_declaration)
{
eat('{');
+ add_anchor_token('}');
while(token.type != '}' && token.type != T_EOF) {
declaration_specifiers_t specifiers;
parse_compound_declarators(compound_declaration, &specifiers);
}
+ rem_anchor_token('}');
+
if(token.type == T_EOF) {
errorf(HERE, "EOF while parsing struct");
}
case T___builtin_va_end:
return make_function_1_type(type_void, type_valist);
default:
- panic("not implemented builtin symbol found");
+ internal_errorf(HERE, "not implemented builtin symbol found");
}
}
env.type = type;
env.declaration = NULL;
env.must_be_constant = false;
- parse_initializer(&env);
+ initializer_t *initializer = parse_initializer(&env);
type = env.type;
+ expression->compound_literal.initializer = initializer;
expression->compound_literal.type = type;
- expression->compound_literal.initializer = env.initializer;
expression->base.type = automatic_type_conversion(type);
return expression;
type_t *type = parse_typename();
+ /* matching add_anchor_token() is at call site */
+ rem_anchor_token(')');
expect(')');
if(token.type == '{') {
static expression_t *parse_brace_expression(void)
{
eat('(');
+ add_anchor_token(')');
switch(token.type) {
case '{':
}
expression_t *result = parse_expression();
+ rem_anchor_token(')');
expect(')');
return result;
if(token.type != T_IDENTIFIER) {
parse_error_expected("while parsing member designator",
T_IDENTIFIER, 0);
- eat_paren();
return NULL;
}
result->symbol = token.v.symbol;
if(token.type != T_IDENTIFIER) {
parse_error_expected("while parsing member designator",
T_IDENTIFIER, 0);
- eat_paren();
return NULL;
}
designator_t *designator = allocate_ast_zero(sizeof(result[0]));
}
if(token.type == '[') {
next_token();
+ add_anchor_token(']');
designator_t *designator = allocate_ast_zero(sizeof(result[0]));
designator->source_position = HERE;
designator->array_index = parse_expression();
+ rem_anchor_token(']');
+ expect(']');
if(designator->array_index == NULL) {
- eat_paren();
return NULL;
}
- expect(']');
last_designator->next = designator;
last_designator = designator;
expression->base.type = type_size_t;
expect('(');
+ add_anchor_token(',');
type_t *type = parse_typename();
+ rem_anchor_token(',');
expect(',');
+ add_anchor_token(')');
designator_t *designator = parse_designator();
+ rem_anchor_token(')');
expect(')');
expression->offsetofe.type = type;
expression_t *expression = allocate_expression_zero(EXPR_VA_START);
expect('(');
+ add_anchor_token(',');
expression->va_starte.ap = parse_assignment_expression();
+ rem_anchor_token(',');
expect(',');
expression_t *const expr = parse_assignment_expression();
if (expr->kind == EXPR_REFERENCE) {
expression_t *expression = allocate_expression_zero(EXPR_BUILTIN_CONSTANT_P);
expect('(');
+ add_anchor_token(')');
expression->builtin_constant.value = parse_assignment_expression();
+ rem_anchor_token(')');
expect(')');
expression->base.type = type_int;
expression_t *expression = allocate_expression_zero(EXPR_BUILTIN_PREFETCH);
expect('(');
+ add_anchor_token(')');
expression->builtin_prefetch.adr = parse_assignment_expression();
if (token.type == ',') {
next_token();
next_token();
expression->builtin_prefetch.locality = parse_assignment_expression();
}
+ rem_anchor_token(')');
expect(')');
expression->base.type = type_void;
expression = allocate_expression_zero(EXPR_BINARY_ISUNORDERED);
break;
default:
- panic("invalid compare builtin found");
+ internal_errorf(HERE, "invalid compare builtin found");
break;
}
expression->base.source_position = HERE;
= allocate_expression_zero(EXPR_UNARY_ASSUME);
expect('(');
+ add_anchor_token(')');
expression->unary.value = parse_assignment_expression();
+ rem_anchor_token(')');
expect(')');
expression->base.type = type_void;
}
errorf(HERE, "unexpected token %K, expected an expression", &token);
- eat_statement();
-
return create_invalid_expression();
}
(void) precedence;
eat('[');
+ add_anchor_token(']');
expression_t *inside = parse_expression();
array_access->array_ref = create_invalid_expression();
}
+ rem_anchor_token(']');
if(token.type != ']') {
parse_error_expected("Problem while parsing array access", ']', 0);
return expression;
if(token.type == '(' && is_declaration_specifier(look_ahead(1), true)) {
next_token();
+ add_anchor_token(')');
tp_expression->typeprop.type = parse_typename();
+ rem_anchor_token(')');
expect(')');
} else {
expression_t *expression = parse_sub_expression(precedence);
/* parse arguments */
eat('(');
+ add_anchor_token(')');
+ add_anchor_token(',');
if(token.type != ')') {
call_argument_t *last_argument = NULL;
next_token();
}
}
+ rem_anchor_token(',');
+ rem_anchor_token(')');
expect(')');
if(function_type != NULL) {
} else {
check_format(&result->call);
}
+
+ /* check deprecated */
+ if(expression->base.kind == EXPR_REFERENCE) {
+ const reference_expression_t *ref = (reference_expression_t *)expression;
+ const declaration_t *declaration = ref->declaration;
+ if(declaration->modifiers & DM_DEPRECATED) {
+ if (declaration->deprecated_string != NULL) {
+ warningf(result->base.source_position,
+ "function '%Y' was declared 'deprecated(%s)'", declaration->symbol,
+ declaration->deprecated_string);
+ } else {
+ warningf(result->base.source_position,
+ "function '%Y' was declared 'deprecated'", declaration->symbol);
+ }
+ }
+ }
}
return result;
expression_t *expression)
{
eat('?');
+ add_anchor_token(':');
expression_t *result = allocate_expression_zero(EXPR_CONDITIONAL);
}
expression_t *true_expression = parse_expression();
+ rem_anchor_token(':');
expect(':');
expression_t *false_expression = parse_sub_expression(precedence);
result->base.type = type_int;
expect('(');
+ add_anchor_token(')');
expression_t *expression = parse_sub_expression(precedence);
+ rem_anchor_token(')');
expect(')');
result->classify_type.type_expression = expression;
case EXPR_BINARY_ISUNORDERED: return false;
}
- panic("unexpected expression");
+ internal_errorf(HERE, "unexpected expression");
}
static void semantic_comma(binary_expression_t *expression)
}
expect('(');
+ add_anchor_token(')');
+ add_anchor_token(':');
asm_statement->asm_text = parse_string_literals();
- if(token.type != ':')
+ if(token.type != ':') {
+ rem_anchor_token(':');
goto end_of_asm;
+ }
eat(':');
asm_statement->inputs = parse_asm_constraints();
- if(token.type != ':')
+ if(token.type != ':') {
+ rem_anchor_token(':');
goto end_of_asm;
+ }
eat(':');
asm_statement->outputs = parse_asm_constraints();
- if(token.type != ':')
+ if(token.type != ':') {
+ rem_anchor_token(':');
goto end_of_asm;
+ }
+ rem_anchor_token(':');
eat(':');
asm_statement->clobbers = parse_asm_clobbers();
end_of_asm:
+ rem_anchor_token(')');
expect(')');
expect(';');
return statement;
end_error:
- return NULL;
+ return create_invalid_statement();
}
/**
return statement;
end_error:
- return NULL;
+ return create_invalid_statement();
}
/**
return statement;
end_error:
- return NULL;
+ return create_invalid_statement();
}
/**
if(token.type == '}') {
/* TODO only warn? */
- errorf(HERE, "label at end of compound statement");
+ if(false) {
+ warningf(HERE, "label at end of compound statement");
+ statement->label.statement = create_empty_statement();
+ } else {
+ errorf(HERE, "label at end of compound statement");
+ statement->label.statement = create_invalid_statement();
+ }
return statement;
} else {
if (token.type == ';') {
/* eat an empty statement here, to avoid the warning about an empty
* after a label. label:; is commonly used to have a label before
* a }. */
+ statement->label.statement = create_empty_statement();
next_token();
} else {
statement->label.statement = parse_statement();
statement->base.source_position = token.source_position;
expect('(');
+ add_anchor_token(')');
statement->ifs.condition = parse_expression();
+ rem_anchor_token(')');
expect(')');
+ add_anchor_token(T_else);
statement->ifs.true_statement = parse_statement();
+ rem_anchor_token(T_else);
+
if(token.type == T_else) {
next_token();
statement->ifs.false_statement = parse_statement();
return statement;
end_error:
- return NULL;
+ return create_invalid_statement();
}
/**
return statement;
end_error:
- return NULL;
+ return create_invalid_statement();
}
static statement_t *parse_loop_body(statement_t *const loop)
statement->base.source_position = token.source_position;
expect('(');
+ add_anchor_token(')');
statement->whiles.condition = parse_expression();
+ rem_anchor_token(')');
expect(')');
statement->whiles.body = parse_loop_body(statement);
return statement;
end_error:
- return NULL;
+ return create_invalid_statement();
}
/**
statement->base.source_position = token.source_position;
+ add_anchor_token(T_while);
statement->do_while.body = parse_loop_body(statement);
+ rem_anchor_token(T_while);
expect(T_while);
expect('(');
+ add_anchor_token(')');
statement->do_while.condition = parse_expression();
+ rem_anchor_token(')');
expect(')');
expect(';');
return statement;
end_error:
- return NULL;
+ return create_invalid_statement();
}
/**
statement_t *statement = allocate_statement_zero(STATEMENT_FOR);
statement->base.source_position = token.source_position;
- expect('(');
-
int top = environment_top();
scope_t *last_scope = scope;
set_scope(&statement->fors.scope);
+ expect('(');
+ add_anchor_token(')');
+
if(token.type != ';') {
if(is_declaration_specifier(&token, false)) {
parse_declaration(record_declaration);
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");
+ warningf(init->base.source_position,
+ "initialisation of 'for'-statement has no effect");
}
expect(';');
}
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");
+ warningf(step->base.source_position,
+ "step of 'for'-statement has no effect");
}
}
+ rem_anchor_token(')');
expect(')');
statement->fors.body = parse_loop_body(statement);
environment_pop_to(top);
return statement;
+
end_error:
- return NULL;
+ rem_anchor_token(')');
+ assert(scope == &statement->fors.scope);
+ set_scope(last_scope);
+ environment_pop_to(top);
+
+ return create_invalid_statement();
}
/**
return statement;
end_error:
- return NULL;
+ return create_invalid_statement();
}
/**
return statement;
end_error:
- return NULL;
+ return create_invalid_statement();
}
/**
return statement;
end_error:
- return NULL;
+ return create_invalid_statement();
}
/**
return statement;
end_error:
- return NULL;
+ return create_invalid_statement();
}
/**
return statement;
end_error:
- return NULL;
+ return create_invalid_statement();
}
/**
statement_t *statement = NULL;
/* declaration or statement */
+ add_anchor_token(';');
switch(token.type) {
case T_asm:
statement = parse_asm_statement();
break;
case ';':
- if (warning.empty_statement) {
+ if(warning.empty_statement) {
warningf(HERE, "statement is empty");
}
+ statement = create_empty_statement();
next_token();
- statement = NULL;
break;
case T_IDENTIFIER:
statement = parse_expression_statement();
break;
}
+ rem_anchor_token(';');
- assert(statement == NULL
- || statement->base.source_position.input_name != NULL);
+ assert(statement != NULL
+ && statement->base.source_position.input_name != NULL);
return statement;
}
statement->base.source_position = token.source_position;
eat('{');
+ add_anchor_token('}');
int top = environment_top();
scope_t *last_scope = scope;
while(token.type != '}' && token.type != T_EOF) {
statement_t *sub_statement = parse_statement();
- if(sub_statement == NULL)
+ if(is_invalid_statement(sub_statement)) {
+ /* an error occurred. if we are at an anchor, return */
+ if(at_anchor())
+ goto end_error;
continue;
+ }
if(last_statement != NULL) {
last_statement->base.next = sub_statement;
"end of file while looking for closing '}'");
}
+end_error:
+ rem_anchor_token('}');
assert(scope == &statement->compound.scope);
set_scope(last_scope);
environment_pop_to(top);
DEL_ARR_F(environment_stack);
DEL_ARR_F(label_stack);
- if(error_count > 0)
- return 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");
+ sym_restrict = symbol_table_insert("restrict");
+ sym_noalias = symbol_table_insert("noalias");
+ }
+ memset(token_anchor_set, 0, sizeof(token_anchor_set));
+
init_expression_parsers();
obstack_init(&temp_obst);
projects / cparser / blobdiff