refactor: assume get_op_name gives string not vector

Author: MilesCranmer

src/Strings.jl

@@ -13,13 +13,13 @@ function dispatch_op_name(::Val{deg}, ::Nothing, idx)::Vector{Char} where {deg}
 end
 function dispatch_op_name(::Val{deg}, operators::AbstractOperatorEnum, idx) where {deg}
     if deg == 1
-        return get_op_name(operators.unaops[idx])::Vector{Char}
+        return collect(get_op_name(operators.unaops[idx])::String)
     else
-        return get_op_name(operators.binops[idx])::Vector{Char}
+        return collect(get_op_name(operators.binops[idx])::String)
     end
 end
 
-const OP_NAME_CACHE = (; x=Dict{UInt64,Vector{Char}}(), lock=Threads.SpinLock())
+const OP_NAME_CACHE = (; x=Dict{UInt64,String}(), lock=Threads.SpinLock())
 
 function get_op_name(op)
     h = hash(op)
@@ -29,18 +29,17 @@ function get_op_name(op)
         if haskey(cache, h)
             return cache[h]
         end
-        op_s = sizehint!(Char[], 10)
-        if op isa Broadcast.BroadcastFunction
-            append!(op_s, string(op.f))
-            if length(op_s) == 1 && first(op_s) in ('+', '-', '*', '/', '^')
+        op_s = if op isa Broadcast.BroadcastFunction
+            base_op_s = string(op.f)
+            if length(base_op_s) == 1 && first(base_op_s) in ('+', '-', '*', '/', '^')
                 # Like `.+`
-                pushfirst!(op_s, '.')
+                string('.', base_op_s)
             else
                 # Like `cos.`
-                push!(op_s, '.')
+                string(base_op_s, '.')
             end
         else
-            append!(op_s, string(op))
+            string(op)
         end
         cache[h] = op_s
         return op_s

test/test_params.jl

@@ -28,12 +28,12 @@ maximum_residual = 1e-2
 
     custom_cos(x) = cos(x)^2
 
-    DE.get_op_name(::typeof(safe_log)) = ['l', 'o', 'g']
-    DE.get_op_name(::typeof(safe_log2)) = ['l', 'o', 'g', '2']
-    DE.get_op_name(::typeof(safe_log10)) = ['l', 'o', 'g', '1', '0']
-    DE.get_op_name(::typeof(safe_log1p)) = ['l', 'o', 'g', '1', 'p']
-    DE.get_op_name(::typeof(safe_acosh)) = ['a', 'c', 'o', 's', 'h']
-    DE.get_op_name(::typeof(safe_sqrt)) = ['s', 'q', 'r', 't']
+    DE.get_op_name(::typeof(safe_log)) = "log"
+    DE.get_op_name(::typeof(safe_log2)) = "log2"
+    DE.get_op_name(::typeof(safe_log10)) = "log10"
+    DE.get_op_name(::typeof(safe_log1p)) = "log1p"
+    DE.get_op_name(::typeof(safe_acosh)) = "acosh"
+    DE.get_op_name(::typeof(safe_sqrt)) = "sqrt"
 end
 
 HEADER_GUARD_TEST_PARAMS = true

test/test_print.jl

@@ -35,7 +35,7 @@ end
 
 @isdefined(safe_pow) || @eval begin
     safe_pow(x::T, y::T) where {T<:Number} = (x < 0 && y != round(y)) ? T(NaN) : x^y
-    DE.get_op_name(::typeof(safe_pow)) = ['^']
+    DE.get_op_name(::typeof(safe_pow)) = "^"
 end
 for binop in [safe_pow, ^]
     opts = OperatorEnum(;