Merge branch 'master' of https://github.com/ethanblake4/dart_eval

Author: ethanblake4

lib/src/eval/compiler/compiler.dart

@@ -647,13 +647,14 @@ class Compiler implements BridgeDeclarationRegistry, EvalPluginRegistry {
             : (declaration as EnumDeclaration).members;
 
         if (declaration is EnumDeclaration) {
+          _ctx.enumValueIndices[libraryIndex] ??= {};
+          _ctx.enumValueIndices[libraryIndex]![declaration.name.lexeme] = {};
           for (final constant in declaration.constants) {
             if (!_topLevelGlobalIndices.containsKey(libraryIndex)) {
               _topLevelGlobalIndices[libraryIndex] = {};
               _ctx.topLevelGlobalInitializers[libraryIndex] = {};
               _ctx.topLevelVariableInferredTypes[libraryIndex] = {};
             }
-
             final name = '${declaration.name.lexeme}.${constant.name.lexeme}';
             if (_topLevelDeclarationsMap[libraryIndex]!.containsKey(name)) {
               throw CompileError(
@@ -664,7 +665,9 @@ class Compiler implements BridgeDeclarationRegistry, EvalPluginRegistry {
 
             _topLevelDeclarationsMap[libraryIndex]![name] =
                 DeclarationOrBridge(libraryIndex, declaration: constant);
-            _topLevelGlobalIndices[libraryIndex]![name] = _ctx.globalIndex++;
+            final globalIndex = _ctx.globalIndex++;
+            _topLevelGlobalIndices[libraryIndex]![name] = globalIndex;
+            _ctx.enumValueIndices[libraryIndex]![declaration.name.lexeme]![constant.name.lexeme] = globalIndex;
           }
         }
 

lib/src/eval/runtime/ops/bridge.dart

@@ -162,14 +162,14 @@ class Await implements EvcOp {
 
   void _suspend(Runtime runtime, Continuation continuation, $Future future,
       Completer completer) async {
-    final result = await future.$value;
-    runtime.returnValue = result;
-    runtime.frameOffset = continuation.frameOffset;
-    runtime.frame = continuation.frame;
-    runtime.stack.add(continuation.frame);
-    runtime.scopeNameStack.add('<asynchronous gap>');
-
     try {
+      final result = await future.$value;
+      runtime.returnValue = result;
+      runtime.frameOffset = continuation.frameOffset;
+      runtime.frame = continuation.frame;
+      runtime.stack.add(continuation.frame);
+      runtime.scopeNameStack.add('<asynchronous gap>');
+
       runtime.bridgeCall(continuation.programOffset);
     } catch (e) {
       // temporary fix: this isn't correct, we need to reenter the eval loop

test/bridge_test.dart

@@ -259,5 +259,41 @@ void main() {
               .executeLib('package:example/main.dart', 'main', [callback])),
           prints('a\nb\n'));
     });
+
+    test('Should catch bridge future error', () async {
+      final runtime = compiler.compileWriteAndLoad({
+        'example': {
+          'main.dart': '''
+            import 'dart:async';
+
+            void main(Function callback) async {
+              await callback();
+            }
+          '''
+        }
+      });
+
+      bool callbackExecuted = false;
+      final callback = $Closure((runtime, target, args) {
+        callbackExecuted = true;
+        return $Future.wrap(Future.error(Exception('Bridge error')));
+      });
+
+      Exception? caughtException;
+      try {
+        await runtime
+            .executeLib('package:example/main.dart', 'main', [callback]);
+        fail('Expected exception was not thrown');
+      } catch (e) {
+        caughtException = e as Exception;
+      }
+
+      // Verify callback was executed
+      expect(callbackExecuted, isTrue);
+
+      // Verify correct exception type and message
+      expect(caughtException, isA<Exception>());
+      expect(caughtException.toString(), contains('Bridge error'));
+    });
   });
 }

test/enum_test.dart

@@ -97,5 +97,32 @@ void main() {
           'ShowType', {'Movie': $int(0), 'Series': $int(1)});
       runtime.executeLib('package:my_package/main.dart', 'main');
     });
+
+    test('Enum value index property from imported file', () {
+      const libSource = '''
+        enum TestEnum {
+          alpha,
+          beta
+        }
+      ''';
+
+      const mainSource = '''
+        import 'package:my_test_package/lib.dart';
+
+        int main() {
+          return TestEnum.beta.index;
+        }
+      ''';
+
+      final runtime = compiler.compileWriteAndLoad({
+        'my_test_package': {
+          'main.dart': mainSource,
+          'lib.dart': libSource,
+        }
+      });
+
+      final result = runtime.executeLib('package:my_test_package/main.dart', 'main');
+      expect(result, 1);
+    });
   });
 }