Merge pull request #33 from JuliaArrays/teh/returnnode

Fix anonymous-function printing for ReturnNode

Author: timholy

.travis.yml

@@ -3,10 +3,10 @@ language: julia
 os:
   - linux
   - osx
+  - windows
 julia:
-  - 0.7
   - 1.0
-  - 1.2
+  - 1
   - nightly
 notifications:
   email: false

Project.toml

@@ -1,10 +1,13 @@
 name = "MappedArrays"
 uuid = "dbb5928d-eab1-5f90-85c2-b9b0edb7c900"
-version = "0.2.2"
+version = "0.3.0"
+
+[deps]
+FixedPointNumbers = "53c48c17-4a7d-5ca2-90c5-79b7896eea93"
 
 [compat]
-FixedPointNumbers = "≥ 0.3.0"
-julia = "0.7, 1"
+FixedPointNumbers = "0.6.1, 0.7, 0.8"
+julia = "1"
 
 [extras]
 ColorTypes = "3da002f7-5984-5a60-b8a6-cbb66c0b333f"

appveyor.yml

@@ -234,7 +234,7 @@ function func_print(io, f, types)
         end
         lwrd = lwrds[1]
         c = lwrd.code
-        if length(c) == 2 && isa(c[2], Expr) && c[2].head == :return
+        if length(c) == 2 && ((isa(c[2], Expr) && c[2].head === :return) || (isdefined(Core, :ReturnNode) && isa(c[2], Core.ReturnNode)))
             # This is a single-line anonymous function, we should handle it
             s = lwrd.slotnames[2:end]
             if length(s) == 1

src/MappedArrays.jl

@@ -140,7 +140,12 @@ end
     @test a[1,2] == N0f8(0.25)
     @test b[1,2] == N0f8(0.35)
     @test c[1,2] == 0
-    @test_throws InexactError(intsym, Int, N0f8(0.45)) M[1,2] = RGB(0.25, 0.35, 0.45)
+    try
+        M[1,2] = RGB(0.25, 0.35, 0.45)
+    catch err
+        # Can't use `@test_throws` because is differs by FPN version, and we support multiple versions
+        @test err == InexactError(intsym, Int, N0f8(0.45)) || err == InexactError(:Integer, N0f8, N0f8(0.45))
+    end
     R = reinterpret(N0f8, M)
     @test R == N0f8[0.1 0.25; 0.6 0.35; 0 0; 0.3 0.4; 0.4 0.3; 0 1]
     R[2,1] = 0.8
@@ -162,9 +167,9 @@ end
 @testset "Display" begin
     a = [1,2,3,4]
     b = mappedarray(sqrt, a)
-    @test summary(b) == "4-element mappedarray(sqrt, ::Array{Int64,1}) with eltype Float64"
+    @test summary(b) == "4-element mappedarray(sqrt, ::$(Vector{Int})) with eltype Float64"
     c = mappedarray(sqrt, x->x*x, a)
-    @test summary(c) == "4-element mappedarray(sqrt, x->x * x, ::Array{Int64,1}) with eltype Float64"
+    @test summary(c) == "4-element mappedarray(sqrt, x->x * x, ::$(Vector{Int})) with eltype Float64"
     # issue #26
     M = @inferred mappedarray((x1,x2)->x1+x2, a, a)
     io = IOBuffer()