Revert keyword argument T back to type in term to avoid breaking

[skip ci]

Author: bowenszhu

src/methods.jl

@@ -179,9 +179,9 @@ for (f, Domain) in [(==) => Number, (!=) => Number,
                     xor => Bool]
     @eval begin
         promote_symtype(::$(typeof(f)), ::Type{<:$Domain}, ::Type{<:$Domain}) = Bool
-        (::$(typeof(f)))(a::Symbolic{<:$Domain}, b::$Domain) = term($f, a, b; T = Bool)
-        (::$(typeof(f)))(a::Symbolic{<:$Domain}, b::Symbolic{<:$Domain}) = term($f, a, b; T = Bool)
-        (::$(typeof(f)))(a::$Domain, b::Symbolic{<:$Domain}) = term($f, a, b; T = Bool)
+        (::$(typeof(f)))(a::Symbolic{<:$Domain}, b::$Domain) = term($f, a, b; type = Bool)
+        (::$(typeof(f)))(a::Symbolic{<:$Domain}, b::Symbolic{<:$Domain}) = term($f, a, b; type = Bool)
+        (::$(typeof(f)))(a::$Domain, b::Symbolic{<:$Domain}) = term($f, a, b; type = Bool)
     end
 end
 

src/rule.jl

@@ -67,10 +67,10 @@ function makepattern(expr, keys)
                     makeslot(expr.args[2], keys)
                 end
             else
-                :(term($(map(x -> makepattern(x, keys), expr.args)...); T = Any))
+                :(term($(map(x -> makepattern(x, keys), expr.args)...); type = Any))
             end
         elseif expr.head === :ref
-            :(term(getindex, $(map(x -> makepattern(x, keys), expr.args)...); T = Any))
+            :(term(getindex, $(map(x -> makepattern(x, keys), expr.args)...); type = Any))
         elseif expr.head === :$
             return esc(expr.args[1])
         else

src/types.jl

@@ -609,11 +609,11 @@ function makepow(a, b)
     base, exp
 end
 
-function term(f, args...; T = nothing)
-    if T === nothing
-        T = _promote_symtype(f, args)
+function term(f, args...; type = nothing)
+    if type === nothing
+        type = _promote_symtype(f, args)
     end
-    _Term(T, f, [args...])
+    _Term(type, f, [args...])
 end
 
 """

test/basics.jl

@@ -91,7 +91,7 @@ struct Ctx2 end
 
 
     @test isequal(substitute(1+sqrt(a), Dict(a => 2), fold=false),
-                  1 + term(sqrt, 2, T=Number))
+                  1 + term(sqrt, 2, type = Number))
     @test substitute(1+sqrt(a), Dict(a => 2), fold=true) isa Float64
 end
 
@@ -173,7 +173,7 @@ end
     @syms a b c
     @test repr(a+b) == "a + b"
     @test repr(-a) == "-a"
-    @test repr(term(-, a; T = Real)) == "-a"
+    @test repr(term(-, a; type = Real)) == "-a"
     @test repr(-a + 3) == "3 - a"
     @test repr(-(a + b)) == "-a - b"
     @test repr((2a)^(-2a)) == "(2a)^(-2a)"
@@ -196,7 +196,7 @@ end
     @test repr(2a+1+3a^2+2b+3b^2+4a*b) == "1 + 2a + 2b + 3(a^2) + 4a*b + 3(b^2)"
 
     @syms a b[1:3] c d[1:3]
-    get(x, i) = term(getindex, x, i; T = Number)
+    get(x, i) = term(getindex, x, i; type = Number)
     b1, b3, d1, d2 = get(b,1),get(b,3), get(d,1), get(d,2)
     @test repr(a + b3 + b1 + d2 + c) == "a + b[1] + b[3] + c + d[2]"
     @test repr(expand((c + b3 - d1)^3)) == "b[3]^3 + 3(b[3]^2)*c - 3(b[3]^2)*d[1] + 3b[3]*(c^2) - 6b[3]*c*d[1] + 3b[3]*(d[1]^2) + c^3 - 3(c^2)*d[1] + 3c*(d[1]^2) - (d[1]^3)"

test/rewrite.jl

@@ -38,11 +38,11 @@ end
 
     @eqtest @rule(+(~~x) => ~~x)(a + b) == [a,b]
     @eqtest @rule(+(~~x) => ~~x)(term(+, a, b, c)) == [a,b,c]
-    @eqtest @rule(+(~~x, ~y, ~~x)=>(~~x, ~y))(term(+, 9, 8, 9; T = Any)) ==
+    @eqtest @rule(+(~~x, ~y, ~~x)=>(~~x, ~y))(term(+, 9, 8, 9; type = Any)) ==
             (Symbolic[9], _Const(8))
-    @eqtest @rule(+(~~x, ~y, ~~x)=>(~~x, ~y, ~~x))(term(+, 9, 8, 9, 9, 8; T = Any)) ==
+    @eqtest @rule(+(~~x, ~y, ~~x)=>(~~x, ~y, ~~x))(term(+, 9, 8, 9, 9, 8; type = Any)) ==
             (Symbolic[9, 8], _Const(9), Symbolic[9, 8])
-    @eqtest @rule(+(~~x, ~y, ~~x)=>(~~x, ~y, ~~x))(term(+, 6; T = Any)) ==
+    @eqtest @rule(+(~~x, ~y, ~~x)=>(~~x, ~y, ~~x))(term(+, 6; type = Any)) ==
             (Symbolic[], _Const(6), Symbolic[])
 end