Add ExprSplitter (#425)

* Add ExprSplitter and remove `prepare_thunk` and `split_expressions`

The main motivation is to eliminate their need to `eval`, which feels
like a code smell.

* Restrict new releases to still-supported Julia versions

* Fix doctests

Author: timholy

.travis.yml

@@ -7,8 +7,7 @@ os:
 
 julia:
   - 1.0
-  - 1.3
-  - 1.4
+  - 1
   - nightly
 
 arch:
@@ -28,7 +27,7 @@ codecov: true
 jobs:
   include:
     - stage: "Documentation"
-      julia: 1.4
+      julia: 1
       os: linux
       arch: x64
       script:

Project.toml

@@ -1,6 +1,6 @@
 name = "JuliaInterpreter"
 uuid = "aa1ae85d-cabe-5617-a682-6adf51b2e16a"
-version = "0.7.26"
+version = "0.8.0"
 
 [deps]
 CodeTracking = "da1fd8a2-8d9e-5ec2-8556-3022fb5608a2"
@@ -10,7 +10,7 @@ UUIDs = "cf7118a7-6976-5b1a-9a39-7adc72f591a4"
 
 [compat]
 CodeTracking = "0.5.9, 1"
-julia = "1"
+julia = "~1.0, 1.5"
 
 [extras]
 DataFrames = "a93c6f00-e57d-5684-b7b6-d8193f3e46c0"

appveyor.yml

@@ -1,8 +1,6 @@
 environment:
   matrix:
   - julia_version: 1.0
-  - julia_version: 1.1
-  - julia_version: 1.2
   - julia_version: 1
   - julia_version: nightly
 

docs/Manifest.toml

@@ -5,9 +5,9 @@ uuid = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f"
 
 [[CodeTracking]]
 deps = ["InteractiveUtils", "UUIDs"]
-git-tree-sha1 = "ef95614491ce00eff5ebc3bbb957cf8b3b3dd3e8"
+git-tree-sha1 = "9c173f62af93cce8af2bd3527d160b6ddd6eaf81"
 uuid = "da1fd8a2-8d9e-5ec2-8556-3022fb5608a2"
-version = "0.5.10"
+version = "1.0.0"
 
 [[Dates]]
 deps = ["Printf"]
@@ -19,15 +19,15 @@ uuid = "8ba89e20-285c-5b6f-9357-94700520ee1b"
 
 [[DocStringExtensions]]
 deps = ["LibGit2", "Markdown", "Pkg", "Test"]
-git-tree-sha1 = "88bb0edb352b16608036faadcc071adda068582a"
+git-tree-sha1 = "50ddf44c53698f5e784bbebb3f4b21c5807401b1"
 uuid = "ffbed154-4ef7-542d-bbb7-c09d3a79fcae"
-version = "0.8.1"
+version = "0.8.3"
 
 [[Documenter]]
 deps = ["Base64", "Dates", "DocStringExtensions", "InteractiveUtils", "JSON", "LibGit2", "Logging", "Markdown", "REPL", "Test", "Unicode"]
-git-tree-sha1 = "d497bcc45bb98a1fbe19445a774cfafeabc6c6df"
+git-tree-sha1 = "395fa1554c69735802bba37d9e7d9586fd44326c"
 uuid = "e30172f5-a6a5-5a46-863b-614d45cd2de4"
-version = "0.24.5"
+version = "0.24.11"
 
 [[InteractiveUtils]]
 deps = ["Markdown"]
@@ -43,7 +43,7 @@ version = "0.21.0"
 deps = ["CodeTracking", "InteractiveUtils", "Random", "UUIDs"]
 path = ".."
 uuid = "aa1ae85d-cabe-5617-a682-6adf51b2e16a"
-version = "0.7.13"
+version = "0.8.0"
 
 [[LibGit2]]
 deps = ["Printf"]
@@ -64,9 +64,9 @@ uuid = "a63ad114-7e13-5084-954f-fe012c677804"
 
 [[Parsers]]
 deps = ["Dates", "Test"]
-git-tree-sha1 = "f8f5d2d4b4b07342e5811d2b6428e45524e241df"
+git-tree-sha1 = "8077624b3c450b15c087944363606a6ba12f925e"
 uuid = "69de0a69-1ddd-5017-9359-2bf0b02dc9f0"
-version = "1.0.2"
+version = "1.0.10"
 
 [[Pkg]]
 deps = ["Dates", "LibGit2", "Libdl", "Logging", "Markdown", "Printf", "REPL", "Random", "SHA", "UUIDs"]

docs/src/dev_reference.md

@@ -9,14 +9,14 @@
 ## Frame creation
 
 ```@docs
+Frame(mod::Module, ex::Expr)
+ExprSplitter
 JuliaInterpreter.enter_call
 JuliaInterpreter.enter_call_expr
 JuliaInterpreter.prepare_frame
 JuliaInterpreter.determine_method_for_expr
 JuliaInterpreter.prepare_args
 JuliaInterpreter.prepare_call
-JuliaInterpreter.prepare_thunk
-JuliaInterpreter.split_expressions
 JuliaInterpreter.get_call_framecode
 JuliaInterpreter.optimize!
 ```
@@ -73,7 +73,7 @@ JuliaInterpreter.dummy_breakpoint
 ## Types
 
 ```@docs
-JuliaInterpreter.Frame
+Frame
 JuliaInterpreter.FrameCode
 JuliaInterpreter.FrameData
 JuliaInterpreter.FrameInstance

docs/src/index.md

@@ -94,7 +94,7 @@ At present, note that some of this functionality requires that you be running
 It is, in addition, possible to halt execution when otherwise an error would be thrown.
 This functionality is enabled using [`break_on`](@ref) and disabled with [`break_off`](@ref):
 
-```jldoctest demo1
+```jldoctest demo1; filter=r"none:\d"
 julia> function f_outer()
            println("before error")
            f_inner()
@@ -139,7 +139,7 @@ Stacktrace:
 
 Finally, you can set breakpoints using [`@bp`](@ref):
 
-```jldoctest demo1
+```jldoctest demo1; filter=r"none:\d"
 julia> function myfunction(x, y)
            a = 1
            b = 2

docs/src/internals.md

@@ -143,7 +143,7 @@ or `JuliaInterpreter.finish_and_return!(frame)` to also obtain the return value.
 ## More complex expressions
 
 Sometimes you might have a whole sequence of expressions you want to run.
-In such cases, your first thought should be `prepare_thunk`.
+In such cases, your first thought should be to construct the `Frame` manually.
 Here's a demonstration:
 
 ```jldoctest; setup=(using JuliaInterpreter; JuliaInterpreter.clear_caches())
@@ -154,7 +154,7 @@ ex = quote
     @test x + y == 3
 end
 
-frame = JuliaInterpreter.prepare_thunk(Main, ex)
+frame = Frame(Main, ex)
 JuliaInterpreter.finish_and_return!(frame)
 
 # output
@@ -179,7 +179,7 @@ Here's a demonstration of the problem:
 
 ```julia
 ex = :(map(x->x^2, [1, 2, 3]))
-frame = JuliaInterpreter.prepare_thunk(Main, ex)
+frame = Frame(Main, ex)
 julia> JuliaInterpreter.finish_and_return!(frame)
 ERROR: this frame needs to be run a top level
 ```
@@ -226,13 +226,12 @@ julia> JuliaInterpreter.finish_and_return!(frame, true)
  9
 ```
 
-Here's a more fine-grained look at what's happening under the hood (and a robust strategy
-for more complex situations where there may be nested calls of new methods):
+In other cases, such as nested calls of new methods, you may need to allow the world age to update
+between evaluations. In such cases you want to use `ExprSplitter`:
 
 ```julia
-modexs, _ = JuliaInterpreter.split_expressions(Main, ex)
-for (mod, e) in modexs
-    frame = JuliaInterpreter.prepare_thunk(mod, e)
+for (mod, e) in ExprSplitter(Main, ex)
+    frame = Frame(mod, e)
     while true
         JuliaInterpreter.through_methoddef_or_done!(frame) === nothing && break
     end