Merge pull request #2666 from SciML/myb/fix2

Always attach metadata in `similarterm`

Author: YingboMa

src/systems/abstractsystem.jl

@@ -751,7 +751,8 @@ function LocalScope(sym::Union{Num, Symbolic, Symbolics.Arr{Num}})
         if istree(sym) && operation(sym) === getindex
             args = arguments(sym)
             a1 = setmetadata(args[1], SymScope, LocalScope())
-            similarterm(sym, operation(sym), [a1, args[2:end]...])
+            similarterm(sym, operation(sym), [a1, args[2:end]...];
+                metadata = metadata(sym))
         else
             setmetadata(sym, SymScope, LocalScope())
         end
@@ -767,7 +768,8 @@ function ParentScope(sym::Union{Num, Symbolic, Symbolics.Arr{Num}})
             args = arguments(sym)
             a1 = setmetadata(args[1], SymScope,
                 ParentScope(getmetadata(value(args[1]), SymScope, LocalScope())))
-            similarterm(sym, operation(sym), [a1, args[2:end]...])
+            similarterm(sym, operation(sym), [a1, args[2:end]...];
+                metadata = metadata(sym))
         else
             setmetadata(sym, SymScope,
                 ParentScope(getmetadata(value(sym), SymScope, LocalScope())))
@@ -785,7 +787,8 @@ function DelayParentScope(sym::Union{Num, Symbolic, Symbolics.Arr{Num}}, N)
             args = arguments(sym)
             a1 = setmetadata(args[1], SymScope,
                 DelayParentScope(getmetadata(value(args[1]), SymScope, LocalScope()), N))
-            similarterm(sym, operation(sym), [a1, args[2:end]...])
+            similarterm(sym, operation(sym), [a1, args[2:end]...];
+                metadata = metadata(sym))
         else
             setmetadata(sym, SymScope,
                 DelayParentScope(getmetadata(value(sym), SymScope, LocalScope()), N))
@@ -800,7 +803,8 @@ function GlobalScope(sym::Union{Num, Symbolic, Symbolics.Arr{Num}})
         if istree(sym) && operation(sym) == getindex
             args = arguments(sym)
             a1 = setmetadata(args[1], SymScope, GlobalScope())
-            similarterm(sym, operation(sym), [a1, args[2:end]...])
+            similarterm(sym, operation(sym), [a1, args[2:end]...];
+                metadata = metadata(sym))
         else
             setmetadata(sym, SymScope, GlobalScope())
         end
@@ -817,12 +821,14 @@ function renamespace(sys, x)
         T = typeof(x)
         if istree(x) && operation(x) isa Operator
             return similarterm(x, operation(x),
-                Any[renamespace(sys, only(arguments(x)))])::T
+                Any[renamespace(sys, only(arguments(x)))];
+                metadata = metadata(x))::T
         end
         if istree(x) && operation(x) === getindex
             args = arguments(x)
             return similarterm(
-                x, operation(x), vcat(renamespace(sys, args[1]), args[2:end]))::T
+                x, operation(x), vcat(renamespace(sys, args[1]), args[2:end]);
+                metadata = metadata(x))::T
         end
         let scope = getmetadata(x, SymScope, LocalScope())
             if scope isa LocalScope

src/systems/diffeqs/abstractodesystem.jl

@@ -232,7 +232,8 @@ function delay_to_function(expr, iv, sts, ps, h)
     elseif istree(expr)
         return similarterm(expr,
             operation(expr),
-            map(x -> delay_to_function(x, iv, sts, ps, h), arguments(expr)))
+            map(x -> delay_to_function(x, iv, sts, ps, h), arguments(expr));
+            metadata = metadata(expr))
     else
         return expr
     end

src/utils.jl

@@ -21,14 +21,16 @@ function detime_dvs(op)
     elseif issym(operation(op))
         Sym{Real}(nameof(operation(op)))
     else
-        similarterm(op, operation(op), detime_dvs.(arguments(op)))
+        similarterm(op, operation(op), detime_dvs.(arguments(op));
+            metadata = metadata(op))
     end
 end
 
 function retime_dvs(op, dvs, iv)
     issym(op) && return Sym{FnType{Tuple{symtype(iv)}, Real}}(nameof(op))(iv)
     istree(op) ?
-    similarterm(op, operation(op), retime_dvs.(arguments(op), (dvs,), (iv,))) :
+    similarterm(op, operation(op), retime_dvs.(arguments(op), (dvs,), (iv,));
+        metadata = metadata(op)) :
     op
 end