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

Side by Side Diff: sdk/lib/_internal/compiler/implementation/deferred_load.dart

Issue 26291005: dart2js: The name of a library without a library declaration is the empty string. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Created 7 years, 2 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2013, the Dart project authors. Please see the AUTHORS file 1 // Copyright (c) 2013, 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 deferred_load; 5 library deferred_load;
6 6
7 import 'dart:collection' 7 import 'dart:collection'
8 show LinkedHashMap, 8 show LinkedHashMap,
9 LinkedHashSet; 9 LinkedHashSet;
10 10
(...skipping 190 matching lines...) Expand 10 before | Expand all | Expand 10 after
201 for (MetadataAnnotation metadata in tag.metadata) { 201 for (MetadataAnnotation metadata in tag.metadata) {
202 metadata.ensureResolved(compiler); 202 metadata.ensureResolved(compiler);
203 Element element = metadata.value.computeType(compiler).element; 203 Element element = metadata.value.computeType(compiler).element;
204 if (element == deferredLibraryClass) { 204 if (element == deferredLibraryClass) {
205 ConstructedConstant value = metadata.value; 205 ConstructedConstant value = metadata.value;
206 StringConstant nameField = value.fields[0]; 206 StringConstant nameField = value.fields[0];
207 SourceString expectedName = nameField.toDartString().source; 207 SourceString expectedName = nameField.toDartString().source;
208 LibraryElement deferredLibrary = library.getLibraryFromTag(tag); 208 LibraryElement deferredLibrary = library.getLibraryFromTag(tag);
209 link = link.prepend(deferredLibrary); 209 link = link.prepend(deferredLibrary);
210 SourceString actualName = 210 SourceString actualName =
211 new SourceString(deferredLibrary.getLibraryOrScriptName()); 211 new SourceString(deferredLibrary.getLibraryName());
212 if (expectedName != actualName) { 212 if (expectedName != actualName) {
213 compiler.reportError( 213 compiler.reportError(
214 metadata, 214 metadata,
215 MessageKind.DEFERRED_LIBRARY_NAME_MISMATCH, 215 MessageKind.DEFERRED_LIBRARY_NAME_MISMATCH,
216 { 'expectedName': expectedName.slowToString(), 216 { 'expectedName': expectedName.slowToString(),
217 'actualName': actualName.slowToString()}); 217 'actualName': actualName.slowToString()});
218 } 218 }
219 } 219 }
220 } 220 }
221 } 221 }
(...skipping 20 matching lines...) Expand all
242 compiler.enqueuer.resolution.getCachedElements(element); 242 compiler.enqueuer.resolution.getCachedElements(element);
243 if (elements == null) return new LinkedHashSet<Element>(); 243 if (elements == null) return new LinkedHashSet<Element>();
244 Node node = element.parseNode(compiler); 244 Node node = element.parseNode(compiler);
245 if (node == null) return new LinkedHashSet<Element>(); 245 if (node == null) return new LinkedHashSet<Element>();
246 var collector = new DependencyCollector(elements, compiler); 246 var collector = new DependencyCollector(elements, compiler);
247 node.accept(collector); 247 node.accept(collector);
248 collector.dependencies.addAll(elements.otherDependencies); 248 collector.dependencies.addAll(elements.otherDependencies);
249 return collector.dependencies; 249 return collector.dependencies;
250 } 250 }
251 } 251 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698