More improvements for CLR Interop (#1616)

sebastienros · Aug 9, 2023 · f4982ee · f4982ee
1 parent e9ace1a
commit f4982ee
Show file tree

Hide file tree

Showing 15 changed files with 431 additions and 201 deletions.
diff --git a/Jint.Repl/Program.cs b/Jint.Repl/Program.cs
@@ -66,22 +66,20 @@ private static void Main(string[] args)
                 try
                 {
                     var result = engine.Evaluate(input, parserOptions);
+                    JsValue str = result;
                     if (!result.IsPrimitive() && result is not IPrimitiveInstance)
                     {
-                        var str = serializer.Serialize(result, JsValue.Undefined, "  ");
-                        Console.WriteLine(str);
-                    }
-                    else
-                    {
-                        if (result.IsString())
-                        {
-                            Console.WriteLine(serializer.Serialize(result, JsValue.Undefined, JsValue.Undefined));
-                        }
-                        else
+                        str = serializer.Serialize(result, JsValue.Undefined, "  ");
+                        if (str == JsValue.Undefined)
                         {
-                            Console.WriteLine(result);
+                            str = result;
                         }
                     }
+                    else if (result.IsString())
+                    {
+                        str = serializer.Serialize(result, JsValue.Undefined, JsValue.Undefined);
+                    }
+                    Console.WriteLine(str);
                 }
                 catch (JavaScriptException je)
                 {