Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add <: to add-dots #35085

Merged
merged 15 commits into from
May 6, 2020
Merged

add <: to add-dots #35085

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
813de45
add <: to add-dots
ssikdar1 Mar 12, 2020
c364df6
add <: case to __dot__
ssikdar1 Mar 13, 2020
2e2c6bf
add test for .<:
ssikdar1 Mar 13, 2020
a340e97
fix test
ssikdar1 Mar 13, 2020
2fca8fa
add .>: as well
ssikdar1 Mar 15, 2020
5d99893
Merge remote-tracking branch 'upstream/master' into dots
ssikdar1 Mar 19, 2020
a3e3ec4
add @. <: test
ssikdar1 Mar 22, 2020
acbd660
update __dot__ expr to call expr
ssikdar1 Mar 22, 2020
bc59aa9
Merge remote-tracking branch 'upstream/master' into dots
ssikdar1 Mar 22, 2020
1d96e71
add NEWS item for PR
ssikdar1 Mar 22, 2020
6cb0a42
Merge branch 'master' into dots
ssikdar1 Mar 27, 2020
243f65e
add in code review comments
ssikdar1 Mar 28, 2020
959925c
Merge branch 'master' into dots
ssikdar1 Apr 23, 2020
7c0a629
Merge branch 'master' into dots
ssikdar1 May 6, 2020
eb6df88
fix format NEWS
ssikdar1 May 6, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions base/broadcast.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1173,6 +1173,8 @@ function __dot__(x::Expr)
elseif (x.head === :(=) || x.head === :function || x.head === :macro) &&
Meta.isexpr(x.args[1], :call) # function or macro definition
Expr(x.head, x.args[1], dotargs[2])
elseif x.head === :(<:)
Expr(:(.<:), dotargs...)
stevengj marked this conversation as resolved.
Show resolved Hide resolved
else
if x.head === :&& || x.head === :||
error("""
Expand Down
3 changes: 3 additions & 0 deletions test/broadcast.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -857,3 +857,6 @@ end

# 28680
@test 1 .+ 1 .+ (1, 2) == (3, 4)

ret = @macroexpand @.([Int, Number] <: Real)
@test ret == :($(Expr(:.<:, :([Int, Number]), :Real)))
2 changes: 2 additions & 0 deletions test/parse.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -315,3 +315,5 @@ end
@test Meta.parse("±x") == Expr(:call, :±, :x)
@test Meta.parse("∓x") == Expr(:call, :∓, :x)
end

@test [Int, Float64, String, Bool] .<: Union{Int, String} == Bool[1, 0, 1, 0]