Merge remote-tracking branch 'origin' into ale/terminterface1

Author: Alessandro Cheli

src/SymbolicUtils.jl

@@ -19,8 +19,7 @@ using TermInterface
 import TermInterface: iscall, isexpr, head, children,
                       operation, arguments, metadata, maketerm, sorted_arguments
 
-const istree = iscall
-Base.@deprecate_binding istree iscall
+Base.@deprecate istree iscall
 export istree, operation, arguments, sorted_arguments, similarterm, iscall
 # Sym, Term,
 # Add, Mul and Pow

src/types.jl

@@ -582,14 +582,38 @@ function basicsymbolic(f, args, stype, metadata)
         T = _promote_symtype(f, args)
     end
     if T <: LiteralReal
-        Term{T}(f, args, metadata=metadata)
-    elseif T <: Number && (f in (+, *) || (f in (/, ^) && length(args) == 2)) && all(x->symtype(x) <: Number, args)
-        res = f(args...)
-        if res isa Symbolic
-            @set! res.metadata = metadata
+        @goto FALLBACK
+    elseif all(x->symtype(x) <: Number, args)
+        if f === (+)
+            res = +(args...)
+            if isadd(res)
+                @set! res.metadata = metadata
+            end
+            res
+        elseif f == (*)
+            res = *(args...)
+            if ismul(res)
+                @set! res.metadata = metadata
+            end
+            res
+        elseif f == (/)
+            @assert length(args) == 2
+            res = args[1] / args[2]
+            if isdiv(res)
+                @set! res.metadata = metadata
+            end
+            res
+        elseif f == (^) && length(args) == 2
+            res = args[1] ^ args[2]
+            if ispow(res)
+                @set! res.metadata = metadata
+            end
+            res
+        else
+            @goto FALLBACK
         end
-        return res
     else
+        @label FALLBACK
         Term{T}(f, args, metadata=metadata)
     end
 end

test/basics.jl

@@ -227,7 +227,10 @@ end
 
     # test that maketerm sets metadata correctly
     metadata = Base.ImmutableDict{DataType, Any}(Ctx1, "meta_1")
-    s = SymbolicUtils.maketerm(typeof(a^b), ^, [a * b, 3],  metadata)
+    s = SymbolicUtils.maketerm(typeof(a^b), ^, [a * b, 3], metadata)
+    @test !hasmetadata(s, Ctx1)
+
+    s = SymbolicUtils.maketerm(typeof(a^b), *, [a * b, 3], metadata)
     @test hasmetadata(s, Ctx1)
     @test getmetadata(s, Ctx1) == "meta_1"
 end