Refactor JuliaAPI

Author: tkf

src/IPython.jl

@@ -2,6 +2,7 @@ module IPython
 
 using Compat
 using Compat: @warn, @info
+include("julia_api.jl")
 include("core.jl")
 include("convenience.jl")
 include("julia_repl.jl")

src/core.jl

@@ -5,21 +5,10 @@ julia_exepath() =
     joinpath(VERSION < v"0.7.0-DEV.3073" ? JULIA_HOME : Base.Sys.BINDIR,
              Base.julia_exename())
 
-function eval_str(code::String)
-    Base.eval(Main, Meta.parse(strip(code)))
-end
-
-set_var(name::String, value) = set_var(Symbol(name), value)
-
-function set_var(name::Symbol, value)
-    Base.eval(Main, :($name = $value))
-    nothing
-end
-
 function _start_ipython(name; kwargs...)
     pyimport("replhelper")[name](;
-        eval_str = eval_str,
-        set_var = set_var,
+        eval_str = JuliaAPI.eval_str,
+        api = JuliaAPI,
         kwargs...)
 end
 

src/julia_api.jl

@@ -0,0 +1,33 @@
+module JuliaAPI
+
+using Compat
+using Compat.REPL
+
+function eval_str(code::AbstractString;
+                  scope::Module = Main,
+                  filename::AbstractString = "string",
+                  auto_jlwrap = true,
+                  force_jlwrap = false)
+    return include_string(scope, code, filename)
+end
+
+@static if VERSION < v"0.7-"
+    getattr(obj, name) = getfield(obj, Symbol(name))
+    function setattr(obj, name, value)
+        setfield!(obj, Symbol(name), value)
+        return nothing
+    end
+else
+    getattr(obj, name) = getproperty(obj, Symbol(name))
+    function setattr(obj, name, value)
+        setproperty!(obj, Symbol(name), value)
+        return nothing
+    end
+end
+
+function setattr(mod::Module, name, value)
+    Base.eval(mod, :($(Symbol(name)) = $value))
+    return nothing
+end
+
+end  # module

src/replhelper/core.py

@@ -32,15 +32,19 @@ def py_name(name):
 
 class JuliaAPI(object):
 
-    def __init__(self, eval_str, set_var):
+    def __init__(self, eval_str, api):
         self.eval = eval_str
-        self.set_var = set_var
+        self.api = api
+
+    def __getattr__(self, name):
+        return self.eval(name, scope=self.api)
 
 
 class JuliaNameSpace(object):
 
     def __init__(self, julia):
         self.__julia = julia
+        self.__scope = julia.eval("Main")
 
     eval = property(lambda self: self.__julia.eval)
 
@@ -49,7 +53,7 @@ def __setattr__(self, name, value):
             object.__setattr__(self, name, value)
             # super().__setattr__(name, value)
         else:
-            self.__julia.set_var(name, value)
+            self.__julia.setattr(self.__scope, name, value)
 
     def __getattr__(self, name):
         if name.startswith('_'):

src/replhelper/tests/test_api.py

@@ -0,0 +1,21 @@
+def test_eval(julia):
+    assert julia.eval("123456789") == 123456789
+
+
+def test_mutable_struct(julia):
+    struct = julia.eval("""Base.eval(Module(), quote
+    mutable struct Spam
+        egg
+    end
+    Spam(123)
+    end)""")
+    assert julia.getattr(struct, "egg") == 123
+    assert julia.setattr(struct, "egg", 456) is None
+    assert julia.getattr(struct, "egg") == 456
+
+
+def test_mutate_main(julia):
+    scope = julia.eval("Main")
+    assert julia.setattr(scope, "spam", 789) is None
+    assert julia.getattr(scope, "spam") == 789
+    assert julia.eval("Main.spam") == 789