Merge pull request #40 from JuliaDebug/getproperty

fix struct definitions with getproperty in them
JuliaLang · Feb 15, 2019 · 64cc800 · 64cc800
2 parents 0c9a08a + 8e99f6b
commit 64cc800
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 0 deletions.
diff --git a/src/interpret.jl b/src/interpret.jl
@@ -92,6 +92,8 @@ function lookup_or_eval(stack, frame, @nospecialize(node), pc)
                 return Core.apply_type(ex.args[2:end]...)
             elseif f === Core.typeof
                 return Core.typeof(ex.args[2])
+            elseif f === Base.getproperty
+                return Base.getproperty(ex.args[2], ex.args[3])
             else
                 error("unknown call f ", f)
             end

diff --git a/test/toplevel.jl b/test/toplevel.jl
@@ -140,6 +140,7 @@ module Toplevel end
     @test @interpret(Toplevel.paramtype(Vector)) == Toplevel.NoParam
     @test @interpret(Toplevel.Inner.g()) == 5
     @test @interpret(Toplevel.Inner.InnerInner.g()) == 6
+    @test @interpret(isdefined(Toplevel, :Beat))
 
     # Check that nested expressions are handled appropriately (module-in-block, internal `using`)
     ex = quote

diff --git a/test/toplevel_script.jl b/test/toplevel_script.jl
@@ -136,3 +136,11 @@ module InnerInner
 g() = 6
 end
 end
+
+module DatesMod
+    abstract type Period end
+end
+
+struct Beat <: DatesMod.Period
+    value::Int64
+end