Merge pull request #458 from JuliaArrays/fe/modarg

clean up _module_arg

src/MArray.jl

@@ -192,7 +192,7 @@ macro MArray(ex)
         ex = ex.args[1]
         n_rng = length(ex.args) - 1
         rng_args = [ex.args[i+1].args[1] for i = 1:n_rng]
-        rngs = [Core.eval(_module_arg ? __module__ : current_module(), ex.args[i+1].args[2]) for i = 1:n_rng]
+        rngs = [Core.eval(__module__, ex.args[i+1].args[2]) for i = 1:n_rng]
         rng_lengths = map(length, rngs)
 
         f = gensym()
@@ -231,7 +231,7 @@ macro MArray(ex)
         ex = ex.args[2]
         n_rng = length(ex.args) - 1
         rng_args = [ex.args[i+1].args[1] for i = 1:n_rng]
-        rngs = [Core.eval(_module_arg ? __module__ : current_module(), ex.args[i+1].args[2]) for i = 1:n_rng]
+        rngs = [Core.eval(__module__, ex.args[i+1].args[2]) for i = 1:n_rng]
         rng_lengths = map(length, rngs)
 
         f = gensym()

src/MMatrix.jl

@@ -162,8 +162,8 @@ macro MMatrix(ex)
             error("Use a 2-dimensional comprehension for @MMatrx")
         end
 
-        rng1 = Core.eval(_module_arg ? __module__ : current_module(), ex.args[2].args[2])
-        rng2 = Core.eval(_module_arg ? __module__ : current_module(), ex.args[3].args[2])
+        rng1 = Core.eval(__module__, ex.args[2].args[2])
+        rng2 = Core.eval(__module__, ex.args[3].args[2])
         f = gensym()
         f_expr = :($f = (($(ex.args[2].args[1]), $(ex.args[3].args[1])) -> $(ex.args[1])))
         exprs = [:($f($j1, $j2)) for j1 in rng1, j2 in rng2]
@@ -182,8 +182,8 @@ macro MMatrix(ex)
             error("Use a 2-dimensional comprehension for @MMatrx")
         end
 
-        rng1 = Core.eval(_module_arg ? __module__ : current_module(), ex.args[2].args[2])
-        rng2 = Core.eval(_module_arg ? __module__ : current_module(), ex.args[3].args[2])
+        rng1 = Core.eval(__module__, ex.args[2].args[2])
+        rng2 = Core.eval(__module__, ex.args[3].args[2])
         f = gensym()
         f_expr = :($f = (($(ex.args[2].args[1]), $(ex.args[3].args[1])) -> $(ex.args[1])))
         exprs = [:($f($j1, $j2)) for j1 in rng1, j2 in rng2]

src/MVector.jl

@@ -67,7 +67,7 @@ macro MVector(ex)
             error("Use a one-dimensional comprehension for @MVector")
         end
 
-        rng = Core.eval(_module_arg ? __module__ : current_module(), ex.args[2].args[2])
+        rng = Core.eval(__module__, ex.args[2].args[2])
         f = gensym()
         f_expr = :($f = ($(ex.args[2].args[1]) -> $(ex.args[1])))
         exprs = [:($f($j)) for j in rng]
@@ -86,7 +86,7 @@ macro MVector(ex)
             error("Use a one-dimensional comprehension for @MVector")
         end
 
-        rng = Core.eval(_module_arg ? __module__ : current_module(), ex.args[2].args[2])
+        rng = Core.eval(__module__, ex.args[2].args[2])
         f = gensym()
         f_expr = :($f = ($(ex.args[2].args[1]) -> $(ex.args[1])))
         exprs = [:($f($j)) for j in rng]

src/SArray.jl

@@ -141,7 +141,7 @@ macro SArray(ex)
         ex = ex.args[1]
         n_rng = length(ex.args) - 1
         rng_args = [ex.args[i+1].args[1] for i = 1:n_rng]
-        rngs = Any[Core.eval(_module_arg ? __module__ : current_module(), ex.args[i+1].args[2]) for i = 1:n_rng]
+        rngs = Any[Core.eval(__module__, ex.args[i+1].args[2]) for i = 1:n_rng]
         rng_lengths = map(length, rngs)
 
         f = gensym()
@@ -180,7 +180,7 @@ macro SArray(ex)
         ex = ex.args[2]
         n_rng = length(ex.args) - 1
         rng_args = [ex.args[i+1].args[1] for i = 1:n_rng]
-        rngs = [Core.eval(_module_arg ? __module__ : current_module(), ex.args[i+1].args[2]) for i = 1:n_rng]
+        rngs = [Core.eval(__module__, ex.args[i+1].args[2]) for i = 1:n_rng]
         rng_lengths = map(length, rngs)
 
         f = gensym()

src/SMatrix.jl

@@ -132,8 +132,8 @@ macro SMatrix(ex)
             error("Use a 2-dimensional comprehension for @SMatrix")
         end
 
-        rng1 = Core.eval(_module_arg ? __module__ : current_module(), ex.args[2].args[2])
-        rng2 = Core.eval(_module_arg ? __module__ : current_module(), ex.args[3].args[2])
+        rng1 = Core.eval(__module__, ex.args[2].args[2])
+        rng2 = Core.eval(__module__, ex.args[3].args[2])
         f = gensym()
         f_expr = :($f = (($(ex.args[2].args[1]), $(ex.args[3].args[1])) -> $(ex.args[1])))
         exprs = [:($f($j1, $j2)) for j1 in rng1, j2 in rng2]
@@ -152,8 +152,8 @@ macro SMatrix(ex)
             error("Use a 2-dimensional comprehension for @SMatrix")
         end
 
-        rng1 = Core.eval(_module_arg ? __module__ : current_module(), ex.args[2].args[2])
-        rng2 = Core.eval(_module_arg ? __module__ : current_module(), ex.args[3].args[2])
+        rng1 = Core.eval(__module__, ex.args[2].args[2])
+        rng2 = Core.eval(__module__, ex.args[3].args[2])
         f = gensym()
         f_expr = :($f = (($(ex.args[2].args[1]), $(ex.args[3].args[1])) -> $(ex.args[1])))
         exprs = [:($f($j1, $j2)) for j1 in rng1, j2 in rng2]

src/SVector.jl

@@ -58,7 +58,7 @@ macro SVector(ex)
             error("Use a one-dimensional comprehension for @SVector")
         end
 
-        rng = Core.eval(_module_arg ? __module__ : current_module(), ex.args[2].args[2])
+        rng = Core.eval(__module__, ex.args[2].args[2])
         f = gensym()
         f_expr = :($f = ($(ex.args[2].args[1]) -> $(ex.args[1])))
         exprs = [:($f($j)) for j in rng]
@@ -77,7 +77,7 @@ macro SVector(ex)
             error("Use a one-dimensional comprehension for @SVector")
         end
 
-        rng = Core.eval(_module_arg ? __module__ : current_module(), ex.args[2].args[2])
+        rng = Core.eval(__module__, ex.args[2].args[2])
         f = gensym()
         f_expr = :($f = ($(ex.args[2].args[1]) -> $(ex.args[1])))
         exprs = [:($f($j)) for j in rng]

src/StaticArrays.jl

@@ -45,8 +45,6 @@ export @MVector, @MMatrix, @MArray
 export similar_type
 export push, pop, pushfirst, popfirst, insert, deleteat, setindex
 
-const _module_arg = isdefined(Base, Symbol("@__MODULE__"))
-
 """
     abstract type StaticArray{S, T, N} <: AbstractArray{T, N} end
     StaticScalar{T}     = StaticArray{Tuple{}, T, 0}