diff options
| author | Brendan Punsky <bpunsky@gmail.com> | 2019-03-18 17:22:57 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-18 17:22:57 -0400 |
| commit | e3d1d1d85c68b6ebc999cae648e55c692e1258d2 (patch) | |
| tree | 728eddb83aef26c892bf21f53f937cd6094fdd2d /src/check_stmt.cpp | |
| parent | b6ea7b741831f7cceaf43eaf116995d6ff386fb5 (diff) | |
| parent | 290c111206b9386e7feb3023cda13b0e01483647 (diff) | |
Merge branch 'master' into master
Diffstat (limited to 'src/check_stmt.cpp')
| -rw-r--r-- | src/check_stmt.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/check_stmt.cpp b/src/check_stmt.cpp index cead61ce8..07de5dc2e 100644 --- a/src/check_stmt.cpp +++ b/src/check_stmt.cpp @@ -474,10 +474,11 @@ bool check_using_stmt_entity(CheckerContext *ctx, AstUsingStmt *us, Ast *expr, b case Entity_ImportName: { Scope *scope = e->ImportName.scope; for_array(i, scope->elements.entries) { + String name = scope->elements.entries[i].key.string; Entity *decl = scope->elements.entries[i].value; if (!is_entity_exported(decl)) continue; - Entity *found = scope_insert(ctx->scope, decl); + Entity *found = scope_insert_with_name(ctx->scope, name, decl); if (found != nullptr) { gbString expr_str = expr_to_string(expr); error(us->token, |