Support evaluation of expressions in context of a stack frame

runtime/vm/object.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 "vm/object.h"
 
 #include "include/dart_api.h"
 #include "platform/assert.h"
 #include "vm/assembler.h"
 #include "vm/cpu.h"
@@ skipping 2631 matching lines @@
   }
   SetFields(new_list);
 
   // The functions and fields in the patch class are no longer needed.
   patch.SetFunctions(Object::empty_array());
   patch.SetFields(Object::empty_array());
   return true;
 }
 
 
+static RawString* BuildClosureSource(const Array& formal_params,
+                                     const String& expr) {
+  const GrowableObjectArray& src_pieces =
+      GrowableObjectArray::Handle(GrowableObjectArray::New());
+  String& piece = String::Handle();
+  src_pieces.Add(Symbols::LParen());
+  // Add formal parameters.
+  intptr_t num_formals = formal_params.Length();
+  for (intptr_t i = 0; i < num_formals; i++) {
+    if (i > 0) {
+      src_pieces.Add(Symbols::CommaSpace());
+    }
+    piece ^= formal_params.At(i);
+    src_pieces.Add(piece);
+  }
+  src_pieces.Add(Symbols::RParenArrow());
+  src_pieces.Add(expr);
+  src_pieces.Add(Symbols::Semicolon());
+  return String::ConcatAll(Array::Handle(Array::MakeArray(src_pieces)));
+}
+
+
 static RawPatchClass* MakeTempPatchClass(const Class& cls,
-                                         const String& expr) {
-  String& src = String::Handle(String::New("() => "));
-  src = String::Concat(src, expr);
-  src = String::Concat(src, Symbols::Semicolon());
+                                         const String& expr,
+                                         const Array& formal_params) {
+  const String& func_src =
+      String::Handle(BuildClosureSource(formal_params, expr));
   Script& script = Script::Handle();
-  script = Script::New(Symbols::Empty(), src, RawScript::kSourceTag);
+  script = Script::New(Symbols::Empty(), func_src, RawScript::kSourceTag);
   // In order to tokenize the source, we need to get the key to mangle
   // private names from the library from which the object's class
   // originates.
   const Library& lib = Library::Handle(cls.library());
   ASSERT(!lib.IsNull());
   const String& lib_key = String::Handle(lib.private_key());
   script.Tokenize(lib_key);
 
   const String& src_class_name = String::Handle(Symbols::New(":internal"));
   const Class& src_class = Class::Handle(
       Class::New(src_class_name, script, Scanner::kNoSourcePos));
   src_class.set_is_finalized();
   src_class.set_library(lib);
   return PatchClass::New(cls, src_class);
 }
 
 
