Skip to content

Commit 79c318f

Browse files
andrewjradcliffeandrewjradcliffe
committed
Match binary operator associativity
1 parent 2e185f0 commit 79c318f

File tree

3 files changed

+36
-36
lines changed

3 files changed

+36
-36
lines changed

‎src/vextrema.jl‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -134,8 +134,8 @@ function staticdim_extrema_quote(Iₘᵢₙ, Iₘₐₓ, static_dims::Vector{Int
134134
block = newblock
135135
end
136136
# Push to inside innermost loop
137-
setmin = Expr(:(=), :mn, Expr(:call, :min, Expr(:call, :f, A), :mn))
138-
setmax = Expr(:(=), :mx, Expr(:call, :max, Expr(:call, :f, A), :mx))
137+
setmin = Expr(:(=), :mn, Expr(:call, :min, :mn, Expr(:call, :f, A)))
138+
setmax = Expr(:(=), :mx, Expr(:call, :max, :mx, Expr(:call, :f, A)))
139139
push!(block.args, setmin, setmax)
140140
setb = Expr(:(=), Bᵥ′, :mn)
141141
setc = Expr(:(=), Cᵥ′, :mx)
@@ -159,8 +159,8 @@ function staticdim_extrema_quote(Iₘᵢₙ, Iₘₐₓ, static_dims::Vector{Int
159159
block = newblock
160160
end
161161
# Push to inside innermost loop
162-
setmin = Expr(:(=), :mn, Expr(:call, :min, Expr(:call, :f, A), :mn))
163-
setmax = Expr(:(=), :mx, Expr(:call, :max, Expr(:call, :f, A), :mx))
162+
setmin = Expr(:(=), :mn, Expr(:call, :min, :mn, Expr(:call, :f, A)))
163+
setmax = Expr(:(=), :mx, Expr(:call, :max, :mx, Expr(:call, :f, A)))
164164
push!(block.args, setmin, setmax)
165165
return quote
166166
Bᵥ = $Bᵥ
@@ -310,8 +310,8 @@ function staticdim_extrema_init_quote(static_dims::Vector{Int}, N::Int)
310310
block = newblock
311311
end
312312
# Push to inside innermost loop
313-
setmin = Expr(:(=), :mn, Expr(:call, :min, Expr(:call, :f, A), :mn))
314-
setmax = Expr(:(=), :mx, Expr(:call, :max, Expr(:call, :f, A), :mx))
313+
setmin = Expr(:(=), :mn, Expr(:call, :min, :mn, Expr(:call, :f, A)))
314+
setmax = Expr(:(=), :mx, Expr(:call, :max, :mx, Expr(:call, :f, A)))
315315
push!(block.args, setmin, setmax)
316316
setb = Expr(:(=), Bᵥ′, :mn)
317317
setc = Expr(:(=), Cᵥ′, :mx)
@@ -337,8 +337,8 @@ function staticdim_extrema_init_quote(static_dims::Vector{Int}, N::Int)
337337
block = newblock
338338
end
339339
# Push to inside innermost loop
340-
setmin = Expr(:(=), :mn, Expr(:call, :min, Expr(:call, :f, A), :mn))
341-
setmax = Expr(:(=), :mx, Expr(:call, :max, Expr(:call, :f, A), :mx))
340+
setmin = Expr(:(=), :mn, Expr(:call, :min, :mn, Expr(:call, :f, A)))
341+
setmax = Expr(:(=), :mx, Expr(:call, :max, :mx, Expr(:call, :f, A)))
342342
push!(block.args, setmin, setmax)
343343
return quote
344344
Bᵥ = $Bᵥ
@@ -550,8 +550,8 @@ function staticdim_textrema_quote(Iₘᵢₙ, Iₘₐₓ, static_dims::Vector{In
550550
block = newblock
551551
end
552552
# Push to inside innermost loop
553-
setmin = Expr(:(=), :mn, Expr(:call, :min, Expr(:call, :f, A), :mn))
554-
setmax = Expr(:(=), :mx, Expr(:call, :max, Expr(:call, :f, A), :mx))
553+
setmin = Expr(:(=), :mn, Expr(:call, :min, :mn, Expr(:call, :f, A)))
554+
setmax = Expr(:(=), :mx, Expr(:call, :max, :mx, Expr(:call, :f, A)))
555555
push!(block.args, setmin, setmax)
556556
setb = Expr(:(=), Bᵥ′, :mn)
557557
setc = Expr(:(=), Cᵥ′, :mx)
@@ -575,8 +575,8 @@ function staticdim_textrema_quote(Iₘᵢₙ, Iₘₐₓ, static_dims::Vector{In
575575
block = newblock
576576
end
577577
# Push to inside innermost loop
578-
setmin = Expr(:(=), :mn, Expr(:call, :min, Expr(:call, :f, A), :mn))
579-
setmax = Expr(:(=), :mx, Expr(:call, :max, Expr(:call, :f, A), :mx))
578+
setmin = Expr(:(=), :mn, Expr(:call, :min, :mn, Expr(:call, :f, A)))
579+
setmax = Expr(:(=), :mx, Expr(:call, :max, :mx, Expr(:call, :f, A)))
580580
push!(block.args, setmin, setmax)
581581
return quote
582582
Bᵥ = $Bᵥ
@@ -726,8 +726,8 @@ function staticdim_textrema_init_quote(static_dims::Vector{Int}, N::Int)
726726
block = newblock
727727
end
728728
# Push to inside innermost loop
729-
setmin = Expr(:(=), :mn, Expr(:call, :min, Expr(:call, :f, A), :mn))
730-
setmax = Expr(:(=), :mx, Expr(:call, :max, Expr(:call, :f, A), :mx))
729+
setmin = Expr(:(=), :mn, Expr(:call, :min, :mn, Expr(:call, :f, A)))
730+
setmax = Expr(:(=), :mx, Expr(:call, :max, :mx, Expr(:call, :f, A)))
731731
push!(block.args, setmin, setmax)
732732
setb = Expr(:(=), Bᵥ′, :mn)
733733
setc = Expr(:(=), Cᵥ′, :mx)
@@ -753,8 +753,8 @@ function staticdim_textrema_init_quote(static_dims::Vector{Int}, N::Int)
753753
block = newblock
754754
end
755755
# Push to inside innermost loop
756-
setmin = Expr(:(=), :mn, Expr(:call, :min, Expr(:call, :f, A), :mn))
757-
setmax = Expr(:(=), :mx, Expr(:call, :max, Expr(:call, :f, A), :mx))
756+
setmin = Expr(:(=), :mn, Expr(:call, :min, :mn, Expr(:call, :f, A)))
757+
setmax = Expr(:(=), :mx, Expr(:call, :max, :mx, Expr(:call, :f, A)))
758758
push!(block.args, setmin, setmax)
759759
return quote
760760
Bᵥ = $Bᵥ

‎src/vmapreduce.jl‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -286,7 +286,7 @@ function staticdim_mapreduce_quote(OP, I, static_dims::Vector{Int}, N::Int)
286286
block = newblock
287287
end
288288
# Push to inside innermost loop
289-
setξ = Expr(:(=), :ξ, Expr(:call, Symbol(OP.instance), Expr(:call, :f, A), :ξ))
289+
setξ = Expr(:(=), :ξ, Expr(:call, Symbol(OP.instance), :ξ, Expr(:call, :f, A)))
290290
push!(block.args, setξ)
291291
setb = Expr(:(=), Bᵥ′, :ξ)
292292
push!(rblock.args, setb)
@@ -310,7 +310,7 @@ function staticdim_mapreduce_quote(OP, I, static_dims::Vector{Int}, N::Int)
310310
block = newblock
311311
end
312312
# Push to inside innermost loop
313-
setξ = Expr(:(=), :ξ, Expr(:call, Symbol(OP.instance), Expr(:call, :f, A), :ξ))
313+
setξ = Expr(:(=), :ξ, Expr(:call, Symbol(OP.instance), :ξ, Expr(:call, :f, A)))
314314
push!(block.args, setξ)
315315
return quote
316316
Bᵥ = $Bᵥ
@@ -461,7 +461,7 @@ function staticdim_mapreduce_init_quote(OP, static_dims::Vector{Int}, N::Int)
461461
block = newblock
462462
end
463463
# Push to inside innermost loop
464-
setξ = Expr(:(=), :ξ, Expr(:call, Symbol(OP.instance), Expr(:call, :f, A), :ξ))
464+
setξ = Expr(:(=), :ξ, Expr(:call, Symbol(OP.instance), :ξ, Expr(:call, :f, A)))
465465
push!(block.args, setξ)
466466
setb = Expr(:(=), Bᵥ′, :ξ)
467467
push!(rblock.args, setb)
@@ -484,7 +484,7 @@ function staticdim_mapreduce_init_quote(OP, static_dims::Vector{Int}, N::Int)
484484
block = newblock
485485
end
486486
# Push to inside innermost loop
487-
setξ = Expr(:(=), :ξ, Expr(:call, Symbol(OP.instance), Expr(:call, :f, A), :ξ))
487+
setξ = Expr(:(=), :ξ, Expr(:call, Symbol(OP.instance), :ξ, Expr(:call, :f, A)))
488488
push!(block.args, setξ)
489489
return quote
490490
Bᵥ = $Bᵥ
@@ -799,7 +799,7 @@ function staticdim_tmapreduce_quote(OP, I, static_dims::Vector{Int}, N::Int)
799799
block = newblock
800800
end
801801
# Push to inside innermost loop
802-
setξ = Expr(:(=), :ξ, Expr(:call, Symbol(OP.instance), Expr(:call, :f, A), :ξ))
802+
setξ = Expr(:(=), :ξ, Expr(:call, Symbol(OP.instance), :ξ, Expr(:call, :f, A)))
803803
push!(block.args, setξ)
804804
setb = Expr(:(=), Bᵥ′, :ξ)
805805
push!(rblock.args, setb)
@@ -820,7 +820,7 @@ function staticdim_tmapreduce_quote(OP, I, static_dims::Vector{Int}, N::Int)
820820
block = newblock
821821
end
822822
# Push to inside innermost loop
823-
setξ = Expr(:(=), :ξ, Expr(:call, Symbol(OP.instance), Expr(:call, :f, A), :ξ))
823+
setξ = Expr(:(=), :ξ, Expr(:call, Symbol(OP.instance), :ξ, Expr(:call, :f, A)))
824824
push!(block.args, setξ)
825825
return quote
826826
Bᵥ = $Bᵥ
@@ -965,7 +965,7 @@ function staticdim_tmapreduce_init_quote(OP, static_dims::Vector{Int}, N::Int)
965965
block = newblock
966966
end
967967
# Push to inside innermost loop
968-
setξ = Expr(:(=), :ξ, Expr(:call, Symbol(OP.instance), Expr(:call, :f, A), :ξ))
968+
setξ = Expr(:(=), :ξ, Expr(:call, Symbol(OP.instance), :ξ, Expr(:call, :f, A)))
969969
push!(block.args, setξ)
970970
setb = Expr(:(=), Bᵥ′, :ξ)
971971
push!(rblock.args, setb)
@@ -988,7 +988,7 @@ function staticdim_tmapreduce_init_quote(OP, static_dims::Vector{Int}, N::Int)
988988
block = newblock
989989
end
990990
# Push to inside innermost loop
991-
setξ = Expr(:(=), :ξ, Expr(:call, Symbol(OP.instance), Expr(:call, :f, A), :ξ))
991+
setξ = Expr(:(=), :ξ, Expr(:call, Symbol(OP.instance), :ξ, Expr(:call, :f, A)))
992992
push!(block.args, setξ)
993993
return quote
994994
Bᵥ = $Bᵥ

‎src/vmapreduce_vararg.jl‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ function staticdim_mapreduce_vararg_quote(OP, I, static_dims::Vector{Int}, N::In
126126
block = newblock
127127
end
128128
# Push to inside innermost loop
129-
setξ = Expr(:(=), :ξ, Expr(:call, Symbol(OP.instance), f, :ξ))
129+
setξ = Expr(:(=), :ξ, Expr(:call, Symbol(OP.instance), :ξ, f))
130130
push!(block.args, setξ)
131131
setb = Expr(:(=), Bᵥ′, :ξ)
132132
push!(rblock.args, setb)
@@ -149,7 +149,7 @@ function staticdim_mapreduce_vararg_quote(OP, I, static_dims::Vector{Int}, N::In
149149
block = newblock
150150
end
151151
# Push to inside innermost loop
152-
setξ = Expr(:(=), :ξ, Expr(:call, Symbol(OP.instance), f, :ξ))
152+
setξ = Expr(:(=), :ξ, Expr(:call, Symbol(OP.instance), :ξ, f))
153153
push!(block.args, setξ)
154154
return quote
155155
$t = As
@@ -289,7 +289,7 @@ function mapreduceall_vararg_quote(OP, I, P::Int)
289289
end
290290
block = Expr(:block)
291291
loops = Expr(:for, Expr(:(=), :i, Expr(:call, :eachindex, t.args...)), block)
292-
setξ = Expr(:(=), :ξ, Expr(:call, Symbol(OP.instance), f, :ξ))
292+
setξ = Expr(:(=), :ξ, Expr(:call, Symbol(OP.instance), :ξ, f))
293293
push!(block.args, setξ)
294294
# Pre-reduction
295295
ξ = Expr(:(=), :ξ, Expr(:call, Symbol(I.instance), :(Base.promote_op($(Symbol(OP.instance)), Base.promote_op(f, $(ntuple(p -> Expr(:call, :eltype, Symbol(:A_, p)), P)...)), Int))))
@@ -387,7 +387,7 @@ function staticdim_mapreduce_vararg_init_quote(OP, static_dims::Vector{Int}, N::
387387
block = newblock
388388
end
389389
# Push to inside innermost loop
390-
setξ = Expr(:(=), :ξ, Expr(:call, Symbol(OP.instance), f, :ξ))
390+
setξ = Expr(:(=), :ξ, Expr(:call, Symbol(OP.instance), :ξ, f))
391391
push!(block.args, setξ)
392392
setb = Expr(:(=), Bᵥ′, :ξ)
393393
push!(rblock.args, setb)
@@ -411,7 +411,7 @@ function staticdim_mapreduce_vararg_init_quote(OP, static_dims::Vector{Int}, N::
411411
block = newblock
412412
end
413413
# Push to inside innermost loop
414-
setξ = Expr(:(=), :ξ, Expr(:call, Symbol(OP.instance), f, :ξ))
414+
setξ = Expr(:(=), :ξ, Expr(:call, Symbol(OP.instance), :ξ, f))
415415
push!(block.args, setξ)
416416
return quote
417417
$t = As
@@ -503,7 +503,7 @@ function mapreduceall_vararg_init_quote(OP, P::Int)
503503
end
504504
block = Expr(:block)
505505
loops = Expr(:for, Expr(:(=), :i, Expr(:call, :eachindex, t.args...)), block)
506-
setξ = Expr(:(=), :ξ, Expr(:call, Symbol(OP.instance), f, :ξ))
506+
setξ = Expr(:(=), :ξ, Expr(:call, Symbol(OP.instance), :ξ, f))
507507
push!(block.args, setξ)
508508
# Pre-reduction
509509
ξ = Expr(:(=), :ξ, Expr(:call, :convert, :(Base.promote_op($(Symbol(OP.instance)), Base.promote_op(f, $(ntuple(p -> Expr(:call, :eltype, Symbol(:A_, p)), P)...)), Int)), :init))
@@ -624,7 +624,7 @@ function staticdim_tmapreduce_vararg_quote(OP, I, static_dims::Vector{Int}, N::I
624624
block = newblock
625625
end
626626
# Push to inside innermost loop
627-
setξ = Expr(:(=), :ξ, Expr(:call, Symbol(OP.instance), f, :ξ))
627+
setξ = Expr(:(=), :ξ, Expr(:call, Symbol(OP.instance), :ξ, f))
628628
push!(block.args, setξ)
629629
setb = Expr(:(=), Bᵥ′, :ξ)
630630
push!(rblock.args, setb)
@@ -647,7 +647,7 @@ function staticdim_tmapreduce_vararg_quote(OP, I, static_dims::Vector{Int}, N::I
647647
block = newblock
648648
end
649649
# Push to inside innermost loop
650-
setξ = Expr(:(=), :ξ, Expr(:call, Symbol(OP.instance), f, :ξ))
650+
setξ = Expr(:(=), :ξ, Expr(:call, Symbol(OP.instance), :ξ, f))
651651
push!(block.args, setξ)
652652
return quote
653653
$t = As
@@ -787,7 +787,7 @@ function tmapreduceall_vararg_quote(OP, I, P::Int)
787787
end
788788
block = Expr(:block)
789789
loops = Expr(:for, Expr(:(=), :i, Expr(:call, :eachindex, t.args...)), block)
790-
setξ = Expr(:(=), :ξ, Expr(:call, Symbol(OP.instance), f, :ξ))
790+
setξ = Expr(:(=), :ξ, Expr(:call, Symbol(OP.instance), :ξ, f))
791791
push!(block.args, setξ)
792792
# Pre-reduction
793793
ξ = Expr(:(=), :ξ, Expr(:call, Symbol(I.instance), :(Base.promote_op($(Symbol(OP.instance)), Base.promote_op(f, $(ntuple(p -> Expr(:call, :eltype, Symbol(:A_, p)), P)...)), Int))))
@@ -880,7 +880,7 @@ function staticdim_tmapreduce_vararg_init_quote(OP, static_dims::Vector{Int}, N:
880880
block = newblock
881881
end
882882
# Push to inside innermost loop
883-
setξ = Expr(:(=), :ξ, Expr(:call, Symbol(OP.instance), f, :ξ))
883+
setξ = Expr(:(=), :ξ, Expr(:call, Symbol(OP.instance), :ξ, f))
884884
push!(block.args, setξ)
885885
setb = Expr(:(=), Bᵥ′, :ξ)
886886
push!(rblock.args, setb)
@@ -904,7 +904,7 @@ function staticdim_tmapreduce_vararg_init_quote(OP, static_dims::Vector{Int}, N:
904904
block = newblock
905905
end
906906
# Push to inside innermost loop
907-
setξ = Expr(:(=), :ξ, Expr(:call, Symbol(OP.instance), f, :ξ))
907+
setξ = Expr(:(=), :ξ, Expr(:call, Symbol(OP.instance), :ξ, f))
908908
push!(block.args, setξ)
909909
return quote
910910
$t = As
@@ -993,7 +993,7 @@ function tmapreduceall_vararg_init_quote(OP, P::Int)
993993
end
994994
block = Expr(:block)
995995
loops = Expr(:for, Expr(:(=), :i, Expr(:call, :eachindex, t.args...)), block)
996-
setξ = Expr(:(=), :ξ, Expr(:call, Symbol(OP.instance), f, :ξ))
996+
setξ = Expr(:(=), :ξ, Expr(:call, Symbol(OP.instance), :ξ, f))
997997
push!(block.args, setξ)
998998
# Pre-reduction
999999
ξ = Expr(:(=), :ξ, Expr(:call, :convert, :(Base.promote_op($(Symbol(OP.instance)), Base.promote_op(f, $(ntuple(p -> Expr(:call, :eltype, Symbol(:A_, p)), P)...)), Int)), :init))

0 commit comments

Comments
 (0)