fix part of JuliaLang#38650, struct should be a hard scope (JuliaLa…

…ng#38663)
antoine-levitt · Dec 3, 2020 · 7d5c0c5 · 7d5c0c5
1 parent 8ffcc0e
commit 7d5c0c5
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/src/julia-syntax.scm b/src/julia-syntax.scm
@@ -904,6 +904,7 @@
  (global ,name) (const ,name)
  (scope-block
  (block
+ (hardscope)
  (local-def ,name)
  ,@(map (lambda (v) `(local ,v)) params)
  ,@(map (lambda (n v) (make-assignment n (bounds-to-TypeVar v #t))) params bounds)
@@ -934,6 +935,7 @@
  ;; "inner" constructors
  (scope-block
  (block
+ (hardscope)
  (global ,name)
  ,@(map (lambda (c)
  (rewrite-ctor c name params field-names field-types))

diff --git a/test/syntax.jl b/test/syntax.jl
@@ -2096,6 +2096,16 @@ end
 end
 @test z28789 == 42
 
+# issue #38650, `struct` should always be a hard scope
+f38650() = 0
+@eval begin
+ $(Expr(:softscope, true))
+ struct S38650
+ f38650() = 1
+ end
+end
+@test f38650() == 0
+
 # issue #37126
 @test isempty(Test.collect_test_logs() do
  include_string(@__MODULE__, """