Fix debugger expression evaluation for top-level functions

runtime/vm/debugger_api_impl_test.cc

 // Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #include "include/dart_debugger_api.h"
 #include "platform/assert.h"
 #include "vm/dart_api_impl.h"
 #include "vm/thread.h"
 #include "vm/unit_test.h"
 
@@ skipping 1540 matching lines @@
   Dart_Handle point = Invoke("main");
   EXPECT_VALID(point);
   EXPECT(breakpoint_hit == true);
 
   Dart_Handle r =
       Dart_EvaluateExpr(point, NewString("_factor * sqrt(x*x + y*y)"));
   EXPECT_VALID(r);
   EXPECT(Dart_IsDouble(r));
   EXPECT_EQ(50.0, ToDouble(r));
 
+  Dart_Handle closure =
+      Dart_EvaluateExpr(point, NewString("() => _factor * sqrt(x*x + y*y))"));
+  EXPECT_VALID(closure);
+  EXPECT(Dart_IsClosure(closure));
+  r = Dart_InvokeClosure(closure, 0, NULL);
+  EXPECT_EQ(50.0, ToDouble(r));
+
+  r = Dart_EvaluateExpr(point,
+                        NewString("(() => _factor * sqrt(x*x + y*y))()"));
+  EXPECT_VALID(r);
+  EXPECT(Dart_IsDouble(r));
+  EXPECT_EQ(50.0, ToDouble(r));
+
   Dart_Handle len = Dart_EvaluateExpr(point, NewString("l.length"));
   EXPECT_VALID(len);
   EXPECT(Dart_IsNumber(len));
   EXPECT_EQ(3, ToInt64(len));
 
   Dart_Handle point_class = Dart_GetClass(script_lib, NewString("Point"));
   EXPECT_VALID(point_class);
   Dart_Handle elem = Dart_EvaluateExpr(point_class, NewString("m['\"']"));
   EXPECT_VALID(elem);
   EXPECT(Dart_IsString(elem));
   EXPECT_STREQ("quote", ToCString(elem));
 
   elem = Dart_EvaluateExpr(point_class, NewString("m[\"\\t\"]"));
   EXPECT_VALID(elem);
   EXPECT(Dart_IsString(elem));
   EXPECT_STREQ("tab", ToCString(elem));
 
   res = Dart_EvaluateExpr(script_lib, NewString("l..add(11)..add(-5)"));
   EXPECT_VALID(res);
   // List l now has 5 elements.
 
   len = Dart_EvaluateExpr(script_lib, NewString("l.length + 1"));
   EXPECT_VALID(len);
   EXPECT(Dart_IsNumber(len));
   EXPECT_EQ(6, ToInt64(len));
+
+  closure = Dart_EvaluateExpr(script_lib, NewString("(x) => l.length + x"));
+  EXPECT_VALID(closure);
+  EXPECT(Dart_IsClosure(closure));
+  Dart_Handle args[1] = { Dart_NewInteger(1) };
+  len = Dart_InvokeClosure(closure, 1, args);
+  EXPECT_VALID(len);
+  EXPECT(Dart_IsNumber(len));
+  EXPECT_EQ(6, ToInt64(len));
+
+  len = Dart_EvaluateExpr(script_lib, NewString("((x) => l.length + x)(1)"));
+  EXPECT_VALID(len);
+  EXPECT(Dart_IsNumber(len));
+  EXPECT_EQ(6, ToInt64(len));
 }
 
 
 TEST_CASE(Debug_GetSupertype) {
   const char* kScriptChars =
       "class Test {\n"
       "}\n"
       "class Test1 extends Test {\n"
       "}\n"
       "class Test2<T> {\n"
@@ skipping 129 matching lines @@
 
   Dart_Handle list_type = Dart_InstanceGetType(list_access_test_obj);
   Dart_Handle super_type = Dart_GetSupertype(list_type);
   EXPECT(!Dart_IsError(super_type));
   super_type = Dart_GetSupertype(super_type);
   EXPECT(!Dart_IsError(super_type));
   EXPECT(super_type == Dart_Null());
 }
 
 }  // namespace dart