| OLD | NEW |
| 1 // Copyright (c) 2016, the Dart project authors. Please see the AUTHORS file | 1 // Copyright (c) 2016, 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 library fasta.class_builder; | 5 library fasta.class_builder; |
| 6 | 6 |
| 7 import '../errors.dart' show internalError; | 7 import '../deprecated_problems.dart' show deprecated_internalProblem; |
| 8 | 8 |
| 9 import 'builder.dart' | 9 import 'builder.dart' |
| 10 show | 10 show |
| 11 Builder, | 11 Builder, |
| 12 ConstructorReferenceBuilder, | 12 ConstructorReferenceBuilder, |
| 13 LibraryBuilder, | 13 LibraryBuilder, |
| 14 MemberBuilder, | 14 MemberBuilder, |
| 15 MetadataBuilder, | 15 MetadataBuilder, |
| 16 MixinApplicationBuilder, | 16 MixinApplicationBuilder, |
| 17 NamedTypeBuilder, | 17 NamedTypeBuilder, |
| (...skipping 139 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 157 if (supertype is NamedTypeBuilder) { | 157 if (supertype is NamedTypeBuilder) { |
| 158 handleNamedTypeBuilder(supertype); | 158 handleNamedTypeBuilder(supertype); |
| 159 } else if (supertype is MixinApplicationBuilder) { | 159 } else if (supertype is MixinApplicationBuilder) { |
| 160 MixinApplicationBuilder t = supertype; | 160 MixinApplicationBuilder t = supertype; |
| 161 NamedTypeBuilder s = findSuperclass(t); | 161 NamedTypeBuilder s = findSuperclass(t); |
| 162 if (s != null) { | 162 if (s != null) { |
| 163 handleNamedTypeBuilder(s); | 163 handleNamedTypeBuilder(s); |
| 164 } | 164 } |
| 165 supertype = t.supertype; | 165 supertype = t.supertype; |
| 166 } else { | 166 } else { |
| 167 internalError("Superclass not found '${superclass.fullNameForErrors}'.", | 167 deprecated_internalProblem( |
| 168 fileUri, charOffset); | 168 "Superclass not found '${superclass.fullNameForErrors}'.", |
| 169 fileUri, |
| 170 charOffset); |
| 169 } | 171 } |
| 170 if (variables != null) { | 172 if (variables != null) { |
| 171 Map<TypeVariableBuilder, TypeBuilder> directSubstitutionMap = | 173 Map<TypeVariableBuilder, TypeBuilder> directSubstitutionMap = |
| 172 <TypeVariableBuilder, TypeBuilder>{}; | 174 <TypeVariableBuilder, TypeBuilder>{}; |
| 173 for (int i = 0; i < variables.length; i++) { | 175 for (int i = 0; i < variables.length; i++) { |
| 174 TypeBuilder argument = | 176 TypeBuilder argument = |
| 175 i < arguments.length ? arguments[i] : dynamicType; | 177 i < arguments.length ? arguments[i] : dynamicType; |
| 176 if (substitutionMap != null) { | 178 if (substitutionMap != null) { |
| 177 argument = argument.subst(substitutionMap); | 179 argument = argument.subst(substitutionMap); |
| 178 } | 180 } |
| 179 directSubstitutionMap[variables[i]] = argument; | 181 directSubstitutionMap[variables[i]] = argument; |
| 180 } | 182 } |
| 181 substitutionMap = directSubstitutionMap; | 183 substitutionMap = directSubstitutionMap; |
| 182 } | 184 } |
| 183 } | 185 } |
| 184 return substitutionMap; | 186 return substitutionMap; |
| 185 } | 187 } |
| 186 | 188 |
| 187 void forEach(void f(String name, MemberBuilder builder)) { | 189 void forEach(void f(String name, MemberBuilder builder)) { |
| 188 scope.forEach(f); | 190 scope.forEach(f); |
| 189 } | 191 } |
| 190 | 192 |
| 191 /// Don't use for scope lookup. Only use when an element is known to exist | 193 /// Don't use for scope lookup. Only use when an element is known to exist |
| 192 /// (and isn't a setter). | 194 /// (and isn't a setter). |
| 193 MemberBuilder operator [](String name) { | 195 MemberBuilder operator [](String name) { |
| 194 // TODO(ahe): Rename this to getLocalMember. | 196 // TODO(ahe): Rename this to getLocalMember. |
| 195 return scope.local[name] ?? internalError("Not found: '$name'."); | 197 return scope.local[name] ?? |
| 198 deprecated_internalProblem("Not found: '$name'."); |
| 196 } | 199 } |
| 197 | 200 |
| 198 void addCompileTimeError(int charOffset, String message) { | 201 void deprecated_addCompileTimeError(int charOffset, String message) { |
| 199 library.addCompileTimeError(charOffset, message, fileUri: fileUri); | 202 library.deprecated_addCompileTimeError(charOffset, message, |
| 203 fileUri: fileUri); |
| 200 } | 204 } |
| 201 | 205 |
| 202 void addWarning(int charOffset, String message) { | 206 void deprecated_addWarning(int charOffset, String message) { |
| 203 library.addWarning(charOffset, message, fileUri: fileUri); | 207 library.deprecated_addWarning(charOffset, message, fileUri: fileUri); |
| 204 } | 208 } |
| 205 | 209 |
| 206 void addNit(int charOffset, String message) { | 210 void deprecated_addNit(int charOffset, String message) { |
| 207 library.addNit(charOffset, message, fileUri: fileUri); | 211 library.deprecated_addNit(charOffset, message, fileUri: fileUri); |
| 208 } | 212 } |
| 209 } | 213 } |
| OLD | NEW |