-RawObject* Class::Evaluate(const String& expr) const {
+RawObject* Class::Evaluate(const String& expr,
+                           const Array& param_names,
+                           const Array& param_values) const {
   const PatchClass& temp_class =
-      PatchClass::Handle(MakeTempPatchClass(*this, expr));
+      PatchClass::Handle(MakeTempPatchClass(*this, expr, param_names));
   const String& eval_func_name = String::Handle(Symbols::New(":eval"));
   const Function& eval_func =
       Function::Handle(Function::New(eval_func_name,
                                      RawFunction::kRegularFunction,
                                      true,   // Static.
                                      false,  // Not const.
                                      false,  // Not abstract.
                                      false,  // Not external.
                                      false,  // Not native.
                                      temp_class,
                                      0));
   eval_func.set_result_type(Type::Handle(Type::DynamicType()));
-  eval_func.set_num_fixed_parameters(0);
+  eval_func.set_num_fixed_parameters(param_names.Length());
   eval_func.SetNumOptionalParameters(0, true);
   eval_func.SetIsOptimizable(false);
 
-  const Array& args = Array::Handle(Array::New(0));
   const Object& result =
-      Object::Handle(DartEntry::InvokeFunction(eval_func, args));
+      Object::Handle(DartEntry::InvokeFunction(eval_func, param_values));
   return result.raw();
 }
 
 
 // Ensure that top level parsing of the class has been done.
 RawError* Class::EnsureIsFinalized(Isolate* isolate) const {
   // Finalized classes have already been parsed.
   if (is_finalized()) {
     return Error::null();
   }
@@ skipping 6277 matching lines @@
   isolate->object_store()->set_root_library(Library::Handle());
 
   // Hook up predefined classes without setting their library pointers. These
   // classes are coming from the VM isolate, and are shared between multiple
   // isolates so setting their library pointers would be wrong.
   const Class& cls = Class::Handle(Object::dynamic_class());
   core_lib.AddObject(cls, String::Handle(cls.Name()));
 }
 
 
-RawObject* Library::Evaluate(const String& expr) const {
+RawObject* Library::Evaluate(const String& expr,
+                             const Array& param_names,
+                             const Array& param_values) const {
   // Make a fake top-level class and evaluate the expression
   // as a static function of the class.
   Script& script = Script::Handle();
   script = Script::New(Symbols::Empty(),
                        Symbols::Empty(),
                        RawScript::kSourceTag);
   Class& temp_class =
       Class::Handle(Class::New(Symbols::TopLevel(), script, 0));
   temp_class.set_library(*this);
   temp_class.set_is_finalized();
-  return temp_class.Evaluate(expr);
+  return temp_class.Evaluate(expr, param_names, param_values);
 }
 
 
 void Library::InitNativeWrappersLibrary(Isolate* isolate) {
   static const int kNumNativeWrappersClasses = 4;
   ASSERT(kNumNativeWrappersClasses > 0 && kNumNativeWrappersClasses < 10);
   const String& native_flds_lib_url = Symbols::DartNativeWrappers();
   const Library& native_flds_lib = Library::Handle(
       Library::NewLibraryHelper(native_flds_lib_url, false));
   native_flds_lib.Register();
@@ skipping 3387 matching lines @@
 
 void UnwindError::PrintToJSONStream(JSONStream* stream, bool ref) const {
   JSONObject jsobj(stream);
   jsobj.AddProperty("type", "Error");
   jsobj.AddProperty("id", "");
   jsobj.AddProperty("kind", JSONType(false));
   jsobj.AddProperty("message", ToErrorCString());
 }
 
 
-RawObject* Instance::Evaluate(const String& expr) const {
+RawObject* Instance::Evaluate(const String& expr,
+                              const Array& param_names,
+                              const Array& param_values) const {
   const Class& cls = Class::Handle(clazz());
-  const PatchClass& temp_class =
-      PatchClass::Handle(MakeTempPatchClass(cls, expr));
+  const PatchClass& temp_class = PatchClass::Handle(
+      MakeTempPatchClass(cls, expr, param_names));
   const String& eval_func_name = String::Handle(Symbols::New(":eval"));
   const Function& eval_func =
       Function::Handle(Function::New(eval_func_name,
                                      RawFunction::kRegularFunction,
                                      false,  // Not static.
                                      false,  // Not const.
                                      false,  // Not abstract.
                                      false,  // Not external.
                                      false,  // Not native.
                                      temp_class,
                                      0));
   eval_func.set_result_type(Type::Handle(Type::DynamicType()));
-  eval_func.set_num_fixed_parameters(1);
+  eval_func.set_num_fixed_parameters(1 + param_values.Length());
   eval_func.SetNumOptionalParameters(0, true);
   eval_func.SetIsOptimizable(false);
 
-  const Array& args = Array::Handle(Array::New(1));
+  const Array& args = Array::Handle(Array::New(1 + param_values.Length()));
+  Object& param = Object::Handle();
   args.SetAt(0, *this);
+  for (intptr_t i = 0; i < param_values.Length(); i++) {
+    param = param_values.At(i);
+    args.SetAt(i + 1, param);
+  }
   const Object& result =
       Object::Handle(DartEntry::InvokeFunction(eval_func, args));
   return result.raw();
 }
 
 
 
 bool Instance::Equals(const Instance& other) const {
   if (this->raw() == other.raw()) {
     return true;  // "===".
@@ skipping 6085 matching lines @@
   return tag_label.ToCString();
 }
 
 
 void UserTag::PrintToJSONStream(JSONStream* stream, bool ref) const {
   Instance::PrintToJSONStream(stream, ref);
 }
 
 
 }  // namespace dart