| OLD | NEW |
| 1 // Copyright (c) 2011, the Dart project authors. Please see the AUTHORS file | 1 // Copyright (c) 2011, 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 class Type implements Named, Hashable { | 5 class Type implements Named, Hashable { |
| 6 final String name; | 6 final String name; |
| 7 bool isTested; | 7 bool isTested; |
| 8 | 8 |
| 9 /** | 9 /** |
| 10 * For core types (int, String, etc) this is the generated type assertion | 10 * For core types (int, String, etc) this is the generated type assertion |
| (...skipping 23 matching lines...) Expand all Loading... |
| 34 abstract SourceSpan get span(); | 34 abstract SourceSpan get span(); |
| 35 | 35 |
| 36 abstract Type resolveType(TypeReference node, bool isRequired); | 36 abstract Type resolveType(TypeReference node, bool isRequired); |
| 37 | 37 |
| 38 abstract Type resolveTypeParams(ConcreteType inType); | 38 abstract Type resolveTypeParams(ConcreteType inType); |
| 39 | 39 |
| 40 abstract MemberSet resolveMember(String name); | 40 abstract MemberSet resolveMember(String name); |
| 41 Member getMember(String name) => null; | 41 Member getMember(String name) => null; |
| 42 abstract MethodMember getConstructor(String name); | 42 abstract MethodMember getConstructor(String name); |
| 43 abstract MethodMember getFactory(Type type, String name); | 43 abstract MethodMember getFactory(Type type, String name); |
| 44 abstract Type getOrMakeConcreteType(List<Type> typeArgs); | 44 |
| 45 abstract Map<String, MethodMember> get constructors(); | |
| 46 abstract addDirectSubtype(Type type); | |
| 47 abstract bool get isClass(); | 45 abstract bool get isClass(); |
| 48 abstract Library get library(); | 46 abstract Library get library(); |
| 49 | 47 |
| 50 // TODO(jmesserly): rename to isDynamic? | 48 // TODO(jmesserly): rename to isDynamic? |
| 51 bool get isVar() => false; | 49 bool get isVar() => false; |
| 52 bool get isTop() => false; | 50 bool get isTop() => false; |
| 53 | 51 |
| 54 bool get isObject() => false; | 52 bool get isObject() => false; |
| 55 bool get isString() => false; | 53 bool get isString() => false; |
| 56 bool get isBool() => false; | 54 bool get isBool() => false; |
| (...skipping 21 matching lines...) Expand all Loading... |
| 78 bool get isNative() => isNativeType; // TODO(jimhug): remove isNativeType. | 76 bool get isNative() => isNativeType; // TODO(jimhug): remove isNativeType. |
| 79 | 77 |
| 80 bool get hasTypeParams() => false; | 78 bool get hasTypeParams() => false; |
| 81 | 79 |
| 82 String get typeofName() => null; | 80 String get typeofName() => null; |
| 83 | 81 |
| 84 String get jsname() => _jsname == null ? name : _jsname; | 82 String get jsname() => _jsname == null ? name : _jsname; |
| 85 | 83 |
| 86 set jsname(String name) => _jsname = name; | 84 set jsname(String name) => _jsname = name; |
| 87 | 85 |
| 88 Map<String, Member> get members() => null; | |
| 89 Definition get definition() => null; | |
| 90 FactoryMap get factories() => null; | |
| 91 | |
| 92 // TODO(jmesserly): should try using a const list instead of null to represent | 86 // TODO(jmesserly): should try using a const list instead of null to represent |
| 93 // the absence of type parameters. | 87 // the absence of type parameters. |
| 94 Collection<Type> get typeArgsInOrder() => null; | 88 Collection<Type> get typeArgsInOrder() => null; |
| 95 DefinedType get genericType() => this; | 89 Type get genericType() => this; |
| 96 | 90 |
| 97 // TODO(jmesserly): what should these do for ParameterType? | 91 // TODO(jmesserly): what should these do for ParameterType? |
| 98 List<Type> get interfaces() => null; | 92 List<Type> get interfaces() => null; |
| 99 Type get parent() => null; | 93 Type get parent() => null; |
| 100 | 94 |
| 101 Map<String, Member> getAllMembers() => {}; | 95 Map<String, Member> getAllMembers() => {}; |
| 102 | 96 |
| 103 int hashCode() => name.hashCode(); | 97 int hashCode() => name.hashCode(); |
| 104 | 98 |
| 105 void ensureSubtypeOf(Type other, SourceSpan span, [bool typeErrors=false]) { | 99 void ensureSubtypeOf(Type other, SourceSpan span, [bool typeErrors=false]) { |
| (...skipping 194 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 300 } | 294 } |
| 301 } | 295 } |
| 302 | 296 |
| 303 | 297 |
| 304 /** A type parameter within the body of the type. */ | 298 /** A type parameter within the body of the type. */ |
| 305 class ParameterType extends Type { | 299 class ParameterType extends Type { |
| 306 TypeParameter typeParameter; | 300 TypeParameter typeParameter; |
| 307 Type extendsType; | 301 Type extendsType; |
| 308 | 302 |
| 309 bool get isClass() => false; | 303 bool get isClass() => false; |
error: old chunk mismatch |
None
| OLD | NEW |