Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 12 additions & 2 deletions src/core/IronPython/Modules/Builtin.cs
Original file line number Diff line number Diff line change
Expand Up @@ -316,8 +316,18 @@ public static object divmod(CodeContext/*!*/ context, object? x, object? y) {
"The expression can be either be a string, bytes\n" +
"or a code object returned by compile()")]
[LightThrowing]
public static object eval(CodeContext/*!*/ context, [NotNone] FunctionCode code, PythonDictionary? globals = null, object? locals = null)
=> code.Call(GetExecEvalScopeOptional(context, globals, locals, copyModule: false));
public static object eval(CodeContext/*!*/ context, [NotNone] FunctionCode code, PythonDictionary? globals = null, object? locals = null) {
CodeContext evalContext = GetExecEvalScopeOptional(context, globals, locals, copyModule: false);
if (context.LanguageContext.PythonOptions.Frames) {
List<FunctionStack> stack = PythonOps.PushFrame(evalContext, code);
try {
return code.Call(evalContext);
} finally {
stack.RemoveAt(stack.Count - 1);
}
}
return code.Call(evalContext);
}

[Documentation("")] // provided by first overload
[LightThrowing]
Expand Down
27 changes: 27 additions & 0 deletions tests/suite/modules/system_related/test_sys.py
Original file line number Diff line number Diff line change
Expand Up @@ -405,6 +405,33 @@ def test_settrace_exec_f_back(self):
sys.settrace(None)
self.assertIs(ns['back'], sys._getframe(0))

def test_eval_frame(self):
# Code run by eval has a frame of its own, whose f_back is the frame that called eval
def depth():
n, f = 0, sys._getframe(1)
while f:
n, f = n + 1, f.f_back
return n

before = depth()
frame = eval("sys._getframe(0)", {'sys': sys})
self.assertEqual(frame.f_code.co_filename, "<string>")
self.assertEqual(frame.f_back.f_code.co_name, "test_eval_frame")
self.assertEqual(eval("depth()", {'depth': depth}), before + 1)
self.assertEqual(eval("eval('depth()', {'depth': depth})", {'depth': depth}), before + 2)
self.assertEqual(depth(), before)

with self.assertRaises(ZeroDivisionError):
eval("1/0")
self.assertEqual(depth(), before)

sys.settrace(lambda *args: None)
try:
self.assertEqual(eval("depth()", {'depth': depth}), before + 1)
finally:
sys.settrace(None)
self.assertEqual(depth(), before)

@skipUnlessIronPython()
def test_settrace_Xtracing_module_frame(self):
# With -X:Tracing, the main module has a single frame
Expand Down
Loading