Make at-__DIR__ return pwd() when run interactively

JuliaLang · May 9, 2017 · 602dc5a · 602dc5a
1 parent d214d57
commit 602dc5a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/base/loading.jl b/base/loading.jl
@@ -517,6 +517,7 @@ function source_path(default::Union{AbstractString,Void}="")
 end
 
 function source_dir()
+    isinteractive() && return pwd()
     p = source_path(nothing)
     p === nothing ? p : dirname(p)
 end
@@ -534,8 +535,8 @@ macro __FILE__() source_path() end
     @__DIR__ -> AbstractString
 
 `@__DIR__` expands to a string with the directory part of the absolute path of the file
-containing the macro. Returns `nothing` if run from a REPL or an empty string if
-evaluated by `julia -e <expr>`.
+containing the macro. Returns the current working directory if run from a REPL or an empty
+string if evaluated by `julia -e <expr>`.
 """
 macro __DIR__() source_dir() end
 

diff --git a/test/loading.jl b/test/loading.jl
@@ -14,6 +14,9 @@ include_string_test_func = include_string("include_string_test() = @__FILE__", t
 
 @test isdir(@__DIR__)
 @test @__DIR__() == dirname(@__FILE__)
+let exename = `$(Base.julia_cmd()) --precompiled=yes --startup-file=no`
+    @test readchomp(`$exename -E "@__DIR__" -i`) == string('"', pwd(), '"')
+end
 
 # Issue #5789 and PR #13542:
 mktempdir() do dir