VM: Fix issue with local variable values reported by the debugger.

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 281 matching lines @@
   return new FrameMatcher(frameIndex, [functionName], exactMatch);
 }
 
 MatchFrames(List<String> functionNames, {exactMatch: false}) {
   return new FrameMatcher(0, functionNames, exactMatch);
 }
 
 
 class LocalsMatcher extends Command {
   Map locals = {};
+  int frame_index;
 
-  LocalsMatcher(this.locals) {
+  LocalsMatcher(this.locals, this.frame_index) {
     template = {"id": 0, "command": "getStackTrace", "params": {"isolateId": 0}};
   }
 
   void matchResponse(Debugger debugger) {
     super.matchResponse(debugger);
 
     List frames = getJsonValue(debugger.currentMessage, "result:callFrames");
     assert(frames != null);
 
-    String functionName = frames[0]['functionName'];
-    List localsList = frames[0]['locals'];
+    String functionName = frames[frame_index]['functionName'];
+    List localsList = frames[frame_index]['locals'];
     Map reportedLocals = {};
     localsList.forEach((local) => reportedLocals[local['name']] = local['value']);
     for (String key in locals.keys) {
       if (reportedLocals[key] == null) {
         debugger.error("Error in $functionName(): no value reported for local "
             "variable $key");
         return;
       }
       String expected = locals[key];
       String actual = reportedLocals[key]['text'];
       if (expected != actual) {
         debugger.error("Error in $functionName(): got '$actual' for local "
             "variable $key, but expected '$expected'");
         return;
       }
     }
     print("Matched locals ${locals.keys}");
   }
 }
 
 
-MatchLocals(Map localValues) {
-  return new LocalsMatcher(localValues);
+MatchLocals(Map localValues, [int frame_index = 0]) {

[hausner, 2015/02/18 18:32:29]

It doesn't look like you are using MatchLocals with a frame index anywhere. It's
nice to have this functionality, but for consistency I would prefer if the
frame_index was the first parameter, like in MatchFrame above. Since you are not
using it now, you could just remove the second parameter so you don't have to
fix the other tests.

[Florian Schneider, 2015/02/18 18:45:23]

Yes, I only used to while testing. I'll remove it for now.

+  return new LocalsMatcher(localValues, frame_index);
+}
+
+
+class InvertedLocalsMatcher extends Command {

[hausner, 2015/02/18 18:32:28]

Would you mind adding a one-liner comment what this matcher is good for? It
seems less intuitive than other matcher names.

[Florian Schneider, 2015/02/18 18:45:23]

Added comment and renamed to AssertLocalsNotVisibleMatcher - I could not find a
different descriptive short name.

+  List<String> locals;
+  int frame_index;
+
+  InvertedLocalsMatcher(this.locals, this.frame_index) {
+    template = {"id": 0, "command": "getStackTrace", "params": {"isolateId": 0}};
+  }
+
+  void matchResponse(Debugger debugger) {
+    super.matchResponse(debugger);
+
+    List frames = getJsonValue(debugger.currentMessage, "result:callFrames");
+    assert(frames != null);
+
+    String functionName = frames[frame_index]['functionName'];
+    List localsList = frames[frame_index]['locals'];
+    Map reportedLocals = {};
+    localsList.forEach((local) => reportedLocals[local['name']] = local['value']);
+    for (String key in locals) {
+      if (reportedLocals[key] != null) {
+        debugger.error("Error in $functionName(): local variable $key not "
+                       "expected in scope (reported value "
+                       "${reportedLocals[key]['text']})");
+        return;
+      }
+    }
+    print("Matched locals $locals");
+  }
+}
+
+
+AssertLocalsNotVisible(List<String> locals, [int frame_index = 0]) {
+  return new InvertedLocalsMatcher(locals, frame_index);
 }
 
 
 class EventMatcher {
   String eventName;
   Map params;
 
   EventMatcher(this.eventName, this.params);
 
   void matchEvent(Debugger debugger) {
@@ skipping 355 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;
 }