| 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.prefix_builder; | 5 library fasta.prefix_builder; |
| 6 | 6 |
| 7 import 'builder.dart' show | 7 import 'builder.dart' show |
| 8 Builder, | 8 Builder, |
| 9 LibraryBuilder, | 9 LibraryBuilder, |
| 10 MemberBuilder; | 10 MemberBuilder; |
| 11 | 11 |
| 12 import 'package:kernel/ast.dart' show | 12 import 'package:kernel/ast.dart' show |
| 13 Member; | 13 Member; |
| 14 | 14 |
| 15 import '../dill/dill_member_builder.dart' show | 15 import '../dill/dill_member_builder.dart' show |
| 16 DillMemberBuilder; | 16 DillMemberBuilder; |
| 17 | 17 |
| 18 import '../errors.dart' show | 18 import '../errors.dart' show |
| 19 internalError; | 19 internalError; |
| 20 | 20 |
| 21 class PrefixBuilder extends Builder { | 21 class PrefixBuilder extends Builder { |
| 22 final String name; | 22 final String name; |
| 23 | 23 |
| 24 final Map<String, Builder> exports; | 24 final Map<String, Builder> exports; |
| 25 | 25 |
| 26 final LibraryBuilder parent; | 26 final LibraryBuilder parent; |
| 27 | 27 |
| 28 PrefixBuilder(this.name, this.exports, this.parent); | 28 PrefixBuilder(this.name, this.exports, LibraryBuilder parent, int charOffset) |
| 29 : parent = parent, super(parent, charOffset, parent.fileUri); |
| 29 | 30 |
| 30 Member findTopLevelMember(String name) { | 31 Member findTopLevelMember(String name) { |
| 31 // TODO(ahe): Move this to KernelPrefixBuilder. | 32 // TODO(ahe): Move this to KernelPrefixBuilder. |
| 32 Builder builder = exports[name]; | 33 Builder builder = exports[name]; |
| 33 if (builder == null) { | 34 if (builder == null) { |
| 34 // TODO(ahe): Report error? | 35 // TODO(ahe): Report error? |
| 35 print("${this.name} has no member named $name"); | 36 print("${this.name} has no member named $name"); |
| 36 } | 37 } |
| 37 if (builder is DillMemberBuilder) { | 38 if (builder is DillMemberBuilder) { |
| 38 return builder.member.isInstanceMember | 39 return builder.member.isInstanceMember |
| (...skipping 15 matching lines...) Expand all Loading... |
| 54 if (existing != null) { | 55 if (existing != null) { |
| 55 member = existing.combineAmbiguousImport(name, member, library); | 56 member = existing.combineAmbiguousImport(name, member, library); |
| 56 } | 57 } |
| 57 exports[name] = member; | 58 exports[name] = member; |
| 58 }); | 59 }); |
| 59 return this; | 60 return this; |
| 60 } | 61 } |
| 61 return super.combineAmbiguousImport(name, other, library); | 62 return super.combineAmbiguousImport(name, other, library); |
| 62 } | 63 } |
| 63 } | 64 } |
| OLD | NEW |