attempts at variable dependence failing due to escape issues

Author: ChrisRackauckas

src/variables.jl

@@ -107,20 +107,30 @@ function _parse_vars(macroname, fun, x)
     #     z = exp(2)
     # end
     x = flatten_expr!(x)
-    for var in x
+    for _var in x
+        iscall = typeof(_var) <: Expr && _var.head == :call
+        @show iscall
+        if iscall
+            dependents = Variable[:($(esc(d))) for d in _var.args[2:end]]
+            var = _var.args[1]
+        else
+            dependents = Variable[]
+            var = _var
+        end
         issym    = var isa Symbol
         isassign = issym ? false : var.head == :(=)
         @assert issym || isassign "@$macroname expects a tuple of expressions!\nE.g. `@$macroname x y z=1`"
         if issym
             lhs = var
             push!(lhss, lhs)
-            expr = :( $lhs = $fun( Symbol($(String(lhs))) ) )
+            expr = :( $lhs = $fun( Symbol($(String(lhs))) ,
+                      dependents = $dependents))
         end
         if isassign
             lhs = var.args[1]
             rhs = var.args[2]
             push!(lhss, lhs)
-            expr = :( $lhs = $fun( Symbol($(String(lhs))) , $rhs) )
+            expr = :( $lhs = $fun( Symbol($(String(lhs))) , $rhs))
         end
         push!(ex.args, expr)
     end

test/basic_variables_and_operations.jl

@@ -1,8 +1,12 @@
 using SciCompDSL
 using Base.Test
 
-@DVar x y z
 @IVar t
+@DVar x(t)
+macroexpand(:(@DVar x(t)))
+macroexpand(:(@IVar t))
+@DVar x y z
+
 @Deriv D'~t # Default of first derivative, Derivative(t,1)
 @Param σ ρ β
 @Const c=0
@@ -22,3 +26,11 @@ D*y ~ x*(ρ-z)-sin(y)
 @test D*t == Constant(1)
 null_op = 0*t
 @test simplify_constants(null_op) == Constant(0)
+
+macro escape_all(x...)
+    :($(esc(x))...)
+end
+x = 1
+y = 2
+z = 3
+macroexpand(:(@escape_all x y z))