Merge pull request #16 from crstnbr/iter

Julia 1.0 support: new iterator interface

.travis.yml

@@ -6,6 +6,7 @@ os:
 julia:
   - 0.6
   - 0.7
+  - 1.0
   - nightly
 notifications:
   email: false
@@ -14,6 +15,9 @@ git:
 
 script:
   - julia -e 'Pkg.clone(pwd()); Pkg.build("PeriodicTable"); Pkg.test("PeriodicTable"; coverage=true)'
+matrix:
+  allow_failures:
+    - julia: nightly
 after_success:
   # push coverage results to Coveralls
   - julia -e 'cd(Pkg.dir("PeriodicTable")); Pkg.add("Coverage"); using Coverage; Coveralls.submit(Coveralls.process_folder())'

src/PeriodicTable.jl

@@ -163,9 +163,13 @@ Base.get(e::Elements, i::Symbol, default) = get(e.bysymbol, i, default)
 # support iterating over elements
 Base.eltype(e::Elements) = Element
 Base.length(e::Elements) = length(e.data)
-Base.start(e::Elements) = start(e.data)
-Base.next(e::Elements, i) = next(e.data, i)
-Base.done(e::Elements, i) = done(e.data, i)
+if VERSION < v"0.7-"
+    Base.start(e::Elements) = start(e.data)
+    Base.next(e::Elements, i) = next(e.data, i)
+    Base.done(e::Elements, i) = done(e.data, i)
+else
+    Base.iterate(e::Elements, state...) = iterate(e.data, state...)
+end
 
 # compact one-line printing
 Base.show(io::IO, e::Elements) = print(io, "Elements(…", length(e), " elements…)")

test/runtests.jl

@@ -17,6 +17,17 @@ F = elements[9]
 @test O.symbol == "O"
 @test nfields(O) == 21
 
+# iteration protocol
+if VERSION < v"0.7-"
+    @test start(elements) == 1
+    @test next(elements, 1) == (elements[:H], 2)
+    @test done(elements, length(elements)+1)
+else
+    @test iterate(elements) == (elements[:H], 2)
+    @test iterate(elements, 4) == (elements[:Be], 5)
+    @test iterate(elements, length(elements)+1) == nothing
+end
+
 # 2-argument show functions
 @test repr(elements) == "Elements(…119 elements…)"
 if VERSION < v"0.7-"