factor() update to use genvar

Author: RXGottlieb

src/transform/factor.jl

@@ -28,9 +28,12 @@ factor!(ex::NTuple; assignments::Vector{Assignment}) = factor!(Expr(:($([i for i
 factor!(ex::Tuple; assignments::Vector{Assignment}) = factor!(Expr(:($([i for i in ex]...))), assignments=assignments)
 
 function factor!(ex::Number; assignments = Assignment[])
-    new = Assignment(gensym(:aux), ex)
-    index = findall(x -> x.rhs==new.rhs, assignments)
+    index = findall(x -> x.rhs==ex, assignments)
     if isempty(index)
+        newsym = gensym(:aux)
+        newsym = Symbol(string(newsym)[3:5] * string(newsym)[7:end])
+        newvar = genvar(newsym)
+        new = Assignment(newvar, ex)
         push!(assignments, new)
     else
         p = collect(1:length(assignments))
@@ -41,9 +44,12 @@ function factor!(ex::Number; assignments = Assignment[])
     return assignments
 end
 function factor!(ex::Symbol; assignments = Assignment[])
-    new = Assignment(gensym(:aux), ex)
-    index = findall(x -> x.rhs==new.rhs, assignments)
+    index = findall(x -> x.rhs==ex, assignments)
     if isempty(index)
+        newsym = gensym(:aux)
+        newsym = Symbol(string(newsym)[3:5] * string(newsym)[7:end])
+        newvar = genvar(newsym)
+        new = Assignment(newvar, ex)
         push!(assignments, new)
     else
         p = collect(1:length(assignments))
@@ -57,9 +63,12 @@ end
 function factor!(ex::Expr; assignments = Assignment[])
     binarize!(ex)
     if is_factor(ex)
-        new = Assignment(gensym(:aux), ex)
-        index = findall(x -> x.rhs==new.rhs, assignments)
+        index = findall(x -> x.rhs==ex, assignments)
         if isempty(index)
+            newsym = gensym(:aux)
+            newsym = Symbol(string(newsym)[3:5] * string(newsym)[7:end])
+            newvar = genvar(newsym)
+            new = Assignment(newvar, ex)
             push!(assignments, new)
         else
             p = collect(1:length(assignments))

src/transform/utilities.jl

@@ -26,7 +26,7 @@ function genvar(a::Symbol, b=:t)
     push!(ex.args, expr)
     rhs = Symbolics.build_expr(:vect, vars)
     push!(ex.args, rhs)
-    eval(ex)
+    eval(ex)[1]
 end
 function genvar(a::Symbol, b::Vector{Symbol})
     vars = Symbol[]
@@ -36,7 +36,7 @@ function genvar(a::Symbol, b::Vector{Symbol})
     push!(ex.args, expr)
     rhs = Symbolics.build_expr(:vect, vars)
     push!(ex.args, rhs)
-    eval(ex)
+    eval(ex)[1]
 end
 function genparam(a::Symbol)
     params = Symbol[]
@@ -46,5 +46,5 @@ function genparam(a::Symbol)
     push!(ex.args, expr)
     rhs = Symbolics.build_expr(:vect, params)
     push!(ex.args, rhs)
-    eval(ex)
+    eval(ex)[1]
 end