Don't splat in call to append_any

timholy · timholy · commit 3b53ef261db1 · 2021-07-18T07:03:27.000-05:00
Fixes timholy/Revise.jl#625
diff --git a/Project.toml b/Project.toml
@@ -1,6 +1,6 @@
 name = "JuliaInterpreter"
 uuid = "aa1ae85d-cabe-5617-a682-6adf51b2e16a"
-version = "0.8.18"
+version = "0.8.19"
 
 [deps]
 CodeTracking = "da1fd8a2-8d9e-5ec2-8556-3022fb5608a2"
diff --git a/src/builtins.jl b/src/builtins.jl
@@ -70,7 +70,7 @@ function maybe_evaluate_builtin(frame, call_expr, expand::Bool)
         end
         new_expr = Expr(:call, argswrapped[1])
         popfirst!(argswrapped)
-        argsflat = append_any(argswrapped...)
+        argsflat = append_any(argswrapped)
         for x in argsflat
             push!(new_expr.args, (isa(x, Symbol) || isa(x, Expr) || isa(x, QuoteNode)) ? QuoteNode(x) : x)
         end
diff --git a/test/dummy_file.jl b/test/dummy_file.jl
@@ -0,0 +1,2 @@
+# Don't change the value below, it's used in an `include` test
+55
diff --git a/test/interpret.jl b/test/interpret.jl
@@ -811,3 +811,10 @@ end
     JuliaInterpreter.finish_and_return!(Frame(m, ex), true)
     @test isdefined(m, :foo)
 end
+
+# Related to fixing https://github.com/timholy/Revise.jl/issues/625
+module ForInclude end
+@testset "include" begin
+    ex = :(include("dummy_file.jl"))
+    @test JuliaInterpreter.finish_and_return!(Frame(ForInclude, ex), true) == 55
+end

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	+# Don't change the value below, it's used in an `include` test
	`2`	`+55`