| 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 'parser_helper.dart'; | 8 import 'parser_helper.dart'; |
| 9 import 'type_mask_test_helper.dart'; |
| 9 | 10 |
| 10 const String TEST = """ | 11 const String TEST = """ |
| 11 | 12 |
| 12 class A { | 13 class A { |
| 13 final intField; | 14 final intField; |
| 14 final giveUpField1; | 15 final giveUpField1; |
| 15 final giveUpField2; | 16 final giveUpField2; |
| 16 final fieldParameter; | 17 final fieldParameter; |
| 17 A() : intField = 42, giveUpField1 = 'foo', giveUpField2 = 'foo'; | 18 A() : intField = 42, giveUpField1 = 'foo', giveUpField2 = 'foo'; |
| 18 A.bar() : intField = 54, giveUpField1 = 42, giveUpField2 = new A(); | 19 A.bar() : intField = 54, giveUpField1 = 42, giveUpField2 = new A(); |
| (...skipping 10 matching lines...) Expand all Loading... |
| 29 void main() { | 30 void main() { |
| 30 Uri uri = new Uri(scheme: 'source'); | 31 Uri uri = new Uri(scheme: 'source'); |
| 31 var compiler = compilerFor(TEST, uri); | 32 var compiler = compilerFor(TEST, uri); |
| 32 asyncTest(() => compiler.runCompiler(uri).then((_) { | 33 asyncTest(() => compiler.runCompiler(uri).then((_) { |
| 33 var typesInferrer = compiler.typesTask.typesInferrer; | 34 var typesInferrer = compiler.typesTask.typesInferrer; |
| 34 | 35 |
| 35 checkFieldTypeInClass(String className, String fieldName, type) { | 36 checkFieldTypeInClass(String className, String fieldName, type) { |
| 36 var cls = findElement(compiler, className); | 37 var cls = findElement(compiler, className); |
| 37 var element = cls.lookupLocalMember(fieldName); | 38 var element = cls.lookupLocalMember(fieldName); |
| 38 Expect.equals(type, | 39 Expect.equals(type, |
| 39 typesInferrer.getTypeOfElement(element).simplify(compiler)); | 40 simplify(typesInferrer.getTypeOfElement(element), compiler)); |
| 40 } | 41 } |
| 41 | 42 |
| 42 checkFieldTypeInClass('A', 'intField', compiler.typesTask.uint31Type); | 43 checkFieldTypeInClass('A', 'intField', compiler.typesTask.uint31Type); |
| 43 checkFieldTypeInClass('A', 'giveUpField1', | 44 checkFieldTypeInClass('A', 'giveUpField1', |
| 44 findTypeMask(compiler, 'Interceptor', 'nonNullSubclass')); | 45 findTypeMask(compiler, 'Interceptor', 'nonNullSubclass')); |
| 45 checkFieldTypeInClass('A', 'giveUpField2', | 46 checkFieldTypeInClass('A', 'giveUpField2', |
| 46 compiler.typesTask.dynamicType.nonNullable()); | 47 compiler.typesTask.dynamicType.nonNullable()); |
| 47 checkFieldTypeInClass('A', 'fieldParameter', compiler.typesTask.uint31Type); | 48 checkFieldTypeInClass('A', 'fieldParameter', compiler.typesTask.uint31Type); |
| 48 })); | 49 })); |
| 49 } | 50 } |
| OLD | NEW |