Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

simplify issymbollike #287

Merged
merged 5 commits into from
Oct 10, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Project.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name = "RecursiveArrayTools"
uuid = "731186ca-8d62-57ce-b412-fbd966d074cd"
authors = ["Chris Rackauckas <[email protected]>"]
version = "2.38.10"
version = "2.39.0"

[deps]
Adapt = "79e6a3ab-5dfb-504d-930d-738a2a938a0e"
Expand Down
15 changes: 4 additions & 11 deletions src/vector_of_array.jl
Original file line number Diff line number Diff line change
Expand Up @@ -64,17 +64,9 @@ end
struct AllObserved
end

Base.@pure __parameterless_type(T) = Base.typename(T).wrapper
oscardssmith marked this conversation as resolved.
Show resolved Hide resolved

@generated function issymbollike(x)
x <: Union{Symbol, AllObserved} && return quote true end
ss = ["Operation", "Variable", "Sym", "Num", "Term"]
s = string(Symbol(__parameterless_type(x)))
bool = any(x -> occursin(x, s), ss)
quote
$bool
end
end
# extended by Symbolcs
issymbollike(::Any) = false
issymbollike(::Union{Symbol, AllObserved}) = true

function Base.Array(VA::AbstractVectorOfArray{T, N, A}) where {T, N,
A <: AbstractVector{
Expand Down Expand Up @@ -196,6 +188,7 @@ Base.@propagate_inbounds function Base.getindex(A::AbstractDiffEqArray{T, N},
RecursiveArrayTools.VectorOfArray(A.u)[I...]
end

__parameterless_type(T) = Base.typename(T).wrapper
Base.@propagate_inbounds function Base.getindex(A::AbstractVectorOfArray{T, N},
I::Colon...) where {T, N}
@assert length(I) == ndims(A.u[1]) + 1
Expand Down