From b4a1fbec5767f1329025e445df4db8d36804d3a1 Mon Sep 17 00:00:00 2001 From: Justin Willmert Date: Thu, 12 Jul 2018 09:03:15 -0500 Subject: [PATCH] Interpolate PkgId expression, working around #48 --- src/require.jl | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/require.jl b/src/require.jl index e402421..93391bd 100644 --- a/src/require.jl +++ b/src/require.jl @@ -58,14 +58,14 @@ macro require(pkg, expr) return Expr(:macrocall, Symbol("@warn"), __source__, "Requires now needs a UUID; please see the readme for changes in 0.7.") id, modname = parsepkg(pkg) - pkg = Base.PkgId(Base.UUID(id), modname) + pkg = :(Base.PkgId(Base.UUID($id), $modname)) quote if !isprecompiling() - listenpkg(Base.PkgId(Base.UUID($id), $modname)) do + listenpkg($pkg) do withpath($(string(__source__.file))) do - err($__module__, $(pkg.name)) do + err($__module__, $modname) do $(esc(:(eval($(Expr(:quote, Expr(:block, - :(const $(Symbol(pkg.name)) = Base.require($pkg)), + :(const $(Symbol(modname)) = Base.require($pkg)), expr))))))) end end