diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/analyze.c | 26 | ||||
| -rw-r--r-- | src/lower.c | 1 | ||||
| -rw-r--r-- | src/move.c | 11 |
3 files changed, 38 insertions, 0 deletions
diff --git a/src/analyze.c b/src/analyze.c index dd85c08..8e76892 100644 --- a/src/analyze.c +++ b/src/analyze.c @@ -273,6 +273,31 @@ static int analyze_ref(struct state *state, struct scope *scope, return 0; } +static int analyze_deref(struct state *state, struct scope *scope, + struct ast *node) +{ + struct ast *expr = deref_base(node); + if (analyze(state, scope, expr)) + return -1; + + if (expr->t->k == TYPE_PTR) { + semantic_error(node->scope, node, + "deref of raw ptr not allowed"); + semantic_info(node->scope, node, + "use fwd_null() to convert to ref"); + return -1; + } + + if (expr->t->k != TYPE_REF) { + semantic_error(node->scope, node, + "deref of something not a reference"); + return -1; + } + + node->t = tptr_base(expr->t); + return 0; +} + static int analyze_id(struct state *state, struct scope *scope, struct ast *node) { @@ -443,6 +468,7 @@ static int analyze(struct state *state, struct scope *scope, struct ast *node) case AST_PROC_DEF: ret = analyze_proc(state, scope, node); break; case AST_VAR_DEF: ret = analyze_var(state, scope, node); break; case AST_BLOCK: ret = analyze_block(state, scope, node); break; + case AST_DEREF: ret = analyze_deref(state, scope, node); break; case AST_INIT: ret = analyze_init(state, scope, node); break; case AST_CALL: ret = analyze_call(state, scope, node); break; case AST_REF: ret = analyze_ref(state, scope, node); break; diff --git a/src/lower.c b/src/lower.c index 9f806f3..df095e4 100644 --- a/src/lower.c +++ b/src/lower.c @@ -248,6 +248,7 @@ static int lower_expr(struct state *state, struct ast *expr) case AST_INIT: return lower_init(state, expr); case AST_CLOSURE: return lower_closure(state, expr); case AST_REF: return lower_expr(state, ref_base(expr)); + case AST_DEREF: return lower_expr(state, deref_base(expr)); default: internal_error("missing expr lowering"); return -1; @@ -175,6 +175,13 @@ static int mvcheck_ref(struct state *state, struct ast *node) return refcheck(state, ref_base(node)); } +static int mvcheck_deref(struct state *state, struct ast *node) +{ + /** @todo good enough for now but probably won't hold when we start + * doing element lookups in structs etc. */ + return mvcheck(state, deref_base(node)); +} + static int mvcheck_proc(struct state *state, struct ast *node) { /* extern, can't really do anything so just say it's fine */ @@ -271,6 +278,9 @@ static int mvcheck_id(struct state *state, struct ast *node) if (def->k != AST_VAR_DEF) return 0; + if (is_trivially_copyable(def->t)) + return 0; + if (in_pure(state)) { semantic_error(node->scope, node, "move in pure context not allowed"); @@ -409,6 +419,7 @@ static int mvcheck(struct state *state, struct ast *node) case AST_INIT: return mvcheck_init (state, node); case AST_IF: return mvcheck_if (state, node); case AST_REF: return mvcheck_ref (state, node); + case AST_DEREF: return mvcheck_deref (state, node); case AST_EMPTY: case AST_CONST_INT: case AST_CONST_STR: |