VM debugger: fix closures in mixed-in functions

tests/standalone/debugger/debug_lib.dart

 // Copyright (c) 2013, 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.
 
 // Library used by debugger wire protocol tests (standalone VM debugging).
 
 library DartDebugger;
 
 import "dart:async";
 import "dart:convert";
@@ skipping 166 matching lines @@
     if (response["id"] != id) {
       debugger.error("Error: expected messaged id $id but got ${response["id"]}.");
     }
   }
 }
 
 
 class FrameMatcher extends Command {
   int frameIndex;
   List<String> functionNames;
+  bool exactMatch;
 
-  FrameMatcher(this.frameIndex, this.functionNames) {
+  FrameMatcher(this.frameIndex, this.functionNames, this.exactMatch) {
     template = {"id": 0, "command": "getStackTrace", "params": {"isolateId": 0}};
   }
 
   void matchResponse(Debugger debugger) {
     super.matchResponse(debugger);
     var msg = debugger.currentMessage;
     List frames = getJsonValue(msg, "result:callFrames");
     assert(frames != null);
     if (debugger.scriptUrl == null) {
       var name = frames[0]["functionName"];
       if (name == "main") {
         // Extract script url of debugged script.
         debugger.scriptUrl = frames[0]["location"]["url"];
         assert(debugger.scriptUrl != null);
       }
     }
     if (frames.length < functionNames.length) {
       debugger.error("Error: stack trace not long enough "
                      "to match ${functionNames.length} frames");
       return;
     }
     for (int i = 0; i < functionNames.length; i++) {
       var idx = i + frameIndex;
       var name = frames[idx]["functionName"];
       assert(name != null);
-      if (name != functionNames[i]) {
+      bool isMatch = exactMatch ? name == functionNames[i]
+                                : name.contains(functionNames[i]);
+      if (!isMatch) {
         debugger.error("Error: call frame $idx: "
           "expected function name '${functionNames[i]}' but found '$name'");
         return;
       }
     }
   }
 }
 
 
-MatchFrame(int frameIndex, String functionName) {
-  return new FrameMatcher(frameIndex, [ functionName ]);
+MatchFrame(int frameIndex, String functionName, {exactMatch: false}) {
+  return new FrameMatcher(frameIndex, [functionName], exactMatch);
 }
 
-MatchFrames(List<String> functionNames) {
-  return new FrameMatcher(0, functionNames);
+MatchFrames(List<String> functionNames, {exactMatch: false}) {
+  return new FrameMatcher(0, functionNames, exactMatch);
 }
 
 
 class LocalsMatcher extends Command {
   Map locals = {};
 
   LocalsMatcher(this.locals) {
     template = {"id": 0, "command": "getStackTrace", "params": {"isolateId": 0}};
   }
 
@@ skipping 371 matching lines @@
   targetOpts.add("--debuggee");
   print('args: ${targetOpts.join(" ")}');
 
   Process.start(Platform.executable, targetOpts).then((Process process) {
     print("Debug target process started, pid ${process.pid}.");
     process.stdin.close();
     var debugger = new Debugger(process, new DebugScript(script));
   });
   return true;
 }