| 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.kernel_class_builder; | 5 library fasta.kernel_class_builder; |
| 6 | 6 |
| 7 import 'package:front_end/src/fasta/kernel/kernel_shadow_ast.dart' | 7 import 'package:front_end/src/fasta/kernel/kernel_shadow_ast.dart' |
| 8 show KernelMember; | 8 show KernelMember; |
| 9 | 9 |
| 10 import 'package:kernel/ast.dart' | 10 import 'package:kernel/ast.dart' |
| (...skipping 11 matching lines...) Expand all Loading... |
| 22 Procedure, | 22 Procedure, |
| 23 ProcedureKind, | 23 ProcedureKind, |
| 24 StaticGet, | 24 StaticGet, |
| 25 Supertype, | 25 Supertype, |
| 26 VariableDeclaration; | 26 VariableDeclaration; |
| 27 | 27 |
| 28 import 'package:kernel/class_hierarchy.dart' show ClassHierarchy; | 28 import 'package:kernel/class_hierarchy.dart' show ClassHierarchy; |
| 29 | 29 |
| 30 import '../deprecated_problems.dart' show deprecated_internalProblem; | 30 import '../deprecated_problems.dart' show deprecated_internalProblem; |
| 31 | 31 |
| 32 import '../fasta_codes.dart' show codeRedirectionTargetNotFound; |
| 33 |
| 32 import '../dill/dill_member_builder.dart' show DillMemberBuilder; | 34 import '../dill/dill_member_builder.dart' show DillMemberBuilder; |
| 33 | 35 |
| 34 import 'kernel_builder.dart' | 36 import 'kernel_builder.dart' |
| 35 show | 37 show |
| 36 Builder, | 38 Builder, |
| 37 ClassBuilder, | 39 ClassBuilder, |
| 38 ConstructorReferenceBuilder, | 40 ConstructorReferenceBuilder, |
| 39 KernelLibraryBuilder, | 41 KernelLibraryBuilder, |
| 40 KernelProcedureBuilder, | 42 KernelProcedureBuilder, |
| 41 KernelTypeBuilder, | 43 KernelTypeBuilder, |
| (...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 124 if (redirectionTarget != null) { | 126 if (redirectionTarget != null) { |
| 125 assert(builder.actualBody == null); | 127 assert(builder.actualBody == null); |
| 126 Builder targetBuilder = redirectionTarget.target; | 128 Builder targetBuilder = redirectionTarget.target; |
| 127 addRedirectingConstructor(builder, library); | 129 addRedirectingConstructor(builder, library); |
| 128 if (targetBuilder is ProcedureBuilder) { | 130 if (targetBuilder is ProcedureBuilder) { |
| 129 Member target = targetBuilder.target; | 131 Member target = targetBuilder.target; |
| 130 builder.body = new RedirectingFactoryBody(target); | 132 builder.body = new RedirectingFactoryBody(target); |
| 131 } else if (targetBuilder is DillMemberBuilder) { | 133 } else if (targetBuilder is DillMemberBuilder) { |
| 132 builder.body = new RedirectingFactoryBody(targetBuilder.member); | 134 builder.body = new RedirectingFactoryBody(targetBuilder.member); |
| 133 } else { | 135 } else { |
| 134 String message = "Redirection constructor target not found: " | 136 var message = codeRedirectionTargetNotFound |
| 135 "${redirectionTarget.fullNameForErrors}"; | 137 .bind(redirectionTarget.fullNameForErrors); |
| 136 if (builder.isConst) { | 138 if (builder.isConst) { |
| 137 deprecated_addCompileTimeError(builder.charOffset, message); | 139 addCompileTimeError(message, builder.charOffset); |
| 138 } else { | 140 } else { |
| 139 deprecated_addWarning(builder.charOffset, message); | 141 addWarning(message, builder.charOffset); |
| 140 } | 142 } |
| 141 // CoreTypes aren't computed yet, and this is the outline | 143 // CoreTypes aren't computed yet, and this is the outline |
| 142 // phase. So we can't and shouldn't create a method body. | 144 // phase. So we can't and shouldn't create a method body. |
| 143 builder.body = new RedirectingFactoryBody.unresolved( | 145 builder.body = new RedirectingFactoryBody.unresolved( |
| 144 redirectionTarget.fullNameForErrors); | 146 redirectionTarget.fullNameForErrors); |
| 145 } | 147 } |
| 146 } | 148 } |
| 147 } | 149 } |
| 148 } | 150 } |
| 149 } | 151 } |
| (...skipping 143 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 293 } | 295 } |
| 294 } | 296 } |
| 295 } | 297 } |
| 296 | 298 |
| 297 String get fullNameForErrors { | 299 String get fullNameForErrors { |
| 298 return isMixinApplication | 300 return isMixinApplication |
| 299 ? "${supertype.fullNameForErrors} with ${mixedInType.fullNameForErrors}" | 301 ? "${supertype.fullNameForErrors} with ${mixedInType.fullNameForErrors}" |
| 300 : name; | 302 : name; |
| 301 } | 303 } |
| 302 } | 304 } |
| OLD | NEW |