Skip to content

Commit

Permalink
Removed comment from the top of the patch, since it caused problems
Browse files Browse the repository at this point in the history
  • Loading branch information
Orient committed Oct 9, 2023
1 parent 3aa7707 commit a7d5b47
Showing 1 changed file with 18 additions and 20 deletions.
Original file line number Diff line number Diff line change
@@ -1,22 +1,20 @@
There is an error in current JuliaCall, which should be patched in upcoming versions.
See https://github.com/Non-Contradiction/JuliaCall/issues/203
diff -ruN JuliaCall_orig/inst/julia/JuliaObject.jl JuliaCall/inst/julia/JuliaObject.jl
--- JuliaCall_orig/inst/julia/JuliaObject.jl 2022-09-07 18:13:31.000000000 +0200
+++ JuliaCall/inst/julia/JuliaObject.jl 2023-09-26 17:29:44.310679473 +0200
--- JuliaCall_orig/inst/julia/JuliaObject.jl 2023-10-06 15:50:37.057320040 +0200
+++ JuliaCall/inst/julia/JuliaObject.jl 2023-10-09 16:21:42.293384419 +0200
@@ -74,14 +74,14 @@
## we should use JuliaObject for general AbstractArray
@static if julia07
@suppress_err begin
- JuliaCall.sexpclass(x :: AbstractArray{T}) where {T} = RClass{:JuliaObject}
+ @eval JuliaCall.sexpclass(x :: AbstractArray{T}) where {T} = RClass{:JuliaObject}
end

## AbstractArray{Any} should be converted to R List
sexpclass(x :: AbstractArray{Any}) = RClass{:list}
else
@suppress_err begin
- JuliaCall.sexp(x :: AbstractArray{T}) where {T} = sexp(JuliaObject(x))
+ @eval JuliaCall.sexp(x :: AbstractArray{T}) where {T} = sexp(JuliaObject(x))
end

## AbstractArray{Any} should be converted to R List
## we should use JuliaObject for general AbstractArray
@static if julia07
@suppress_err begin
- JuliaCall.sexpclass(x :: AbstractArray{T}) where {T} = RClass{:JuliaObject}
+ @eval JuliaCall.sexpclass(x :: AbstractArray{T}) where {T} = RClass{:JuliaObject}
end

## AbstractArray{Any} should be converted to R List
sexpclass(x :: AbstractArray{Any}) = RClass{:list}
else
@suppress_err begin
- JuliaCall.sexp(x :: AbstractArray{T}) where {T} = sexp(JuliaObject(x))
+ @eval JuliaCall.sexp(x :: AbstractArray{T}) where {T} = sexp(JuliaObject(x))
end

## AbstractArray{Any} should be converted to R List

0 comments on commit a7d5b47

Please sign in to comment.