| 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 86 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 97 var compiler = compilerFor(TEST, uri); | 97 var compiler = compilerFor(TEST, uri); |
| 98 asyncTest(() => compiler.run(uri).then((_) { | 98 asyncTest(() => compiler.run(uri).then((_) { |
| 99 var typesInferrer = compiler.globalInference.typesInferrerInternal; | 99 var typesInferrer = compiler.globalInference.typesInferrerInternal; |
| 100 var closedWorld = typesInferrer.closedWorld; | 100 var closedWorld = typesInferrer.closedWorld; |
| 101 | 101 |
| 102 checkReturn(String name, type) { | 102 checkReturn(String name, type) { |
| 103 var element = findElement(compiler, name); | 103 var element = findElement(compiler, name); |
| 104 Expect.equals( | 104 Expect.equals( |
| 105 type, | 105 type, |
| 106 simplify( | 106 simplify( |
| 107 typesInferrer.getReturnTypeOfElement(element), closedWorld)); | 107 typesInferrer.getReturnTypeOfMember(element), closedWorld)); |
| 108 } | 108 } |
| 109 | 109 |
| 110 var subclassOfInterceptor = closedWorld.commonMasks.interceptorType; | 110 var subclassOfInterceptor = closedWorld.commonMasks.interceptorType; |
| 111 | 111 |
| 112 checkReturn('returnDyn1', subclassOfInterceptor); | 112 checkReturn('returnDyn1', subclassOfInterceptor); |
| 113 checkReturn('returnDyn2', subclassOfInterceptor); | 113 checkReturn('returnDyn2', subclassOfInterceptor); |
| 114 checkReturn('returnDyn3', subclassOfInterceptor); | 114 checkReturn('returnDyn3', subclassOfInterceptor); |
| 115 checkReturn( | 115 checkReturn( |
| 116 'returnDyn4', closedWorld.commonMasks.dynamicType.nonNullable()); | 116 'returnDyn4', closedWorld.commonMasks.dynamicType.nonNullable()); |
| 117 checkReturn( | 117 checkReturn( |
| 118 'returnDyn5', closedWorld.commonMasks.dynamicType.nonNullable()); | 118 'returnDyn5', closedWorld.commonMasks.dynamicType.nonNullable()); |
| 119 checkReturn( | 119 checkReturn( |
| 120 'returnDyn6', closedWorld.commonMasks.dynamicType.nonNullable()); | 120 'returnDyn6', closedWorld.commonMasks.dynamicType.nonNullable()); |
| 121 checkReturn('returnDyn7', subclassOfInterceptor); | 121 checkReturn('returnDyn7', subclassOfInterceptor); |
| 122 checkReturn('returnDyn7b', subclassOfInterceptor); | 122 checkReturn('returnDyn7b', subclassOfInterceptor); |
| 123 checkReturn('returnDyn8', subclassOfInterceptor); | 123 checkReturn('returnDyn8', subclassOfInterceptor); |
| 124 checkReturn('returnDyn9', subclassOfInterceptor); | 124 checkReturn('returnDyn9', subclassOfInterceptor); |
| 125 checkReturn('returnString', closedWorld.commonMasks.stringType); | 125 checkReturn('returnString', closedWorld.commonMasks.stringType); |
| 126 })); | 126 })); |
| 127 } | 127 } |
| OLD | NEW |