| 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.outline_builder; | 5 library fasta.outline_builder; |
| 6 | 6 |
| 7 import 'package:kernel/ast.dart' show | 7 import 'package:kernel/ast.dart' show |
| 8 AsyncMarker, | 8 AsyncMarker, |
| 9 ProcedureKind; | 9 ProcedureKind; |
| 10 | 10 |
| (...skipping 301 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 312 push(library.addMixinApplication(supertype, mixins, -1)); | 312 push(library.addMixinApplication(supertype, mixins, -1)); |
| 313 } | 313 } |
| 314 | 314 |
| 315 @override | 315 @override |
| 316 void beginNamedMixinApplication(Token begin, Token name) { | 316 void beginNamedMixinApplication(Token begin, Token name) { |
| 317 library.beginNestedDeclaration(name.value, hasMembers: false); | 317 library.beginNestedDeclaration(name.value, hasMembers: false); |
| 318 } | 318 } |
| 319 | 319 |
| 320 @override | 320 @override |
| 321 void endNamedMixinApplication( | 321 void endNamedMixinApplication( |
| 322 Token classKeyword, Token implementsKeyword, Token endToken) { | 322 Token classKeyword, Token equals, Token implementsKeyword, |
| 323 Token endToken) { |
| 323 debugEvent("endNamedMixinApplication"); | 324 debugEvent("endNamedMixinApplication"); |
| 324 List<TypeBuilder> interfaces = popIfNotNull(implementsKeyword); | 325 List<TypeBuilder> interfaces = popIfNotNull(implementsKeyword); |
| 325 TypeBuilder mixinApplication = pop(); | 326 TypeBuilder mixinApplication = pop(); |
| 326 List<TypeVariableBuilder> typeVariables = pop(); | 327 List<TypeVariableBuilder> typeVariables = pop(); |
| 327 String name = pop(); | 328 String name = pop(); |
| 328 if (typeVariables != null && mixinApplication is MixinApplicationBuilder) { | 329 if (typeVariables != null && mixinApplication is MixinApplicationBuilder) { |
| 329 mixinApplication.typeVariables = typeVariables; | 330 mixinApplication.typeVariables = typeVariables; |
| 330 mixinApplication.subclassName = name; | 331 mixinApplication.subclassName = name; |
| 331 } | 332 } |
| 332 int modifiers = Modifier.validate(pop()); | 333 int modifiers = Modifier.validate(pop()); |
| (...skipping 281 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 614 Link<Token> handleMemberName(Link<Token> identifiers) { | 615 Link<Token> handleMemberName(Link<Token> identifiers) { |
| 615 if (!isDartLibrary || identifiers.isEmpty) return identifiers; | 616 if (!isDartLibrary || identifiers.isEmpty) return identifiers; |
| 616 return removeNativeClause(identifiers); | 617 return removeNativeClause(identifiers); |
| 617 } | 618 } |
| 618 | 619 |
| 619 @override | 620 @override |
| 620 void debugEvent(String name) { | 621 void debugEvent(String name) { |
| 621 // printEvent(name); | 622 // printEvent(name); |
| 622 } | 623 } |
| 623 } | 624 } |
| OLD | NEW |