| OLD | NEW |
| 1 // Copyright (c) 2012, the Dart project authors. Please see the AUTHORS file | 1 // Copyright (c) 2012, the Dart 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 file. | 3 // BSD-style license that can be found in the LICENSE file. |
| 4 | 4 |
| 5 import 'dart:_internal' as internal; | 5 import 'dart:_internal' as internal; |
| 6 import 'dart:convert' show JSON; | 6 import 'dart:convert' show JSON; |
| 7 | 7 |
| 8 patch class Error { | 8 patch class Error { |
| 9 /* patch */ static String _objectToString(Object object) { | 9 /* patch */ static String _objectToString(Object object) { |
| 10 return Object._toString(object); | 10 return Object._toString(object); |
| 11 } | 11 } |
| 12 | 12 |
| 13 /* patch */ static String _stringToSafeString(String string) { | 13 /* patch */ static String _stringToSafeString(String string) { |
| 14 return JSON.encode(string); | 14 return JSON.encode(string); |
| 15 } | 15 } |
| 16 | 16 |
| 17 /* patch */ StackTrace get stackTrace => _stackTrace; | 17 /* patch */ StackTrace get stackTrace => _stackTrace; |
| 18 | 18 |
| 19 StackTrace _stackTrace; | 19 StackTrace _stackTrace; |
| 20 } | 20 } |
| 21 | 21 |
| 22 class _AssertionError extends Error implements AssertionError { | 22 class _AssertionError extends Error implements AssertionError { |
| 23 _AssertionError._create( | 23 _AssertionError._create( |
| 24 this._failedAssertion, this._url, this._line, this._column); | 24 this._failedAssertion, this._url, this._line, this._column); |
| 25 | 25 |
| 26 static _throwNew(int assertionStart, int assertionEnd) | 26 static _throwNew(int assertionStart, int assertionEnd) |
| 27 native "AssertionError_throwNew"; | 27 native "AssertionError_throwNew"; |
| 28 | 28 |
| 29 static _handleCondition(condition) { | 29 static void _checkAssertion(condition, int start, int end) { |
| 30 if (condition is Function) return condition(); | 30 if (condition is Function) { |
| 31 return condition; | 31 condition = condition(); |
| 32 } |
| 33 if (!condition) { |
| 34 _throwNew(start, end); |
| 35 } |
| 32 } | 36 } |
| 33 | 37 |
| 34 String toString() { | 38 String toString() { |
| 35 if (_url == null) { | 39 if (_url == null) { |
| 36 return _failedAssertion; | 40 return _failedAssertion; |
| 37 } | 41 } |
| 38 var columnInfo = ""; | 42 var columnInfo = ""; |
| 39 if (_column > 0) { | 43 if (_column > 0) { |
| 40 // Only add column information if it is valid. | 44 // Only add column information if it is valid. |
| 41 columnInfo = " pos $_column"; | 45 columnInfo = " pos $_column"; |
| (...skipping 299 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 341 msg_buf.write( | 345 msg_buf.write( |
| 342 "NoSuchMethodError: incorrect number of arguments passed to " | 346 "NoSuchMethodError: incorrect number of arguments passed to " |
| 343 "method named '$memberName'\n" | 347 "method named '$memberName'\n" |
| 344 "Receiver: $receiver_str\n" | 348 "Receiver: $receiver_str\n" |
| 345 "Tried calling: $memberName($actualParameters)\n" | 349 "Tried calling: $memberName($actualParameters)\n" |
| 346 "Found: $memberName($formalParameters)"); | 350 "Found: $memberName($formalParameters)"); |
| 347 } | 351 } |
| 348 return msg_buf.toString(); | 352 return msg_buf.toString(); |
| 349 } | 353 } |
| 350 } | 354 } |
| OLD | NEW |