Skip to content

Commit

Permalink
typos (#494)
Browse files Browse the repository at this point in the history
  • Loading branch information
musvaage committed Jul 20, 2023
1 parent 2df5ef8 commit 7f59101
Show file tree
Hide file tree
Showing 7 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion docs/src/installation.md
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ This problem doesn't affect Julia ≥ 1.6!

### Other methods

If you have installed R by some other method (e.g. building from scratch, or files copied but not installed in the usual manner), which often happens on cluster installations, then you may need to set `R_HOME` or your `PATH` as described above before running `Pkg.build("RCall")` in order for the build script to find your R installation. RCall requries R to be installed with its shared library. It could be done with the flag `--enable-R-shlib`, consult your server administrator to see if it was the case.
If you have installed R by some other method (e.g. building from scratch, or files copied but not installed in the usual manner), which often happens on cluster installations, then you may need to set `R_HOME` or your `PATH` as described above before running `Pkg.build("RCall")` in order for the build script to find your R installation. RCall requires R to be installed with its shared library. It could be done with the flag `--enable-R-shlib`, consult your server administrator to see if it was the case.

For some environments, you might also need to specify `LD_LIBRARY_PATH`
```sh
Expand Down
2 changes: 1 addition & 1 deletion src/convert/default.jl
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,7 @@ rcopy(r) = r
# logic of default sexp

"""
`robject(x)` converts a Julia object `x` to a corresponding RObject implictly. Explict conversions
`robject(x)` converts a Julia object `x` to a corresponding RObject implicitly. Explicit conversions
could be called with `robject(<R Class>, x)`.
"""
robject(s) = RObject(s)
Expand Down
2 changes: 1 addition & 1 deletion src/ijulia.jl
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# IJulia hooks for displaying plots with RCall

# TODO: create a special graphics device. This would allow us to not accidently close devices opened by users, and display plots immediately as they appear.
# TODO: create a special graphics device. This would allow us to not accidentally close devices opened by users, and display plots immediately as they appear.

ijulia_mime = nothing

Expand Down
2 changes: 1 addition & 1 deletion src/language.jl
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ function rlang_p(f, args...; kwargs...)
l
end

"Create a function call from a function pointer and a list of arguments and return it as an RObject, which can then be evaulated"
"Create a function call from a function pointer and a list of arguments and return it as an RObject, which can then be evaluated"
rlang(f, args...; kwargs...) = RObject(rlang_p(f,args...; kwargs...))


Expand Down
6 changes: 3 additions & 3 deletions src/methods.jl
Original file line number Diff line number Diff line change
Expand Up @@ -459,13 +459,13 @@ isNA(x::Float64) = is_ieee_na(x)
isNA(x::Int32) = x == Const.NaInt
isNA(s::Ptr{CharSxp}) = s === sexp(Const.NaString)
isNA(s::Ptr{S}) where S<:VectorSxp = length(s) == 1 ? isNA(s[1]) : false
# all other values are consided as non-NA.
# all other values are considered as non-NA.
isNA(s::Any) = false

isna(s::Ptr{S}, i::Integer) where S<:VectorSxp = isNA(s[i])
isna(s::Ptr{S}) where S<:VectorSxp = reshape(BitArray([isNA(a) for a in s]), size(s))
"""
Check if the ith member of s coorespond to R's NA values.
Check if the ith member of s correspond to R's NA values.
"""
isna(r::RObject, i::Integer) = isna(r.p, i)
"""
Expand Down Expand Up @@ -544,7 +544,7 @@ getindex(e::RObject{EnvSxp},s) = RObject(getindex(sexp(e),s))
function setindex!(e::Ptr{EnvSxp},v::Ptr{S},s::Ptr{StrSxp}) where S<:Sxp
# `Rf_defineVar` is unsafe to use if the binding is locked.
# However, `setVarInFrame` is not exported. `base::assign` is
# an avaliable alternative.
# an available alternative.
rcall_p(Const.BaseNamespace["assign"], s, v, envir = e)
end
function setindex!(e::Ptr{EnvSxp},v,s)
Expand Down
2 changes: 1 addition & 1 deletion src/render.jl
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ function render(script::String)
end

"""
Prepare code for evaluating the julia expressions. When the code is execulated,
Prepare code for evaluating the julia expressions. When the code is evaluated,
the results are stored in the R environment `#JL`.
"""
function prepare_inline_julia_code(symdict, escape::Bool=false)
Expand Down
2 changes: 1 addition & 1 deletion src/types.jl
Original file line number Diff line number Diff line change
Expand Up @@ -298,7 +298,7 @@ end


"""
Convert a `Ptr{UnknownSxp}` to an approptiate `Ptr{S<:Sxp}`.
Convert a `Ptr{UnknownSxp}` to an appropriate `Ptr{S<:Sxp}`.
"""
function sexp(p::Ptr{UnknownSxp})
typ = sexpnum(p)
Expand Down

0 comments on commit 7f59101

Please sign in to comment.