fixed docs for @operator, fixed Term

AlgebraicJulia · Sep 11, 2024 · 4603ed9 · 4603ed9
1 parent ecfa931
commit 4603ed9
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 8 deletions.
diff --git a/src/SymbolicUtilsInterop.jl b/src/SymbolicUtilsInterop.jl
@@ -51,9 +51,9 @@ function decapodes.Term(t::SymbolicUtils.BasicSymbolic)
         elseif op == ∂ₜ
             decapodes.Tan(only(termargs))
         elseif length(args) == 1
-            decapodes.App1(nameof(op, args...), termargs...)
+            decapodes.App1(nameof(op, symtype.(args)...), termargs...)
         elseif length(args) == 2
-            decapodes.App2(nameof(op, args...), termargs...)
+            decapodes.App2(nameof(op, symtype.(args)...), termargs...)
         else
             error("was unable to convert $t into a Term")
         end

diff --git a/src/symbolictheoryutils.jl b/src/symbolictheoryutils.jl
@@ -52,7 +52,7 @@ end
 ```
 as well as
 ```
-foo(S1, S2, ...) where {T1<:ThDEC, ...}
+foo(S1, S2, ...) where {S1<:DECQuantity, ...}
     s = promote_symtype(f, S1, S2, ...)
     SymbolicUtils.Term{s}(foo, [S1, S2, ...])
 end
@@ -109,6 +109,7 @@ macro operator(head, body)
         export $f
     end)
 
+    # if there are rewriting rules, add a method which accepts the function symbol and its arity (to prevent shadowing on operators like `-`)
     if !isempty(rulecalls)
         push!(result.args, quote
             function rules(::typeof($f), ::Val{$arity})

diff --git a/test/decasymbolic.jl b/test/decasymbolic.jl
@@ -30,11 +30,7 @@ u, v = @syms u::PrimalForm{0, :X, 2} du::PrimalForm{1, :X, 2}
     @test Term(1) == Lit(Symbol("1"))
     @test Term(a) == Var(:a)
     @test Term(∂ₜ(u)) == Tan(Var(:u))
-    @test_broken Term(⋆(ω)) == App1(:⋆₁, Var(:ω))
-    # @test_broken Term(ThDEC.♭(ψ)) == App1(:♭s, Var(:ψ)) 
-    # @test Term(DiagrammaticEquations.ThDEC.♯(du))
-
-    # @test_throws ThDEC.SortError ThDEC.⋆(ϕ)
+    @test Term(★(ω)) == App1(:★₁, Var(:ω))
 
     # test binary operator conversion to decaexpr
     @test Term(a + b) == Plus(Term[Var(:a), Var(:b)])