fix #28188: filename lost in cmd interpolation (#37007)

* fix 28188: filename lost in cmd interpolation * move test to test/misc.jl (cherry picked from commit 06b7f0b)
JuliaLang · Aug 13, 2020 · e438d0e · e438d0e
1 parent 625bdf7
commit e438d0e
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/base/cmd.jl b/base/cmd.jl
@@ -386,5 +386,6 @@ Process(`echo 1`, ProcessExited(0))
 ```
 """
 macro cmd(str)
- return :(cmd_gen($(esc(shell_parse(str, special=shell_special)[1]))))
+ cmd_ex = shell_parse(str, special=shell_special, filename=String(__source__.file))[1]
+ return :(cmd_gen($(esc(cmd_ex))))
 end
diff --git a/base/shell.jl b/base/shell.jl
@@ -16,7 +16,7 @@ function rstrip_shell(s::AbstractString)
 end
 
 function shell_parse(str::AbstractString, interpolate::Bool=true;
- special::AbstractString="")
+ special::AbstractString="", filename="none")
  s::SubString = SubString(str, firstindex(str))
  s = rstrip_shell(lstrip(s))
 
@@ -69,7 +69,8 @@ function shell_parse(str::AbstractString, interpolate::Bool=true;
  # string interpolation syntax (see #3150)
  ex, j = :var, stpos+3
  else
- ex, j = Meta.parse(s,stpos,greedy=false)
+ # use parseatom instead of parse to respect filename (#28188)
+ ex, j = Meta.parseatom(s, stpos, filename=filename)
  end
  last_parse = (stpos:prevind(s, j)) .+ s.offset
  update_arg(ex);

diff --git a/test/misc.jl b/test/misc.jl
@@ -830,3 +830,8 @@ end
 @testset "fieldtypes Module" begin
  @test fieldtypes(Module) isa Tuple
 end
+
+
+@testset "issue #28188" begin
+ @test `$(@__FILE__)` == let file = @__FILE__; `$file` end
+end