diff --git a/Project.toml b/Project.toml index 67be019..1824cca 100644 --- a/Project.toml +++ b/Project.toml @@ -1,7 +1,7 @@ name = "Reduce" uuid = "93e0c654-6965-5f22-aba9-9c1ae6b3c259" authors = ["Michael Reed"] -version = "1.2.9" +version = "1.2.10" [deps] REPL = "3fa0cd96-eef1-5676-8a61-b3b8758bbffb" diff --git a/deps/svn.jl b/deps/svn.jl index 4c612da..7767fdc 100644 --- a/deps/svn.jl +++ b/deps/svn.jl @@ -3,7 +3,7 @@ rpsl = "redcsl" -ρ = 5 +ρ = 7 date = Dict( 0 => "2017-05-16", @@ -12,7 +12,8 @@ date = Dict( 3 => "2019-04-13", 4 => "2019-09-15", 5 => "2020-03-01", - 6 => "2020-06-24") + 6 => "2020-06-24", + 7 => "2020-10-07") rsvn = Dict( 0 => "4052", @@ -21,7 +22,8 @@ rsvn = Dict( 3 => "4961", 4 => "5129", 5 => "5286", - 6 => "5377") + 6 => "5377", + 7 => "5424") function _spawn(cmd, input=devnull, output=devnull) run(pipeline(cmd, stdin=input, stdout=output, stderr=stderr), wait=false) diff --git a/src/Reduce.jl b/src/Reduce.jl index 77166a5..dd56bdc 100644 --- a/src/Reduce.jl +++ b/src/Reduce.jl @@ -117,8 +117,11 @@ for T ∈ (RExpr,Expr,Symbol,String) Base.log1p(z::$T) = 1+log(z) dot(a::$T,b) = conj(a)*b dot(a,b::$T) = conj(a)*b + dot(a::$T,b::$T) = conj(a)*b end end +dot(a::Expr,b::Symbol) = conj(a)*b +dot(a::Symbol,b::Expr) = conj(a)*b include("unary.jl") # load unary operators include("args.jl") # load calculus operators diff --git a/src/parser.jl b/src/parser.jl index 08533c0..ad37d57 100644 --- a/src/parser.jl +++ b/src/parser.jl @@ -623,7 +623,7 @@ end elseif expr.head == :(::) show_expr(io,expr.args[1]) elseif expr.head == :macrocall - if expr.args[1] ∈ (Symbol("@big_str"),Symbol("@int128_str"),Expr(:.,:Core,QuoteNode(Symbol("@big_str"))),Expr(:.,:Core,QuoteNode(Symbol("@int128_str")))) + if expr.args[1] ∈ (Symbol("@big_str"),Symbol("@int128_str"),GlobalRef(Core,Symbol("@big_str")),GlobalRef(Core,Symbol("@int128_str"))) print(io,expr.args[end]) else throw(ReduceError("Macro $(expr.args[1]) block structure not supported\n\n$expr"))