| 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.dill_class_builder; | 5 library fasta.dill_class_builder; |
| 6 | 6 |
| 7 import 'package:kernel/ast.dart' show | 7 import 'package:kernel/ast.dart' show |
| 8 Class, | 8 Class, |
| 9 Constructor, | 9 Constructor, |
| 10 Member, | 10 Member, |
| 11 Procedure, | 11 Procedure, |
| 12 ProcedureKind; | 12 ProcedureKind; |
| 13 | 13 |
| 14 import '../kernel/kernel_builder.dart' show | 14 import '../kernel/kernel_builder.dart' show |
| 15 Builder, | 15 Builder, |
| 16 KernelClassBuilder; | 16 KernelClassBuilder; |
| 17 | 17 |
| 18 import '../modifier.dart' show |
| 19 abstractMask; |
| 20 |
| 18 import 'dill_member_builder.dart' show | 21 import 'dill_member_builder.dart' show |
| 19 DillMemberBuilder; | 22 DillMemberBuilder; |
| 20 | 23 |
| 21 import 'dill_library_builder.dart' show | 24 import 'dill_library_builder.dart' show |
| 22 DillLibraryBuilder; | 25 DillLibraryBuilder; |
| 23 | 26 |
| 24 class DillClassBuilder extends KernelClassBuilder { | 27 class DillClassBuilder extends KernelClassBuilder { |
| 25 final Class cls; | 28 final Class cls; |
| 26 | 29 |
| 27 final Map<String, Builder> constructors = <String, Builder>{}; | 30 final Map<String, Builder> constructors = <String, Builder>{}; |
| 28 | 31 |
| 29 DillClassBuilder(Class cls, DillLibraryBuilder parent) | 32 DillClassBuilder(Class cls, DillLibraryBuilder parent) |
| 30 : cls = cls, | 33 : cls = cls, |
| 31 super(null, null, cls.name, null, null, null, <String, Builder>{}, | 34 super(null, computeModifiers(cls), cls.name, null, null, null, |
| 32 parent, cls.fileOffset); | 35 <String, Builder>{}, parent, cls.fileOffset); |
| 33 | 36 |
| 34 void addMember(Member member) { | 37 void addMember(Member member) { |
| 35 DillMemberBuilder builder = new DillMemberBuilder(member, this); | 38 DillMemberBuilder builder = new DillMemberBuilder(member, this); |
| 36 String name = member.name.name; | 39 String name = member.name.name; |
| 37 if (member is Constructor || | 40 if (member is Constructor || |
| 38 (member is Procedure && member.kind == ProcedureKind.Factory)) { | 41 (member is Procedure && member.kind == ProcedureKind.Factory)) { |
| 39 constructors[name] = builder; | 42 constructors[name] = builder; |
| 40 } else { | 43 } else { |
| 41 DillMemberBuilder existing = members[name]; | 44 DillMemberBuilder existing = members[name]; |
| 42 if (existing == null) { | 45 if (existing == null) { |
| 43 members[name] = builder; | 46 members[name] = builder; |
| 44 } else { | 47 } else { |
| 45 existing.next = builder; | 48 existing.next = builder; |
| 46 } | 49 } |
| 47 } | 50 } |
| 48 } | 51 } |
| 49 | 52 |
| 50 Builder findConstructorOrFactory(String name) => constructors[name]; | 53 Builder findConstructorOrFactory(String name) => constructors[name]; |
| 51 } | 54 } |
| 55 |
| 56 int computeModifiers(Class cls) { |
| 57 return cls.isAbstract ? abstractMask : 0; |
| 58 } |
| OLD | NEW |