| 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 '../errors.dart' show internalError; |
| 8 | 8 |
| 9 import 'builder.dart' | 9 import 'builder.dart' |
| 10 show | 10 show |
| (...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 86 if (builder?.next != null) { | 86 if (builder?.next != null) { |
| 87 Builder getterBuilder; | 87 Builder getterBuilder; |
| 88 Builder setterBuilder; | 88 Builder setterBuilder; |
| 89 Builder current = builder; | 89 Builder current = builder; |
| 90 while (current != null) { | 90 while (current != null) { |
| 91 if (current.isGetter && getterBuilder == null) { | 91 if (current.isGetter && getterBuilder == null) { |
| 92 getterBuilder = current; | 92 getterBuilder = current; |
| 93 } else if (current.isSetter && setterBuilder == null) { | 93 } else if (current.isSetter && setterBuilder == null) { |
| 94 setterBuilder = current; | 94 setterBuilder = current; |
| 95 } else { | 95 } else { |
| 96 return new AmbiguousBuilder(builder, charOffset, fileUri); | 96 return new AmbiguousBuilder(name, builder, charOffset, fileUri); |
| 97 } | 97 } |
| 98 current = current.next; | 98 current = current.next; |
| 99 } | 99 } |
| 100 builder = isSetter ? setterBuilder : getterBuilder; | 100 builder = isSetter ? setterBuilder : getterBuilder; |
| 101 } | 101 } |
| 102 if (builder == null) { | 102 if (builder == null) { |
| 103 return null; | 103 return null; |
| 104 } else if (isSetter && builder.isGetter) { | 104 } else if (isSetter && builder.isGetter) { |
| 105 return null; | 105 return null; |
| 106 } else { | 106 } else { |
| (...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 166 argument = argument.subst(substitutionMap); | 166 argument = argument.subst(substitutionMap); |
| 167 } | 167 } |
| 168 directSubstitutionMap[variables[i]] = argument; | 168 directSubstitutionMap[variables[i]] = argument; |
| 169 } | 169 } |
| 170 substitutionMap = directSubstitutionMap; | 170 substitutionMap = directSubstitutionMap; |
| 171 } | 171 } |
| 172 } | 172 } |
| 173 return substitutionMap; | 173 return substitutionMap; |
| 174 } | 174 } |
| 175 } | 175 } |
| OLD | NEW |