Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1)

Side by Side Diff: pkg/front_end/lib/src/fasta/kernel/kernel_library_builder.dart

Issue 2890523002: merge fasta.Token into analyzer.Token (Closed)
Patch Set: Created 3 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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_library_builder; 5 library fasta.kernel_library_builder;
6 6
7 import 'package:front_end/src/fasta/scanner/token.dart' show Token; 7 import 'package:front_end/src/scanner/token.dart' show Token;
8 8
9 import 'package:kernel/ast.dart'; 9 import 'package:kernel/ast.dart';
10 10
11 import 'package:kernel/clone.dart' show CloneVisitor; 11 import 'package:kernel/clone.dart' show CloneVisitor;
12 12
13 import '../errors.dart' show internalError; 13 import '../errors.dart' show internalError;
14 14
15 import '../loader.dart' show Loader; 15 import '../loader.dart' show Loader;
16 16
17 import '../modifier.dart' 17 import '../modifier.dart'
(...skipping 829 matching lines...) Expand 10 before | Expand all | Expand 10 after
847 mixinApplicationClasses.putIfAbsent(name, () => builder); 847 mixinApplicationClasses.putIfAbsent(name, () => builder);
848 if (existing != builder) { 848 if (existing != builder) {
849 part.scope.local.remove(name); 849 part.scope.local.remove(name);
850 } 850 }
851 }); 851 });
852 super.includePart(part); 852 super.includePart(part);
853 nativeMethods.addAll(part.nativeMethods); 853 nativeMethods.addAll(part.nativeMethods);
854 boundlessTypeVariables.addAll(part.boundlessTypeVariables); 854 boundlessTypeVariables.addAll(part.boundlessTypeVariables);
855 } 855 }
856 } 856 }
OLDNEW
« no previous file with comments | « pkg/front_end/lib/src/fasta/kernel/kernel_field_builder.dart ('k') | pkg/front_end/lib/src/fasta/kernel/utils.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698