| OLD | NEW |
| 1 // Copyright (c) 2013, the Dart project authors. Please see the AUTHORS file | 1 // Copyright (c) 2013, 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 'package:expect/expect.dart'; | 5 import 'package:expect/expect.dart'; |
| 6 import "package:async_helper/async_helper.dart"; | 6 import "package:async_helper/async_helper.dart"; |
| 7 import 'compiler_helper.dart'; | 7 import 'compiler_helper.dart'; |
| 8 import 'type_mask_test_helper.dart'; | 8 import 'type_mask_test_helper.dart'; |
| 9 | 9 |
| 10 const String TEST = """ | 10 const String TEST = """ |
| (...skipping 11 matching lines...) Expand all Loading... |
| 22 main() { | 22 main() { |
| 23 baz(); | 23 baz(); |
| 24 new B().foo(); | 24 new B().foo(); |
| 25 } | 25 } |
| 26 """; | 26 """; |
| 27 | 27 |
| 28 void main() { | 28 void main() { |
| 29 Uri uri = new Uri(scheme: 'source'); | 29 Uri uri = new Uri(scheme: 'source'); |
| 30 var compiler = compilerFor(TEST, uri); | 30 var compiler = compilerFor(TEST, uri); |
| 31 asyncTest(() => compiler.run(uri).then((_) { | 31 asyncTest(() => compiler.run(uri).then((_) { |
| 32 var commonMasks = compiler.commonMasks; | 32 var commonMasks = compiler.closedWorld.commonMasks; |
| 33 var typesInferrer = compiler.globalInference.typesInferrer; | 33 var typesInferrer = compiler.globalInference.typesInferrerInternal; |
| 34 | 34 |
| 35 checkReturn(String name, type) { | 35 checkReturn(String name, type) { |
| 36 var element = findElement(compiler, name); | 36 var element = findElement(compiler, name); |
| 37 Expect.equals( | 37 Expect.equals( |
| 38 type, | 38 type, |
| 39 simplify(typesInferrer.getReturnTypeOfElement(element), compiler), | 39 simplify(typesInferrer.getReturnTypeOfElement(element), compiler), |
| 40 name); | 40 name); |
| 41 } | 41 } |
| 42 | 42 |
| 43 checkReturnInClass(String className, String methodName, type) { | 43 checkReturnInClass(String className, String methodName, type) { |
| 44 var cls = findElement(compiler, className); | 44 var cls = findElement(compiler, className); |
| 45 var element = cls.lookupLocalMember(methodName); | 45 var element = cls.lookupLocalMember(methodName); |
| 46 Expect.equals( | 46 Expect.equals( |
| 47 type, | 47 type, |
| 48 simplify( | 48 simplify( |
| 49 typesInferrer.getReturnTypeOfElement(element), compiler)); | 49 typesInferrer.getReturnTypeOfElement(element), compiler)); |
| 50 } | 50 } |
| 51 | 51 |
| 52 checkReturn('bar', commonMasks.uint31Type); | 52 checkReturn('bar', commonMasks.uint31Type); |
| 53 checkReturn('baz', commonMasks.functionType); | 53 checkReturn('baz', commonMasks.functionType); |
| 54 | 54 |
| 55 checkReturnInClass('A', 'foo', commonMasks.uint31Type); | 55 checkReturnInClass('A', 'foo', commonMasks.uint31Type); |
| 56 checkReturnInClass('B', 'foo', commonMasks.functionType); | 56 checkReturnInClass('B', 'foo', commonMasks.functionType); |
| 57 })); | 57 })); |
| 58 } | 58 } |
| OLD | NEW |