| 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 | 6 |
| 7 import "package:async_helper/async_helper.dart"; | 7 import "package:async_helper/async_helper.dart"; |
| 8 import 'compiler_helper.dart'; | 8 import 'compiler_helper.dart'; |
| 9 import 'package:compiler/src/types/types.dart'; | 9 import 'package:compiler/src/types/types.dart'; |
| 10 import 'type_mask_test_helper.dart'; | 10 import 'type_mask_test_helper.dart'; |
| (...skipping 156 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 167 type, | 167 type, |
| 168 simplify(typesInferrer.getReturnTypeOfElement(element), | 168 simplify(typesInferrer.getReturnTypeOfElement(element), |
| 169 typesInferrer.closedWorld), | 169 typesInferrer.closedWorld), |
| 170 name); | 170 name); |
| 171 } | 171 } |
| 172 | 172 |
| 173 test1() async { | 173 test1() async { |
| 174 Uri uri = new Uri(scheme: 'source'); | 174 Uri uri = new Uri(scheme: 'source'); |
| 175 var compiler = compilerFor(TEST1, uri); | 175 var compiler = compilerFor(TEST1, uri); |
| 176 await compiler.run(uri); | 176 await compiler.run(uri); |
| 177 var closedWorld = compiler.resolverWorld.closedWorldForTesting; | 177 var closedWorld = compiler.resolutionWorldBuilder.closedWorldForTesting; |
| 178 checkReturn(compiler, 'test1', closedWorld.commonMasks.uint31Type); | 178 checkReturn(compiler, 'test1', closedWorld.commonMasks.uint31Type); |
| 179 checkReturn( | 179 checkReturn( |
| 180 compiler, 'test2', closedWorld.commonMasks.dynamicType.nonNullable()); | 180 compiler, 'test2', closedWorld.commonMasks.dynamicType.nonNullable()); |
| 181 checkReturn(compiler, 'test3', closedWorld.commonMasks.uint31Type); | 181 checkReturn(compiler, 'test3', closedWorld.commonMasks.uint31Type); |
| 182 checkReturn(compiler, 'test4', closedWorld.commonMasks.mapType); | 182 checkReturn(compiler, 'test4', closedWorld.commonMasks.mapType); |
| 183 checkReturn( | 183 checkReturn( |
| 184 compiler, 'test5', closedWorld.commonMasks.dynamicType.nonNullable()); | 184 compiler, 'test5', closedWorld.commonMasks.dynamicType.nonNullable()); |
| 185 checkReturn( | 185 checkReturn( |
| 186 compiler, 'test6', closedWorld.commonMasks.dynamicType.nonNullable()); | 186 compiler, 'test6', closedWorld.commonMasks.dynamicType.nonNullable()); |
| 187 } | 187 } |
| 188 | 188 |
| 189 test2() async { | 189 test2() async { |
| 190 Uri uri = new Uri(scheme: 'source'); | 190 Uri uri = new Uri(scheme: 'source'); |
| 191 var compiler = compilerFor(TEST2, uri); | 191 var compiler = compilerFor(TEST2, uri); |
| 192 await compiler.run(uri); | 192 await compiler.run(uri); |
| 193 var closedWorld = compiler.resolverWorld.closedWorldForTesting; | 193 var closedWorld = compiler.resolutionWorldBuilder.closedWorldForTesting; |
| 194 checkReturn(compiler, 'test1', closedWorld.commonMasks.mapType.nonNullable()); | 194 checkReturn(compiler, 'test1', closedWorld.commonMasks.mapType.nonNullable()); |
| 195 checkReturn(compiler, 'test2', closedWorld.commonMasks.mapType); | 195 checkReturn(compiler, 'test2', closedWorld.commonMasks.mapType); |
| 196 checkReturn(compiler, 'test3', closedWorld.commonMasks.mapType); | 196 checkReturn(compiler, 'test3', closedWorld.commonMasks.mapType); |
| 197 checkReturn(compiler, 'test4', closedWorld.commonMasks.mapType); | 197 checkReturn(compiler, 'test4', closedWorld.commonMasks.mapType); |
| 198 checkReturn(compiler, 'test5', closedWorld.commonMasks.mapType); | 198 checkReturn(compiler, 'test5', closedWorld.commonMasks.mapType); |
| 199 | 199 |
| 200 checkReturn(compiler, 'test6', closedWorld.commonMasks.numType); | 200 checkReturn(compiler, 'test6', closedWorld.commonMasks.numType); |
| 201 checkReturn(compiler, 'test7', closedWorld.commonMasks.uint31Type); | 201 checkReturn(compiler, 'test7', closedWorld.commonMasks.uint31Type); |
| 202 checkReturn(compiler, 'test8', closedWorld.commonMasks.uint31Type); | 202 checkReturn(compiler, 'test8', closedWorld.commonMasks.uint31Type); |
| 203 checkReturn(compiler, 'test9', closedWorld.commonMasks.uint31Type); | 203 checkReturn(compiler, 'test9', closedWorld.commonMasks.uint31Type); |
| 204 checkReturn(compiler, 'test10', closedWorld.commonMasks.numType); | 204 checkReturn(compiler, 'test10', closedWorld.commonMasks.numType); |
| 205 checkReturn(compiler, 'test11', closedWorld.commonMasks.doubleType); | 205 checkReturn(compiler, 'test11', closedWorld.commonMasks.doubleType); |
| 206 } | 206 } |
| 207 | 207 |
| 208 test3() async { | 208 test3() async { |
| 209 Uri uri = new Uri(scheme: 'source'); | 209 Uri uri = new Uri(scheme: 'source'); |
| 210 var compiler = compilerFor(TEST3, uri); | 210 var compiler = compilerFor(TEST3, uri); |
| 211 await compiler.run(uri); | 211 await compiler.run(uri); |
| 212 var closedWorld = compiler.resolverWorld.closedWorldForTesting; | 212 var closedWorld = compiler.resolutionWorldBuilder.closedWorldForTesting; |
| 213 checkReturn(compiler, 'test1', const TypeMask.nonNullEmpty()); | 213 checkReturn(compiler, 'test1', const TypeMask.nonNullEmpty()); |
| 214 checkReturn(compiler, 'test2', closedWorld.commonMasks.mapType); | 214 checkReturn(compiler, 'test2', closedWorld.commonMasks.mapType); |
| 215 checkReturn(compiler, 'test3', closedWorld.commonMasks.mapType); | 215 checkReturn(compiler, 'test3', closedWorld.commonMasks.mapType); |
| 216 checkReturn(compiler, 'test4', closedWorld.commonMasks.mapType); | 216 checkReturn(compiler, 'test4', closedWorld.commonMasks.mapType); |
| 217 checkReturn(compiler, 'test5', closedWorld.commonMasks.mapType); | 217 checkReturn(compiler, 'test5', closedWorld.commonMasks.mapType); |
| 218 checkReturn(compiler, 'test6', closedWorld.commonMasks.mapType); | 218 checkReturn(compiler, 'test6', closedWorld.commonMasks.mapType); |
| 219 } | 219 } |
| 220 | 220 |
| 221 test4() async { | 221 test4() async { |
| 222 Uri uri = new Uri(scheme: 'source'); | 222 Uri uri = new Uri(scheme: 'source'); |
| 223 var compiler = compilerFor(TEST4, uri); | 223 var compiler = compilerFor(TEST4, uri); |
| 224 await compiler.run(uri); | 224 await compiler.run(uri); |
| 225 var closedWorld = compiler.resolverWorld.closedWorldForTesting; | 225 var closedWorld = compiler.resolutionWorldBuilder.closedWorldForTesting; |
| 226 checkReturn(compiler, 'test1', const TypeMask.nonNullEmpty()); | 226 checkReturn(compiler, 'test1', const TypeMask.nonNullEmpty()); |
| 227 checkReturn(compiler, 'test2', closedWorld.commonMasks.mapType); | 227 checkReturn(compiler, 'test2', closedWorld.commonMasks.mapType); |
| 228 checkReturn(compiler, 'test3', closedWorld.commonMasks.mapType); | 228 checkReturn(compiler, 'test3', closedWorld.commonMasks.mapType); |
| 229 checkReturn(compiler, 'test4', closedWorld.commonMasks.mapType); | 229 checkReturn(compiler, 'test4', closedWorld.commonMasks.mapType); |
| 230 checkReturn(compiler, 'test5', closedWorld.commonMasks.mapType); | 230 checkReturn(compiler, 'test5', closedWorld.commonMasks.mapType); |
| 231 checkReturn(compiler, 'test6', closedWorld.commonMasks.mapType); | 231 checkReturn(compiler, 'test6', closedWorld.commonMasks.mapType); |
| 232 } | 232 } |
| 233 | 233 |
| 234 main() { | 234 main() { |
| 235 asyncTest(() async { | 235 asyncTest(() async { |
| 236 await test1(); | 236 await test1(); |
| 237 await test2(); | 237 await test2(); |
| 238 await test3(); | 238 await test3(); |
| 239 await test4(); | 239 await test4(); |
| 240 }); | 240 }); |
| 241 } | 241 } |
| OLD | NEW |