fix exception type for undefined variables (#249)

JuliaLang · Mar 31, 2019 · 56f4222 · 56f4222
1 parent a974c71
commit 56f4222
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/src/interpret.jl b/src/interpret.jl
@@ -10,7 +10,7 @@ lookup_var(frame, ref::GlobalRef) = getfield(ref.mod, ref.name)
 function lookup_var(frame, slot::SlotNumber)
     val = frame.framedata.locals[slot.id]
     val !== nothing && return val.value
-    error("slot ", slot, " with name ", frame.framecode.src.slotnames[slot.id], " not assigned")
+    throw(UndefVarError(frame.framecode.src.slotnames[slot.id]))
 end
 
 function lookup_expr(frame, e::Expr)

diff --git a/test/interpret.jl b/test/interpret.jl
@@ -336,7 +336,7 @@ f113(;x) = x
     end
     frame = JuliaInterpreter.enter_call(f_multi, 1)
     nlocals = length(frame.framedata.locals)
-    @test_throws ErrorException("slot _4 with name x not assigned") JuliaInterpreter.lookup_var(frame, Core.SlotNumber(nlocals))
+    @test_throws UndefVarError JuliaInterpreter.lookup_var(frame, Core.SlotNumber(nlocals))
     stack = [frame]
     locals = JuliaInterpreter.locals(frame)
     @test length(locals) == 2
@@ -500,3 +500,7 @@ function f_mmap()
     end
 end
 @interpret f_mmap()
+
+# Test exception type for undefined variables
+f() = s = s + 1
+@test_throws UndefVarError @interpret f()