copy list to OrderedDict by default

also sanitize variable names by replaceing dots
JuliaInterop · Nov 14, 2017 · f3d0613 · f3d0613
1 parent b2b4a39
commit f3d0613
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/src/convert/base.jl b/src/convert/base.jl
@@ -196,15 +196,19 @@ end
 # VecSxp
 rcopy(::Type{Array}, s::Ptr{VecSxp}) = rcopy(Array{Any}, s)
 rcopy(::Type{Vector}, s::Ptr{VecSxp}) = rcopy(Vector{Any}, s)
-function rcopy(::Type{A}, s::Ptr{VecSxp}) where A<:Associative
+function rcopy(::Type{A}, s::Ptr{VecSxp}; sanitize::Bool=true) where A<:Associative
     protect(s)
     local a
     try
         a = A()
         K = keytype(a)
         V = valtype(a)
-        for (k,v) in zip(getnames(s),s)
-            a[rcopy(K,k)] = rcopy(V,v)
+        for (k, v) in zip(getnames(s), s)
+            if sanitize && (K <: AbstractString || K <: Symbol)
+                a[K(replace(rcopy(String, k), ".", "_"))] = rcopy(V, v)
+            else
+                a[rcopy(K, k)] = rcopy(V, v)
+            end
         end
     finally
         unprotect(1)

diff --git a/src/convert/default.jl b/src/convert/default.jl
@@ -145,7 +145,7 @@ function rcopytype(::Type{RClass{Sym}}, s::Ptr{VecSxp}) where Sym
     elseif isnull(getnames(s))
         Array{Any}
     else
-        Dict{Symbol,Any}
+        OrderedDict{Symbol,Any}
     end
 end