diff --git a/REQUIRE b/REQUIRE index df9c6322..7164de5a 100644 --- a/REQUIRE +++ b/REQUIRE @@ -1,4 +1,4 @@ -julia 0.7- +julia 0.7 Juno MacroTools 0.3.3 NNlib diff --git a/src/tracker/back.jl b/src/tracker/back.jl index 5c44a15a..774123b4 100644 --- a/src/tracker/back.jl +++ b/src/tracker/back.jl @@ -70,7 +70,7 @@ struct Params Params(xs) = new(IdSet(xs)) end -@forward Params.params Base.iterate +@forward Params.params Base.iterate, Base.length function Base.show(io::IO, ps::Params) print(io, "Params([") diff --git a/src/tracker/idset.jl b/src/tracker/idset.jl index 442d5fa2..940db15d 100644 --- a/src/tracker/idset.jl +++ b/src/tracker/idset.jl @@ -20,8 +20,13 @@ Base.similar(s::IdSet, T::Type) = IdSet{T}() @forward IdSet.dict Base.length +<<<<<<< HEAD function iterate(v::IdSet, state...) y = iterate(keys(v.dict), state...) +======= +function Base.iterate(v::IdSet, state...) + y = Base.iterate(keys(v.dict), state...) +>>>>>>> 837e03613f98ff9b949815018cba02a3682dab3c y === nothing && return nothing return (y[1], y[2]) end \ No newline at end of file