Skip to content

Commit 1551fed

Browse files
vtjnashKeno
authored andcommitted
Revert "constrain the path argument of include functions to `AbstractString…"
This reverts commit 060035d.
1 parent 04259da commit 1551fed

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

base/loading.jl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2895,8 +2895,8 @@ function evalfile(path::AbstractString, args::Vector{String}=String[])
28952895
Expr(:toplevel,
28962896
:(const ARGS = $args),
28972897
:(eval(x) = $(Expr(:core, :eval))(__anon__, x)),
2898-
:(include(x::AbstractString) = $(Expr(:top, :include))(__anon__, x)),
2899-
:(include(mapexpr::Function, x::AbstractString) = $(Expr(:top, :include))(mapexpr, __anon__, x)),
2898+
:(include(x) = $(Expr(:top, :include))(__anon__, x)),
2899+
:(include(mapexpr::Function, x) = $(Expr(:top, :include))(mapexpr, __anon__, x)),
29002900
:(include($path))))
29012901
end
29022902
evalfile(path::AbstractString, args::Vector) = evalfile(path, String[args...])

src/jlfrontend.scm

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -211,11 +211,11 @@
211211
(block
212212
,@loc
213213
(call (core eval) ,name ,x)))
214-
(= (call include (:: ,x (top AbstractString)))
214+
(= (call include ,x)
215215
(block
216216
,@loc
217217
(call (core _call_latest) (top include) ,name ,x)))
218-
(= (call include (:: ,mex (top Function)) (:: ,x (top AbstractString)))
218+
(= (call include (:: ,mex (top Function)) ,x)
219219
(block
220220
,@loc
221221
(call (core _call_latest) (top include) ,mex ,name ,x)))))

0 commit comments

Comments
 (0)