| 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 'compiler_helper.dart'; | 7 import 'compiler_helper.dart'; |
| 8 import 'parser_helper.dart'; | 8 import 'parser_helper.dart'; |
| 9 | 9 |
| 10 const String TEST1 = """ | 10 const String TEST1 = """ |
| (...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 88 test8(); | 88 test8(); |
| 89 test9(); | 89 test9(); |
| 90 test10(); | 90 test10(); |
| 91 test11(); | 91 test11(); |
| 92 } | 92 } |
| 93 """; | 93 """; |
| 94 | 94 |
| 95 main() { | 95 main() { |
| 96 Uri uri = new Uri(scheme: 'source'); | 96 Uri uri = new Uri(scheme: 'source'); |
| 97 | 97 |
| 98 var compiler = compilerFor(TEST1, uri); | 98 checkReturn(MockCompiler compiler, typesInferrer, String name, type) { |
| 99 compiler.runCompiler(uri); | |
| 100 var typesInferrer = compiler.typesTask.typesInferrer; | |
| 101 | |
| 102 checkReturn(String name, type) { | |
| 103 var element = findElement(compiler, name); | 99 var element = findElement(compiler, name); |
| 104 Expect.equals( | 100 Expect.equals( |
| 105 type, | 101 type, |
| 106 typesInferrer.internal.returnTypeOf[element].simplify(compiler), | 102 typesInferrer.internal.returnTypeOf[element].simplify(compiler), |
| 107 name); | 103 name); |
| 108 } | 104 } |
| 109 | 105 |
| 110 checkReturn('test1', typesInferrer.intType); | 106 var compiler1 = compilerFor(TEST1, uri); |
| 111 checkReturn('test2', typesInferrer.dynamicType.nonNullable()); | 107 compiler1.runCompiler(uri).then((_) { |
| 112 checkReturn('test3', typesInferrer.intType); | 108 var typesInferrer = compiler1.typesTask.typesInferrer; |
| 113 checkReturn('test4', typesInferrer.mapType); | |
| 114 checkReturn('test5', typesInferrer.dynamicType.nonNullable()); | |
| 115 checkReturn('test6', typesInferrer.dynamicType.nonNullable()); | |
| 116 | 109 |
| 117 compiler = compilerFor(TEST2, uri); | 110 checkReturn(compiler1, typesInferrer, 'test1', typesInferrer.intType); |
| 118 compiler.runCompiler(uri); | 111 checkReturn(compiler1, typesInferrer, 'test2', |
| 119 typesInferrer = compiler.typesTask.typesInferrer; | 112 typesInferrer.dynamicType.nonNullable()); |
| 113 checkReturn(compiler1, typesInferrer, 'test3', typesInferrer.intType); |
| 114 checkReturn(compiler1, typesInferrer, 'test4', typesInferrer.mapType); |
| 115 checkReturn(compiler1, typesInferrer, 'test5', |
| 116 typesInferrer.dynamicType.nonNullable()); |
| 117 checkReturn(compiler1, typesInferrer, 'test6', |
| 118 typesInferrer.dynamicType.nonNullable()); |
| 119 }); |
| 120 | 120 |
| 121 checkReturn('test1', typesInferrer.dynamicType.nonNullable()); | 121 var compiler2 = compilerFor(TEST2, uri); |
| 122 checkReturn('test2', typesInferrer.mapType); | 122 compiler2.runCompiler(uri).then((_) { |
| 123 checkReturn('test3', typesInferrer.mapType); | 123 var typesInferrer = compiler2.typesTask.typesInferrer; |
| 124 checkReturn('test4', typesInferrer.mapType); | |
| 125 checkReturn('test5', typesInferrer.mapType); | |
| 126 | 124 |
| 127 checkReturn('test6', typesInferrer.numType); | 125 checkReturn(compiler2, typesInferrer, 'test1', |
| 128 checkReturn('test7', typesInferrer.intType); | 126 typesInferrer.dynamicType.nonNullable()); |
| 129 checkReturn('test8', typesInferrer.intType); | 127 checkReturn(compiler2, typesInferrer, 'test2', typesInferrer.mapType); |
| 130 checkReturn('test9', typesInferrer.intType); | 128 checkReturn(compiler2, typesInferrer, 'test3', typesInferrer.mapType); |
| 131 checkReturn('test10', typesInferrer.numType); | 129 checkReturn(compiler2, typesInferrer, 'test4', typesInferrer.mapType); |
| 132 checkReturn('test11', typesInferrer.doubleType); | 130 checkReturn(compiler2, typesInferrer, 'test5', typesInferrer.mapType); |
| 131 |
| 132 checkReturn(compiler2, typesInferrer, 'test6', typesInferrer.numType); |
| 133 checkReturn(compiler2, typesInferrer, 'test7', typesInferrer.intType); |
| 134 checkReturn(compiler2, typesInferrer, 'test8', typesInferrer.intType); |
| 135 checkReturn(compiler2, typesInferrer, 'test9', typesInferrer.intType); |
| 136 checkReturn(compiler2, typesInferrer, 'test10', typesInferrer.numType); |
| 137 checkReturn(compiler2, typesInferrer, 'test11', typesInferrer.doubleType); |
| 138 }); |
| 133 } | 139 } |
| OLD | NEW |