Merge pull request #255 from JuliaGPU/tb/allowscalar_function

Add a function for temporarily allowing scalar indexing.

Author: maleadt

src/host/indexing.jl

@@ -49,6 +49,7 @@ end
 """
     @allowscalar ex...
     @disallowscalar ex...
+    allowscalar(::Function, ...)
 
 Temporarily allow or disallow scalar iteration.
 
@@ -77,6 +78,15 @@ macro disallowscalar(ex)
     end
 end
 
+@doc (@doc @allowscalar) ->
+function allowscalar(f::Base.Callable, allow::Bool=true, warn::Bool=false)
+    prev = scalar_allowed[]
+    allowscalar(allow, warn)
+    ret = f()
+    scalar_allowed[] = prev
+    ret
+end
+
 
 # basic indexing
 

test/testsuite/indexing.jl

@@ -24,6 +24,11 @@ function test_indexing(AT)
                 @test x[1] == 3
             end
 
+            allowscalar() do
+                x[1] = 4
+                @test x[1] == 4
+            end
+
             @test_throws ErrorException x[1]
             @test_throws ErrorException x[1] = 1