Merge pull request #110 from maartenvd/master

in-place operations no longer have to be in-place

Author: Jutho

src/indexnotation/parser.jl

@@ -103,11 +103,11 @@ function tensorify(ex::Expr)
             end
             if isassignment(ex)
                 if ex.head == :(=)
-                    return instantiate(dst, false, rhs, true, leftind, rightind)
+                    return Expr(:(=), dst,instantiate(dst, false, rhs, true, leftind, rightind))
                 elseif ex.head == :(+=)
-                    return instantiate(dst, true, rhs, 1, leftind, rightind)
+                    return Expr(:(=), dst,instantiate(dst, true, rhs, 1, leftind, rightind))
                 else
-                    return instantiate(dst, true, rhs, -1, leftind, rightind)
+                    return Expr(:(=), dst,instantiate(dst, true, rhs, -1, leftind, rightind))
                 end
             else
                 return Expr(:(=), dst, instantiate(nothing, false, rhs, true, leftind, rightind, false))

src/indexnotation/preprocessors.jl

@@ -110,7 +110,7 @@ function extracttensorobjects(ex::Expr)
     tensordict = Dict{Any,Any}(a => gensym() for a in alltensors)
     pre = Expr(:block, [Expr(:(=), tensordict[a], a) for a in existingtensors]...)
     ex = replacetensorobjects((obj,leftind,rightind)->get(tensordict, obj, obj), ex)
-    post = Expr(:block, [Expr(:(=), a, tensordict[a]) for a in newtensors]...)
+    post = Expr(:block, [Expr(:(=), a, tensordict[a]) for a in unique!(vcat(newtensors,outputtensors))]...)
     pre2 = Expr(:macrocall, Symbol("@notensor"), LineNumberNode(@__LINE__, Symbol(@__FILE__)), pre)
     post2 = Expr(:macrocall, Symbol("@notensor"), LineNumberNode(@__LINE__, Symbol(@__FILE__)), post)
     return Expr(:block, pre2, ex, post2)