Skip to content

RFC: Reverse order of outputs from enumerate, to emulate python. (fix #1430) #1439

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

Merged
nolta merged 1 commit into from
Oct 25, 2012
Merged

RFC: Reverse order of outputs from enumerate, to emulate python. (fix #1430) #1439

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 4 additions & 4 deletions base/iterator.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@ end
enumerate(itr) = Enumerate(itr)

length(e::Enumerate) = length(e.itr)
start(e::Enumerate) = (start(e.itr), 1)
start(e::Enumerate) = (1, start(e.itr))
function next(e::Enumerate, state)
v, s = next(e.itr, state[1])
(v,state[2]), (s,state[2]+1)
v, s = next(e.itr, state[2])
(state[1],v), (state[1]+1,s)
end
done(e::Enumerate, state) = done(e.itr, state[1])
done(e::Enumerate, state) = done(e.itr, state[2])

# zip

Expand Down
2 changes: 1 addition & 1 deletion base/pkgmetadata.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ function resolve(reqs::Vector{VersionSet})
G += [ older(a,b) ? 2 : 0 for a=vers, b=vers ]
I = find(G)
W = zeros(Int,length(I),n)
for (i,r) in enumerate(I)
for (r,i) in enumerate(I)
W[r,rem(i-1,n)+1] = -1
W[r,div(i-1,n)+1] = G[i]
end
Expand Down
2 changes: 1 addition & 1 deletion extras/enum.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ macro enum(T,syms...)
$(esc(:isequal))(a::($T), b::($T)) = eq_int(unbox($T,a),unbox($T,b))
$(esc(:show))(io::IO, x::($T)) = $sh
end
for (sym,i) in enumerate(syms)
for (i,sym) in enumerate(syms)
push(blk.args, :(const $(esc(sym)) = box($T,unbox(Int,$(i-1)))))
end
push(blk.args, :nothing)
Expand Down
2 changes: 1 addition & 1 deletion extras/icu.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ export UCAL_ERA,
UCAL_MILLISECONDS_IN_DAY,
UCAL_IS_LEAP_MONTH

for (a,i) in enumerate([
for (i,a) in enumerate([
:UCAL_ERA,
:UCAL_YEAR,
:UCAL_MONTH,
Expand Down
4 changes: 2 additions & 2 deletions test/corelib.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@ boo32_64() = [ foo32_64(i) for i=1:2 ]
let a36 = boo32_64()
@assert a36[1]==1 && a36[2]==2
end
@assert isequal([1,2,3], [b for (a,b) in enumerate(2:4)])
@assert isequal([2,3,4], [a for (a,b) in enumerate(2:4)])
@assert isequal([1,2,3], [a for (a,b) in enumerate(2:4)])
@assert isequal([2,3,4], [b for (a,b) in enumerate(2:4)])

@assert (10.^[-1])[1] == 0.1
@assert (10.^[-1.])[1] == 0.1
Expand Down