Skip to content

Commit

Permalink
revised dot,big, int128, fixed #48
Browse files Browse the repository at this point in the history
  • Loading branch information
chakravala committed Jan 10, 2021
1 parent 8dc63ab commit 7d03ae0
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 5 deletions.
2 changes: 1 addition & 1 deletion Project.toml
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
8 changes: 5 additions & 3 deletions deps/svn.jl
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

rpsl = "redcsl"

ρ = 5
ρ = 7

date = Dict(
0 => "2017-05-16",
Expand All @@ -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",
Expand All @@ -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)
Expand Down
3 changes: 3 additions & 0 deletions src/Reduce.jl
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/parser.jl
Original file line number Diff line number Diff line change
Expand Up @@ -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")),Core.var"@big_str",Core.var"@int128_str")
print(io,expr.args[end])
else
throw(ReduceError("Macro $(expr.args[1]) block structure not supported\n\n$expr"))
Expand Down

2 comments on commit 7d03ae0

@chakravala
Copy link
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@JuliaRegistrator register()

@JuliaRegistrator
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Registration pull request created: JuliaRegistries/General/27676

After the above pull request is merged, it is recommended that a tag is created on this repository for the registered package version.

This will be done automatically if the Julia TagBot GitHub Action is installed, or can be done manually through the github interface, or via:

git tag -a v1.2.10 -m "<description of version>" 7d03ae000f0368fc1e6e81d7704ed0de6e811855
git push origin v1.2.10

Please sign in to comment.