| OLD | NEW |
| 1 // Copyright (c) 2014, the Dart project authors. Please see the AUTHORS file | 1 // Copyright (c) 2014, 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 | 8 |
| 9 const String TEST = """ | 9 const String TEST = """ |
| 10 | 10 |
| (...skipping 24 matching lines...) Expand all Loading... |
| 35 | 35 |
| 36 void main() { | 36 void main() { |
| 37 Uri uri = new Uri(scheme: 'source'); | 37 Uri uri = new Uri(scheme: 'source'); |
| 38 var compiler = compilerFor(TEST, uri); | 38 var compiler = compilerFor(TEST, uri); |
| 39 asyncTest(() => compiler.run(uri).then((_) { | 39 asyncTest(() => compiler.run(uri).then((_) { |
| 40 var typesInferrer = compiler.globalInference.typesInferrerInternal; | 40 var typesInferrer = compiler.globalInference.typesInferrerInternal; |
| 41 var closedWorld = typesInferrer.closedWorld; | 41 var closedWorld = typesInferrer.closedWorld; |
| 42 | 42 |
| 43 checkReturn(String name, type) { | 43 checkReturn(String name, type) { |
| 44 var element = findElement(compiler, name); | 44 var element = findElement(compiler, name); |
| 45 Expect.equals( | 45 dynamic returnType = typesInferrer.getReturnTypeOfElement(element); |
| 46 type, | 46 Expect.equals(type, returnType.simplify(compiler), name); |
| 47 typesInferrer.getReturnTypeOfElement(element).simplify(compiler), | |
| 48 name); | |
| 49 } | 47 } |
| 50 | 48 |
| 51 checkReturn('method1', closedWorld.commonMasks.uint31Type); | 49 checkReturn('method1', closedWorld.commonMasks.uint31Type); |
| 52 checkReturn('returnInt1', closedWorld.commonMasks.uint31Type); | 50 checkReturn('returnInt1', closedWorld.commonMasks.uint31Type); |
| 53 | 51 |
| 54 checkReturn('method2', closedWorld.commonMasks.uint31Type); | 52 checkReturn('method2', closedWorld.commonMasks.uint31Type); |
| 55 checkReturn('returnInt2', closedWorld.commonMasks.uint31Type); | 53 checkReturn('returnInt2', closedWorld.commonMasks.uint31Type); |
| 56 })); | 54 })); |
| 57 } | 55 } |
| OLD | NEW |