Fix bug when running eval(obj) when obj is a result of compile()

Author: PierreQuentel

www/src/ast_to_js.js

@@ -130,6 +130,8 @@ function copy_position(target, origin){
     target.end_col_offset = origin.end_col_offset
 }
 
+$B.copy_position = copy_position
+
 function encode_position(lineno, end_lineno, col_offset, end_col_offset){
     var res
     if(end_lineno == lineno){

www/src/brython.js

@@ -734,12 +734,25 @@ var $$eval = _b_.eval = function(){
     var _frame_obj = $B.frame_obj
 
     if(src.__class__ === code){
+        if(src.mode == 'exec' && mode == 'eval'){
+            return _b_.None
+        }
         _ast = src._ast
         if(_ast.$js_ast){
             _ast = _ast.$js_ast
         }else{
             _ast = $B.ast_py_to_js(_ast)
         }
+        if(_ast instanceof $B.ast.Expression){
+            // transform `expr` into `varname = expr` so that the exec_func
+            // can return varname
+            var expr_name = '_' + $B.UUID()
+            var name = new $B.ast.Name(expr_name, new $B.ast.Store())
+            $B.copy_position(name, _ast.body)
+            var assign = new $B.ast.Assign([name], _ast.body)
+            $B.copy_position(assign, _ast.body)
+            _ast = new $B.ast.Module([assign])
+        }
     }
 
     try{
@@ -776,18 +789,31 @@ var $$eval = _b_.eval = function(){
     if(mode == 'eval'){
         // must set locals, might be used if expression is like
         // "True and True"
-        js = `var __file__ = '${filename}'\n` +
-             `var locals = ${local_name}\nreturn ${js}`
+        if(src.__class__ === _b_.code){
+            js += `\nreturn locals.${expr_name}`
+        }else{
+            js = `var __file__ = '${filename}'\n` +
+                 `var locals = ${local_name};\n` +
+                 'return ' + js
+        }
     }else if(src.single_expression){
-        js = `var __file__ = '${filename}'\n` +
-             `var result = ${js}\n` +
-             `if(result !== _b_.None){\n` +
-                 `_b_.print(result)\n` +
-             `}`
+        if(src.__class__ === _b_.code){
+            js += `var result = locals.${expr_name}\n` +
+                 `if(result !== _b_.None){\n` +
+                     `_b_.print(result)\n` +
+                 `}`
+
+        }else{
+            js = `var __file__ = '${filename}'\n` +
+                 `var result = ${js}\n` +
+                 `if(result !== _b_.None){\n` +
+                     `_b_.print(result)\n` +
+                 `}`
+        }
     }
 
     try{
-        var exec_func = new Function('$B', '_b_',
+        var exec_func = new Function('$B', '_b_', 'locals',
                                      local_name, global_name,
                                      'frame', '_frame_obj', js)
     }catch(err){
@@ -800,7 +826,7 @@ var $$eval = _b_.eval = function(){
     }
 
     try{
-        var res = exec_func($B, _b_,
+        var res = exec_func($B, _b_, exec_locals,
                             exec_locals, exec_globals, frame, _frame_obj)
     }catch(err){
         if($B.get_option('debug') > 2){

www/src/brython.min.js

@@ -2,15 +2,15 @@
 (function($B){
 $B.builtin_class_flags = {
     builtins: {
-        1073763586: ['FutureWarning', 'EnvironmentError', 'BaseExceptionGroup', 'ReferenceError', 'TypeError', 'FileNotFoundError', 'UnboundLocalError', 'UnicodeTranslateError', 'UnicodeWarning', 'IndentationError', 'BufferError', 'AssertionError', 'BytesWarning', 'ProcessLookupError', 'StopIteration', 'LookupError', 'ImportWarning', 'IOError', 'FileExistsError', 'NameError', 'IndexError', 'FloatingPointError', 'RecursionError', 'SyntaxError', 'ModuleNotFoundError', 'TimeoutError', 'IsADirectoryError', 'Warning', 'ResourceWarning', 'ConnectionResetError', 'MemoryError', 'RuntimeWarning', 'SystemExit', 'Exception', 'NotADirectoryError', 'OverflowError', 'TabError', 'PermissionError', 'BaseException', 'KeyError', 'ArithmeticError', 'UnicodeError', 'NotImplementedError', 'KeyboardInterrupt', 'AttributeError', 'DeprecationWarning', 'UserWarning', 'ConnectionError', 'BlockingIOError', 'BrokenPipeError', 'OSError', 'RuntimeError', 'ConnectionAbortedError', 'InterruptedError', 'SystemError', 'ValueError', 'EncodingWarning', 'WindowsError', '_IncompleteInputError', 'SyntaxWarning', 'ConnectionRefusedError', 'PendingDeprecationWarning', 'PythonFinalizationError', 'ImportError', 'UnicodeEncodeError', 'GeneratorExit', 'ChildProcessError', 'StopAsyncIteration', 'UnicodeDecodeError', 'ZeroDivisionError', 'EOFError'],
+        1073763586: ['SystemExit', 'SystemError', 'NotADirectoryError', 'BlockingIOError', 'IndexError', 'ConnectionRefusedError', 'BytesWarning', 'ModuleNotFoundError', 'TabError', 'ImportError', 'UnboundLocalError', '_IncompleteInputError', 'BaseExceptionGroup', 'ValueError', 'UnicodeDecodeError', 'EnvironmentError', 'FutureWarning', 'DeprecationWarning', 'SyntaxWarning', 'EncodingWarning', 'FloatingPointError', 'EOFError', 'NotImplementedError', 'OverflowError', 'TypeError', 'PermissionError', 'Warning', 'SyntaxError', 'ArithmeticError', 'StopAsyncIteration', 'InterruptedError', 'RuntimeWarning', 'UnicodeTranslateError', 'Exception', 'ReferenceError', 'ProcessLookupError', 'UnicodeWarning', 'ConnectionResetError', 'KeyboardInterrupt', 'RuntimeError', 'AssertionError', 'ImportWarning', 'PendingDeprecationWarning', 'UnicodeEncodeError', 'IndentationError', 'OSError', 'UserWarning', 'MemoryError', 'RecursionError', 'GeneratorExit', 'BrokenPipeError', 'BaseException', 'KeyError', 'AttributeError', 'FileNotFoundError', 'ConnectionError', 'PythonFinalizationError', 'StopIteration', 'NameError', 'FileExistsError', 'ZeroDivisionError', 'ChildProcessError', 'IOError', 'IsADirectoryError', 'LookupError', 'UnicodeError', 'WindowsError', 'TimeoutError', 'ResourceWarning', 'ConnectionAbortedError', 'BufferError'],
         1073763848: ['ExceptionGroup'],
         20975874: ['bool'],
         4199682: ['float', 'bytearray'],
         138417410: ['bytes'],
-        21762: ['classmethod', 'filter', 'super', 'enumerate', 'zip', 'reversed', 'property', 'map', 'staticmethod'],
-        5378: ['complex', 'object'],
+        21762: ['classmethod', 'staticmethod', 'filter', 'reversed', 'super', 'zip', 'map', 'enumerate', 'property'],
+        5378: ['object', 'complex'],
         541087042: ['dict'],
-        4216066: ['set', 'frozenset'],
+        4216066: ['frozenset', 'set'],
         20976898: ['int'],
         37770530: ['list'],
         20770: ['memoryview'],
@@ -21,10 +21,10 @@ $B.builtin_class_flags = {
         2155896066: ['type'],
     },
     types: {
-        20866: ['getset_descriptor', 'async_generator', 'classmethod_descriptor', 'frame', 'coroutine', 'method-wrapper', 'generator', 'member_descriptor'],
+        20866: ['async_generator', 'member_descriptor', 'classmethod_descriptor', 'coroutine', 'frame', 'method-wrapper', 'getset_descriptor', 'generator'],
         22914: ['builtin_function_or_method'],
-        20738: ['cell', 'traceback'],
-        4354: ['ellipsis', 'NotImplementedType', 'NoneType', 'code'],
+        20738: ['traceback', 'cell'],
+        4354: ['NotImplementedType', 'NoneType', 'code', 'ellipsis'],
         153858: ['function'],
         20802: ['mappingproxy'],
         153986: ['method_descriptor'],

www/src/brython_stdlib.js

@@ -1,8 +1,8 @@
 "use strict";
 __BRYTHON__.implementation = [3, 13, 2, 'dev', 0]
 __BRYTHON__.version_info = [3, 13, 0, 'final', 0]
-__BRYTHON__.compiled_date = "2025-07-18 14:32:34.066104"
-__BRYTHON__.timestamp = 1752841954065
+__BRYTHON__.compiled_date = "2025-07-19 07:50:21.885039"
+__BRYTHON__.timestamp = 1752904221884
 __BRYTHON__.builtin_module_names = ["_ajax",
     "_ast",
     "_base64",