From 8bae3ee4a0cb4d54716f6c5a99d36e160ab38a60 Mon Sep 17 00:00:00 2001 From: Jameson Nash Date: Mon, 30 Sep 2024 10:06:30 -0400 Subject: [PATCH] =?UTF-8?q?Revert=20"constrain=20the=20path=20argument=20o?= =?UTF-8?q?f=20`include`=20functions=20to=20`AbstractString=E2=80=A6"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 060035d1eaec95a8c3f138896a5e42dc871381fe. --- base/loading.jl | 4 ++-- src/jlfrontend.scm | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/base/loading.jl b/base/loading.jl index dfcf22b2b0751..4e6c0b3d9f27e 100644 --- a/base/loading.jl +++ b/base/loading.jl @@ -2894,8 +2894,8 @@ function evalfile(path::AbstractString, args::Vector{String}=String[]) Expr(:toplevel, :(const ARGS = $args), :(eval(x) = $(Expr(:core, :eval))(__anon__, x)), - :(include(x::AbstractString) = $(Expr(:top, :include))(__anon__, x)), - :(include(mapexpr::Function, x::AbstractString) = $(Expr(:top, :include))(mapexpr, __anon__, x)), + :(include(x) = $(Expr(:top, :include))(__anon__, x)), + :(include(mapexpr::Function, x) = $(Expr(:top, :include))(mapexpr, __anon__, x)), :(include($path)))) end evalfile(path::AbstractString, args::Vector) = evalfile(path, String[args...]) diff --git a/src/jlfrontend.scm b/src/jlfrontend.scm index 463e39c41d00a..2c5f42eda5ce8 100644 --- a/src/jlfrontend.scm +++ b/src/jlfrontend.scm @@ -211,11 +211,11 @@ (block ,@loc (call (core eval) ,name ,x))) - (= (call include (:: ,x (top AbstractString))) + (= (call include ,x) (block ,@loc (call (core _call_latest) (top include) ,name ,x))) - (= (call include (:: ,mex (top Function)) (:: ,x (top AbstractString))) + (= (call include (:: ,mex (top Function)) ,x) (block ,@loc (call (core _call_latest) (top include) ,mex ,name ,x)))))