From 062a2c63e16c31cd68f758ec8946b9cd3bfe4d34 Mon Sep 17 00:00:00 2001 From: Ginger Bill Date: Sun, 18 Dec 2016 16:17:45 +0000 Subject: [PATCH] Very minor style changes --- src/checker/expr.c | 5 ++--- src/parser.c | 3 ++- src/ssa.c | 3 ++- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/checker/expr.c b/src/checker/expr.c index 08d5ac3ff..1ca4b6e33 100644 --- a/src/checker/expr.c +++ b/src/checker/expr.c @@ -4455,10 +4455,9 @@ void check_expr_or_type(Checker *c, Operand *o, AstNode *e) { check_not_tuple(c, o); if (o->mode == Addressing_NoValue) { gbString str = expr_to_string(o->expr); - error_node(o->expr, - "`%s` used as value or type", str); - o->mode = Addressing_Invalid; + error_node(o->expr, "`%s` used as value or type", str); gb_string_free(str); + o->mode = Addressing_Invalid; } } diff --git a/src/parser.c b/src/parser.c index b12da1feb..f2e61bfc4 100644 --- a/src/parser.c +++ b/src/parser.c @@ -1602,8 +1602,9 @@ AstNode *parse_call_expr(AstFile *f, AstNode *operand) { while (f->curr_token.kind != Token_CloseParen && f->curr_token.kind != Token_EOF && ellipsis.pos.line == 0) { - if (f->curr_token.kind == Token_Comma) + if (f->curr_token.kind == Token_Comma) { syntax_error(f->curr_token, "Expected an expression not a ,"); + } if (f->curr_token.kind == Token_Ellipsis) { ellipsis = f->curr_token; diff --git a/src/ssa.c b/src/ssa.c index 95a7a58ef..c86df0969 100644 --- a/src/ssa.c +++ b/src/ssa.c @@ -4842,7 +4842,8 @@ String ssa_mangle_name(ssaGen *s, String path, String name) { ssaValue *ssa_get_type_info_ptr(ssaProcedure *proc, ssaValue *type_info_data, Type *type) { i32 index = cast(i32)ssa_type_info_index(proc->module->info, type); // gb_printf_err("%d %s\n", index, type_to_string(type)); - return ssa_emit_array_epi(proc, type_info_data, index); + ssaValue *ptr = ssa_emit_array_epi(proc, type_info_data, index); + return ssa_emit_bitcast(proc, ptr, t_type_info_ptr); } ssaValue *ssa_type_info_member_offset(ssaProcedure *proc, ssaValue *data, isize count, i32 *index) {