Merge pull request #49 from rafaqz/macro_hygene

Macro hygene

src/larray.jl

@@ -115,12 +115,17 @@ For example:
     b = @LArray [1,2,3] (:a,:b,:c)
 """
 macro LArray(vals,syms)
+  vals = esc(vals)
+  syms = esc(syms)
   return quote
       LArray{$syms}($vals)
   end
 end
 
 macro LArray(type,size,syms)
+  type = esc(type)
+  size = esc(size)
+  syms = esc(syms)
   return quote
       LArray{$syms}(Array{$type}(undef,$size...))
   end
@@ -137,6 +142,8 @@ For example:
     b = @LVector [1,2,3] (:a,:b,:c)
 """
 macro LVector(type,syms)
+  type = esc(type)
+  syms = esc(syms)
   return quote
       LArray{$syms}(Vector{$type}(undef,length($syms)))
   end

src/lsliced.jl

@@ -95,13 +95,18 @@ For example:
     b = @LSliced [1 2; 3 4; 5 6] (:a,:b,:c), (:x,:y)
 """
 macro LSliced(vals,syms)
+  vals = esc(vals)
+  syms = esc(syms)
   return quote
-    LArray{Tuple{$syms...,}}($vals)
+      LArray{Tuple{$syms...,}}($vals)
   end
 end
 
 macro LSliced(type,size,syms)
+  type = esc(type)
+  size = esc(size)
+  syms = esc(syms)
   return quote
-    LArray{Tuple{$syms...,}}(Array{$type}(undef,$size...))
+      LArray{Tuple{$syms...,}}(Array{$type}(undef,$size...))
   end
 end

src/slarray.jl

@@ -140,15 +140,18 @@ x.c == x[3]
 
 """
 macro SLVector(syms)
-  n = syms isa Expr ? length(syms.args) : length(syms)
+  syms = esc(syms)
   quote
-    SLArray{Tuple{$n},$syms}
+    n = length($syms)
+    SLArray{Tuple{n},$syms}
   end
 end
 
 macro SLVector(T,syms)
-  n = syms isa Expr ? length(syms.args) : length(syms)
+  T = esc(T)
+  syms = esc(syms)
   quote
-    SLArray{Tuple{$n},$T,1,$n,$syms}
+    n = length($syms)
+    SLArray{Tuple{n},$T,1,n,$syms}
   end
 end

src/slsliced.jl

@@ -26,15 +26,18 @@ x.d.y == x[4,2]
 
 """
 macro SLSliced(dims,syms)
-  dims isa Expr && (dims = dims.args)
+  dims = esc(dims)
+  syms = esc(syms)
   quote
     SLArray{Tuple{$dims...,},Tuple{$syms...,}}
   end
 end
 
 macro SLSliced(T,dims,syms)
-  dims isa Expr && (dims = dims.args)
+  T = esc(T)
+  dims = esc(dims)
+  syms = esc(syms)
   quote
-      SLArray{Tuple{$dims...},$T,$(length(dims)),$(prod(dims)),Tuple{$syms...}}
+      SLArray{Tuple{$dims...},$T,length($dims),prod($dims),Tuple{$syms...}}
   end
 end

test/larrays.jl

@@ -1,7 +1,9 @@
 using LabelledArrays, Test, InteractiveUtils
 
 @testset "Basic interface" begin
-    x = @LArray [1.0,2.0,3.0] (:a,:b,:c)
+    vals = [1.0,2.0,3.0] 
+    syms = (:a,:b,:c)
+    x = @LArray vals syms
     y = @LVector Float64 (:a,:b,:c)
     y .= [1,2,3.]
     @test x == y
@@ -27,7 +29,9 @@ using LabelledArrays, Test, InteractiveUtils
     @code_warntype g(x)
     @inferred g(x)
 
-    x = @LArray [1,2,3] (:a,:b,:c)
+    vals = [1,2,3]
+    syms = (:a,:b,:c)
+    x = @LArray vals syms
     @test x .* x isa LArray
     @test x .+ 1 isa LArray
     @test x .+ 1. isa LArray
@@ -37,7 +41,10 @@ using LabelledArrays, Test, InteractiveUtils
     @test z isa LArray && eltype(z) === Float64
     @test eltype(x .+ 1.) === Float64
 
-    z = @LArray Float64 (2,2) (:a,:b,:c,:d)
+    type = Float64 
+    dims = (2,2) 
+    syms = (:a,:b,:c,:d)
+    z = @LArray type dims syms
     w = rand(2,2)
     z .= w
 

test/lsliced.jl

@@ -42,7 +42,9 @@ using LabelledArrays, Test, InteractiveUtils
     @test z[:a,:d] == w[1,2]
     @test z[:b,:d] == w[2,2]
 
-    x = @LSliced [1 2; 3 4; 5 6] (:a,:b,:c), (:x, :y)
+    vals = [1 2; 3 4; 5 6]
+    syms = (:a,:b,:c), (:x, :y)
+    x = @LSliced vals syms  
     x.a.x = 33
     x.b.y = 99
     x[:a,:y] = 44