From 29c45263d3715c333f2fb2b997ba5230d4520d17 Mon Sep 17 00:00:00 2001
From: Torkel Loman <torkel.loman@gmail.com>
Date: Sun, 17 Nov 2024 13:38:23 +0000
Subject: [PATCH 1/2] init

---
 src/variable.jl |  6 ++++++
 test/macro.jl   | 28 ++++++++++++++++++++++++++++
 2 files changed, 34 insertions(+)

diff --git a/src/variable.jl b/src/variable.jl
index 8c499ac72..e01131515 100644
--- a/src/variable.jl
+++ b/src/variable.jl
@@ -148,6 +148,7 @@ function _parse_vars(macroname, type, x, transform=identity)
             isruntime, fname = unwrap_runtime_var(v.args[1])
             call_args = map(last∘unwrap_runtime_var, @view v.args[2:end])
             var_name, expr = construct_vars(macroname, fname, type′, call_args, val, options, transform, isruntime)
+
         else
             var_name, expr = construct_vars(macroname, v, type′, nothing, val, options, transform, isruntime)
         end
@@ -344,6 +345,11 @@ function construct_var(macroname, var_name, type, call_args, val, prop)
         var_name, fntype = function_name_and_type(var_name)
         argtypes = arg_types_from_call_args(call_args)
         :($CallWithMetadata($Sym{$FnType{$argtypes, $type, $(fntype...)}}($var_name)))
+    # This elseif handles the special case with e.g. variables on the form
+    # @variables X(deps...) where deps is a vector (which length might be unknown).
+    elseif (call_args isa Vector) && (length(call_args) == 1) && (call_args[1] isa Expr) &&
+            call_args[1].head == :(...) && (length(call_args[1].args) == 1)
+        :($Sym{$FnType{NTuple{$length($(call_args[1].args[1])), Any}, $type}}($var_name)($value.($(call_args[1].args[1]))...))
     else
         :($Sym{$FnType{NTuple{$(length(call_args)), Any}, $type}}($var_name)($(map(x->:($value($x)), call_args)...)))
     end
diff --git a/test/macro.jl b/test/macro.jl
index 062273b54..8ce43bb17 100644
--- a/test/macro.jl
+++ b/test/macro.jl
@@ -389,3 +389,31 @@ fns = @test_nowarn @variables begin
 end
 
 test_all_functions(fns)
+
+# Tests that variables can be declared using vectors of dependants.
+let
+    @variables x y z v w
+    args1 = [x]
+    args2 = [x, y]
+    args3 = [x, y, z]
+
+    v1 = only(@variables X(x))
+    v2 = only(@variables X(args1...))
+    @test isequal(v1, v2)
+
+    v1 = only(@variables X(x,y))
+    v2 = only(@variables X(args3[1:2]...))
+    @test isequal(v1, v2)
+
+    v1 = only(@variables X(x, y, z))
+    v2 = only(@variables X([args2; z]...))
+    @test isequal(v1, v2)
+
+    v1 = only(@variables X(x, y, z, v))
+    v2 = only(@variables X(vcat(args2, [z, v])...))
+    @test isequal(v1, v2)
+
+    v1 = only(@variables X(x, y, z, v, w))
+    v2 = only(@variables X([v for v in [args3; [v, w]]]...))
+    @test isequal(v1, v2)
+end

From 7417bfec264068465a8eca6465359fb6ce4d3321 Mon Sep 17 00:00:00 2001
From: Torkel Loman <torkel.loman@gmail.com>
Date: Sun, 17 Nov 2024 13:43:59 +0000
Subject: [PATCH 2/2] up

---
 src/variable.jl | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/variable.jl b/src/variable.jl
index e01131515..4ba3e571b 100644
--- a/src/variable.jl
+++ b/src/variable.jl
@@ -148,7 +148,6 @@ function _parse_vars(macroname, type, x, transform=identity)
             isruntime, fname = unwrap_runtime_var(v.args[1])
             call_args = map(last∘unwrap_runtime_var, @view v.args[2:end])
             var_name, expr = construct_vars(macroname, fname, type′, call_args, val, options, transform, isruntime)
-
         else
             var_name, expr = construct_vars(macroname, v, type′, nothing, val, options, transform, isruntime)
         end