| 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 "../../../sdk/lib/_internal/compiler/implementation/dart2jslib.dart"; | 5 import "../../../sdk/lib/_internal/compiler/implementation/dart2jslib.dart"; |
| 6 import "../../../sdk/lib/_internal/compiler/implementation/elements/elements.dar
t"; | 6 import "../../../sdk/lib/_internal/compiler/implementation/elements/elements.dar
t"; |
| 7 import "../../../sdk/lib/_internal/compiler/implementation/resolution/resolution
.dart"; | 7 import "../../../sdk/lib/_internal/compiler/implementation/resolution/resolution
.dart"; |
| 8 import "../../../sdk/lib/_internal/compiler/implementation/tree/tree.dart"; | 8 import "../../../sdk/lib/_internal/compiler/implementation/tree/tree.dart"; |
| 9 import "../../../sdk/lib/_internal/compiler/implementation/util/util.dart"; | 9 import "../../../sdk/lib/_internal/compiler/implementation/util/util.dart"; |
| 10 import "mock_compiler.dart"; | 10 import "mock_compiler.dart"; |
| 11 import "parser_helper.dart"; | 11 import "parser_helper.dart"; |
| 12 | 12 |
| 13 class CallbackMockCompiler extends MockCompiler { | 13 class CallbackMockCompiler extends MockCompiler { |
| 14 CallbackMockCompiler(); | 14 CallbackMockCompiler(); |
| 15 | 15 |
| 16 var onError; | 16 var onError; |
| 17 var onWarning; | 17 var onWarning; |
| 18 | 18 |
| 19 setOnError(var f) => onError = f; | 19 setOnError(var f) => onError = f; |
| 20 setOnWarning(var f) => onWarning = f; | 20 setOnWarning(var f) => onWarning = f; |
| 21 | 21 |
| 22 void reportWarning(Node node, var message) { | 22 void reportWarning(Node node, var message) { |
| 23 if (onWarning !== null) onWarning(this, node, message); | 23 if (onWarning != null) onWarning(this, node, message); |
| 24 super.reportWarning(node, message); | 24 super.reportWarning(node, message); |
| 25 } | 25 } |
| 26 | 26 |
| 27 void reportError(Node node, var message) { | 27 void reportError(Node node, var message) { |
| 28 if (onError !== null) onError(this, node, message); | 28 if (onError != null) onError(this, node, message); |
| 29 super.reportError(node, message); | 29 super.reportError(node, message); |
| 30 } | 30 } |
| 31 } | 31 } |
| 32 | 32 |
| 33 testErrorHandling() { | 33 testErrorHandling() { |
| 34 // Test that compiler.currentElement is set correctly when | 34 // Test that compiler.currentElement is set correctly when |
| 35 // reporting errors/warnings. | 35 // reporting errors/warnings. |
| 36 CallbackMockCompiler compiler = new CallbackMockCompiler(); | 36 CallbackMockCompiler compiler = new CallbackMockCompiler(); |
| 37 ResolverVisitor visitor = compiler.resolverVisitor(); | 37 ResolverVisitor visitor = compiler.resolverVisitor(); |
| 38 compiler.parseScript('NoSuchPrefix.NoSuchType foo() {}'); | 38 compiler.parseScript('NoSuchPrefix.NoSuchType foo() {}'); |
| 39 FunctionElement foo = compiler.mainApp.find(buildSourceString('foo')); | 39 FunctionElement foo = compiler.mainApp.find(buildSourceString('foo')); |
| 40 compiler.setOnWarning((c, n, m) => Expect.equals(foo, compiler.currentElement)
); | 40 compiler.setOnWarning((c, n, m) => Expect.equals(foo, compiler.currentElement)
); |
| 41 foo.computeType(compiler); | 41 foo.computeType(compiler); |
| 42 Expect.equals(1, compiler.warnings.length); | 42 Expect.equals(1, compiler.warnings.length); |
| 43 } | 43 } |
| 44 | 44 |
| 45 main() { | 45 main() { |
| 46 testErrorHandling(); | 46 testErrorHandling(); |
| 47 } | 47 } |
| OLD | NEW |