From 592d058efffb8bfcf3f5b8719207155f93cb57b7 Mon Sep 17 00:00:00 2001 From: Tim Holy Date: Fri, 22 Feb 2019 03:56:11 -0600 Subject: [PATCH] Namespace builtins on Julia version Fixes #59 --- .gitignore | 2 +- deps/build.jl | 2 +- src/JuliaInterpreter.jl | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 88f5a64b0e3c48..164f6cdcdd1ea8 100644 --- a/.gitignore +++ b/.gitignore @@ -3,7 +3,7 @@ *.jl.mem expected.out failed.out -src/builtins.jl +src/builtins*.jl deps/build.log docs/build/ test/results.md diff --git a/deps/build.jl b/deps/build.jl index 1f8979a45125fe..468042ba9a2445 100644 --- a/deps/build.jl +++ b/deps/build.jl @@ -2,6 +2,6 @@ using InteractiveUtils const srcpath = joinpath(dirname(@__DIR__), "src") include(joinpath(srcpath, "generate_builtins.jl")) -open(joinpath(srcpath, "builtins.jl"), "w") do io +open(joinpath(srcpath, "builtins-julia$(Int(VERSION.major)).$(Int(VERSION.minor)).jl"), "w") do io generate_builtins(io) end diff --git a/src/JuliaInterpreter.jl b/src/JuliaInterpreter.jl index c3d3d038dc9c98..1caa2e024e8dca 100644 --- a/src/JuliaInterpreter.jl +++ b/src/JuliaInterpreter.jl @@ -142,7 +142,7 @@ const empty_svec = Core.svec() include("localmethtable.jl") include("interpret.jl") -include("builtins.jl") +include("builtins-julia$(Int(VERSION.major)).$(Int(VERSION.minor)).jl") function show_stackloc(io::IO, stack, frame, pc=frame.pc[]) indent = ""