added dynamic.toString()

ethanblake4 · Jan 28, 2024 · 8fb11ea · 8fb11ea
1 parent cd45e86
commit 8fb11ea
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 6 deletions.
diff --git a/lib/src/eval/shared/stdlib/core/base.dart b/lib/src/eval/shared/stdlib/core/base.dart
@@ -8,10 +8,19 @@ import 'package:dart_eval/src/eval/utils/wap_helper.dart';
 import 'num.dart';
 
 const $dynamicCls = BridgeClassDef(
-    BridgeClassType(BridgeTypeRef(CoreTypes.dynamic),
-        isAbstract: true, $extends: null),
-    constructors: {},
-    wrap: true);
+  BridgeClassType(BridgeTypeRef(CoreTypes.dynamic),
+      isAbstract: true, $extends: null),
+  constructors: {},
+  wrap: true,
+  methods: {
+    'toString': BridgeMethodDef(
+      BridgeFunctionDef(
+          returns: BridgeTypeAnnotation(BridgeTypeRef(CoreTypes.string)),
+          params: [],
+          namedParams: []),
+    ),
+  },
+);
 
 const $voidCls = BridgeClassDef(
     BridgeClassType(BridgeTypeRef(CoreTypes.voidType), isAbstract: true),

diff --git a/lib/src/eval/shared/stdlib/core/object.dart b/lib/src/eval/shared/stdlib/core/object.dart
@@ -280,7 +280,7 @@ class $Object implements $Instance {
 
   static $Value? _toString(
       Runtime runtime, $Value? target, List<$Value?> args) {
-    return $String(target!.$value.toString());
+    return $String(target!.$reified.toString());
   }
 
   static const $Function __hashCode = $Function(_hashCode);

diff --git a/lib/stdlib/core.dart b/lib/stdlib/core.dart
@@ -16,4 +16,3 @@ export '../src/eval/shared/stdlib/core/regexp.dart';
 export '../src/eval/shared/stdlib/core/string_buffer.dart';
 export '../src/eval/shared/stdlib/core/uri.dart';
 export '../src/eval/shared/stdlib/core/stack_trace.dart';
-
diff --git a/test/stdlib_test.dart b/test/stdlib_test.dart
@@ -187,6 +187,28 @@ void main() {
       }, prints('null\n'));
     });
 
+    test('dynamic.toString', () {
+      final runtime = compiler.compileWriteAndLoad({
+        'example': {
+          'main.dart': '''
+            dynamic main() {
+              final a = abc();
+              print(a.toString());
+            }
+            
+            dynamic abc() {
+              return {
+                'hello': null
+              };
+            }
+          ''',
+        }
+      });
+      expect(() {
+        runtime.executeLib('package:example/main.dart', 'main');
+      }, prints('{hello: null}\n'));
+    });
+
     test('List.where', () {
       final runtime = compiler.compileWriteAndLoad({
         'example': {