| OLD | NEW |
| 1 // Copyright (c) 2015, the Dartino project authors. Please see the AUTHORS file | 1 // Copyright (c) 2015, the Dartino project authors. Please see the AUTHORS file |
| 2 // for details. All rights reserved. Use of this source code is governed by a | 2 // for details. All rights reserved. Use of this source code is governed by a |
| 3 // BSD-style license that can be found in the LICENSE.md file. | 3 // BSD-style license that can be found in the LICENSE.md file. |
| 4 | 4 |
| 5 import "dart:async"; | 5 import "dart:async"; |
| 6 | 6 |
| 7 import "dart:convert" show | 7 import "dart:convert" show |
| 8 UTF8; | 8 UTF8; |
| 9 | 9 |
| 10 import "dart:io" show | 10 import "dart:io" show |
| (...skipping 704 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 715 return trace.scopeInfoForCurrentFrame.lookup(name); | 715 return trace.scopeInfoForCurrentFrame.lookup(name); |
| 716 } | 716 } |
| 717 | 717 |
| 718 Future<RemoteObject> _processVariable( | 718 Future<RemoteObject> _processVariable( |
| 719 List<Access> accesses, | 719 List<Access> accesses, |
| 720 bool getStructure, | 720 bool getStructure, |
| 721 DartinoVmContext vmContext) async { | 721 DartinoVmContext vmContext) async { |
| 722 assert(vmContext.isSpawned); | 722 assert(vmContext.isSpawned); |
| 723 assert(accesses.isNotEmpty); | 723 assert(accesses.isNotEmpty); |
| 724 LocalAccess localAccess = accesses.first; | 724 LocalAccess localAccess = accesses.first; |
| 725 int frame = vmContext.debugState.currentFrame; | 725 int frame = vmContext.debugState.actualCurrentFrameNumber; |
| 726 LocalValue local = await lookupValue(localAccess.localName, vmContext); | 726 LocalValue local = await lookupValue(localAccess.localName, vmContext); |
| 727 if (local == null) { | 727 if (local == null) { |
| 728 return new RemoteErrorObject( | 728 return new RemoteErrorObject( |
| 729 "No local '${localAccess.localName}' in scope."); | 729 "No local '${localAccess.localName}' in scope."); |
| 730 } | 730 } |
| 731 | 731 |
| 732 List<int> fieldIndices = new List<int>(); | 732 List<int> fieldIndices = new List<int>(); |
| 733 List<Access> accessesTillHere = <Access>[localAccess]; | 733 List<Access> accessesTillHere = <Access>[localAccess]; |
| 734 int startIndex = 0; | 734 int startIndex = 0; |
| 735 // By default request no more than [arrayItemsShownByDefault] items from the | 735 // By default request no more than [arrayItemsShownByDefault] items from the |
| (...skipping 398 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1134 parseAccess(); | 1134 parseAccess(); |
| 1135 } | 1135 } |
| 1136 for (int i = 0; i < result.length - 1; i++) { | 1136 for (int i = 0; i < result.length - 1; i++) { |
| 1137 if (result[i] is Slice) { | 1137 if (result[i] is Slice) { |
| 1138 parseError("Only the last operation can be a slice.", | 1138 parseError("Only the last operation can be a slice.", |
| 1139 offset: result[i].offset); | 1139 offset: result[i].offset); |
| 1140 } | 1140 } |
| 1141 } | 1141 } |
| 1142 } | 1142 } |
| 1143 } | 1143 } |
| OLD | NEW |