Skip to content

Commit

Permalink
use name in source module when importing an aliased binding (#43291)
Browse files Browse the repository at this point in the history
Co-authored-by: Simeon David Schaub <schaub@mit.edu>
(cherry picked from commit 2338f5d)
  • Loading branch information
Pangoraw authored and KristofferC committed Mar 16, 2022
1 parent 294a50c commit 426a4ad
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 1 deletion.
2 changes: 1 addition & 1 deletion src/module.c
Original file line number Diff line number Diff line change
Expand Up @@ -485,7 +485,7 @@ static void module_import_(jl_module_t *to, jl_module_t *from, jl_sym_t *s, jl_s
}
}
else {
jl_binding_t *nb = new_binding(s);
jl_binding_t *nb = new_binding(b->name);
nb->owner = b->owner;
nb->imported = (explici!=0);
nb->deprecated = b->deprecated;
Expand Down
6 changes: 6 additions & 0 deletions test/syntax.jl
Original file line number Diff line number Diff line change
Expand Up @@ -2473,6 +2473,7 @@ end
end

module Mod2
import ..Mod.x as x_from_mod
const y = 2
end

Expand Down Expand Up @@ -2513,6 +2514,11 @@ import .Mod.@mac as @m
@test_throws ErrorException eval(:(import .Mod.func as @notmacro))
@test_throws ErrorException eval(:(using .Mod: @mac as notmacro))
@test_throws ErrorException eval(:(using .Mod: func as @notmacro))

import .Mod2.x_from_mod

@test @isdefined(x_from_mod)
@test x_from_mod == Mod.x
end

import .TestImportAs.Mod2 as M2
Expand Down

0 comments on commit 426a4ad

Please sign in to comment.