languages/dart-sdk
languages/dart-sdk
1
0
Fork 0
mirror of https://github.com/dart-lang/sdk synced 2024-07-19 20:17:27 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Disallow null in spanFromSpannable.

Browse source 
Closes #27938

R=sigmund@google.com

Review URL: https://codereview.chromium.org/2537303004 .
This commit is contained in:
Johnni Winther 2016-12-01 10:53:56 +01:00
parent cffc20cdf5
commit 489199eff1
6 changed files with 19 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkg/compiler/lib/src/compiler.dart
View file

@ -1792,8 +1792,6 @@ class CompilerDiagnosticReporter extends DiagnosticReporter {
}
SourceSpan spanFromSpannable(Spannable node) {
// TODO(johnniwinther): Disallow `node == null` ?
if (node == null) return null;
if (node == CURRENT_ELEMENT_SPANNABLE) {
node = currentElement;
} else if (node == NO_LOCATION_SPANNABLE) {

23
pkg/compiler/lib/src/library_loader.dart
View file

@ -427,7 +427,8 @@ class _LibraryLoaderTask extends CompilerTask implements LibraryLoaderTask {
// TODO(johnniwinther): Ensure that currentHandler correctly encloses the
// loading of a library cluster.
currentHandler = new LibraryDependencyHandler(this);
return createLibrary(currentHandler, null, resolvedUri,
return createLibrary(
currentHandler, null, resolvedUri, NO_LOCATION_SPANNABLE,
skipFileWithPartOfTag: skipFileWithPartOfTag)
.then((LibraryElement library) {
if (library == null) {
@ -543,7 +544,7 @@ class _LibraryLoaderTask extends CompilerTask implements LibraryLoaderTask {
// Import dart:core if not already imported.
if (!importsDartCore && library.canonicalUri != Uris.dart_core) {
return createLibrary(handler, null, Uris.dart_core)
return createLibrary(handler, null, Uris.dart_core, library)
.then((LibraryElement coreLibrary) {
handler.registerDependency(
library,
@ -629,7 +630,7 @@ class _LibraryLoaderTask extends CompilerTask implements LibraryLoaderTask {
LibraryElement library, LibraryDependencyElementX libraryDependency) {
Uri base = library.canonicalUri;
Uri resolvedUri = base.resolveUri(libraryDependency.uri);
return createLibrary(handler, library, resolvedUri, node: libraryDependency)
return createLibrary(handler, library, resolvedUri, libraryDependency)
.then((LibraryElement loadedLibrary) {
if (loadedLibrary == null) return;
reporter.withCurrentElement(library, () {
@ -650,15 +651,15 @@ class _LibraryLoaderTask extends CompilerTask implements LibraryLoaderTask {
return listener.onLibraryScanned(library, handler).then((_) {
return Future.forEach(library.imports, (ImportElement import) {
Uri resolvedUri = library.canonicalUri.resolveUri(import.uri);
return createLibrary(handler, library, resolvedUri);
return createLibrary(handler, library, resolvedUri, library);
}).then((_) {
return Future.forEach(library.exports, (ExportElement export) {
Uri resolvedUri = library.canonicalUri.resolveUri(export.uri);
return createLibrary(handler, library, resolvedUri);
return createLibrary(handler, library, resolvedUri, library);
}).then((_) {
// TODO(johnniwinther): Shouldn't there be an [ImportElement] for the
// implicit import of dart:core?
return createLibrary(handler, library, Uris.dart_core);
return createLibrary(handler, library, Uris.dart_core, library);
}).then((_) => library);
});
});
@ -680,10 +681,10 @@ class _LibraryLoaderTask extends CompilerTask implements LibraryLoaderTask {
* If a new library is created, the [handler] is notified.
*/
Future<LibraryElement> createLibrary(LibraryDependencyHandler handler,
LibraryElement importingLibrary, Uri resolvedUri,
{Spannable node, bool skipFileWithPartOfTag: false}) {
LibraryElement importingLibrary, Uri resolvedUri, Spannable spannable,
{bool skipFileWithPartOfTag: false}) {
Uri readableUri =
uriTranslator.translate(importingLibrary, resolvedUri, node);
uriTranslator.translate(importingLibrary, resolvedUri, spannable);
LibraryElement library = libraryCanonicalUriMap[resolvedUri];
if (library != null) {
return new Future.value(library);
@ -693,7 +694,7 @@ class _LibraryLoaderTask extends CompilerTask implements LibraryLoaderTask {
return loadDeserializedLibrary(handler, library);
}
return reporter.withCurrentElement(importingLibrary, () {
return _readScript(node, readableUri, resolvedUri)
return _readScript(spannable, readableUri, resolvedUri)
.then((Script script) {
if (script == null) return null;
LibraryElement element =
@ -721,7 +722,7 @@ class _LibraryLoaderTask extends CompilerTask implements LibraryLoaderTask {
DiagnosticMessage info = reporter.withCurrentElement(
importingLibrary,
() => reporter.createMessage(
node, MessageKind.IMPORT_PART_OF_HERE));
spannable, MessageKind.IMPORT_PART_OF_HERE));
reporter.reportError(error, [info]);
}
}

4
pkg/compiler/lib/src/resolution/class_hierarchy.dart
View file

@ -482,12 +482,12 @@ class ClassResolverVisitor extends TypeDefinitionVisitor {
if (interfaceType != null) {
if (interfaceType.isMalformed) {
reporter.reportErrorMessage(
superclass,
link.head,
MessageKind.CANNOT_IMPLEMENT_MALFORMED,
{'className': element.name, 'malformedType': interfaceType});
} else if (interfaceType.isEnumType) {
reporter.reportErrorMessage(
superclass,
link.head,
MessageKind.CANNOT_IMPLEMENT_ENUM,
{'className': element.name, 'enumType': interfaceType});
} else if (!interfaceType.isInterfaceType) {

2
pkg/compiler/lib/src/resolution/constructors.dart
View file

@ -345,7 +345,7 @@ class InitializerResolver {
if (!field.isMalformed) {
registry.registerStaticUse(new StaticUse.fieldInit(field));
}
checkForDuplicateInitializers(field, element.initializer);
checkForDuplicateInitializers(field, parameterNode);
visitor.defineLocalVariable(parameterNode, initializingFormal);
visitor.addToScope(initializingFormal);
if (isConst) {

8
pkg/compiler/lib/src/resolved_uri_translator.dart
View file

@ -35,8 +35,7 @@ abstract class ResolvedUriTranslator {
/// responsible for reporting errors.
///
/// See [LibraryLoader] for terminology on URIs.
Uri translate(LibraryElement importingLibrary, Uri uri,
[Spannable spannable]);
Uri translate(LibraryElement importingLibrary, Uri uri, Spannable spannable);
}
/// A translator that forwards all methods to an internal
@ -59,7 +58,7 @@ class ForwardingResolvedUriTranslator implements ResolvedUriTranslator {
@override
Uri translate(LibraryElement importingLibrary, Uri resolvedUri,
[Spannable spannable]) =>
Spannable spannable) =>
resolvedUriTranslator.translate(importingLibrary, resolvedUri, spannable);
@override
@ -86,8 +85,7 @@ class _ResolvedUriTranslator implements ResolvedUriTranslator {
Map<String, Uri> get sdkLibraries => _sdkLibraries;
@override
Uri translate(LibraryElement importingLibrary, Uri uri,
[Spannable spannable]) {
Uri translate(LibraryElement importingLibrary, Uri uri, Spannable spannable) {
if (uri.scheme == 'dart') {
return translateDartUri(importingLibrary, uri, spannable);
}

2
tests/compiler/dart2js/mock_compiler.dart
View file

@ -290,7 +290,7 @@ class MockResolvedUriTranslator implements ResolvedUriTranslator {
static final _emptySet = new Set();
Uri translate(LibraryElement importingLibrary, Uri resolvedUri,
[Spannable spannable]) =>
Spannable spannable) =>
resolvedUri;
Set<Uri> get disallowedLibraryUris => _emptySet;
bool get mockableLibraryUsed => false;