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

Unified Diff: sdk/lib/_internal/compiler/implementation/resolution/members.dart

Issue 25046002: Emit a compile-time error when a named optional parameter has a library private name. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Created 7 years, 3 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | sdk/lib/_internal/compiler/implementation/warnings.dart » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sdk/lib/_internal/compiler/implementation/resolution/members.dart
diff --git a/sdk/lib/_internal/compiler/implementation/resolution/members.dart b/sdk/lib/_internal/compiler/implementation/resolution/members.dart
index 19e4e7308fbf5ee4377feb1781e69ac8a9c7ea88..3c968cddba9192a4fb00d99dca644131bc23a194 100644
--- a/sdk/lib/_internal/compiler/implementation/resolution/members.dart
+++ b/sdk/lib/_internal/compiler/implementation/resolution/members.dart
@@ -4002,6 +4002,7 @@ class SignatureResolver extends CommonResolverVisitor<Element> {
final bool defaultValuesAllowed;
Link<Element> optionalParameters = const Link<Element>();
int optionalParameterCount = 0;
+ bool isOptionalParameter = false;
bool optionalParametersAreNamed = false;
VariableDefinitions currentDefinitions;
@@ -4017,6 +4018,7 @@ class SignatureResolver extends CommonResolverVisitor<Element> {
internalError(node, "expected optional parameters");
}
optionalParametersAreNamed = (identical(value, '{'));
+ isOptionalParameter = true;
LinkBuilder<Element> elements = analyzeNodes(node.nodes);
optionalParameterCount = elements.length;
optionalParameters = elements.toLink();
@@ -4053,7 +4055,17 @@ class SignatureResolver extends CommonResolverVisitor<Element> {
return element;
}
+ void validateName(Identifier node) {
+ SourceString name = node.source;
+ if (isOptionalParameter &&
+ optionalParametersAreNamed &&
+ node.source.isPrivate()) {
+ compiler.reportError(node, MessageKind.PRIVATE_NAMED_PARAMETER);
+ }
+ }
+
Element visitIdentifier(Identifier node) {
+ validateName(node);
Element variables = new VariableListElementX.node(currentDefinitions,
ElementKind.VARIABLE_LIST, enclosingElement);
// Ensure a parameter is not typed 'void'.
@@ -4066,12 +4078,14 @@ class SignatureResolver extends CommonResolverVisitor<Element> {
var identifier = node.selector.asIdentifier();
if (identifier != null) {
// Normal parameter: [:Type name:].
+ validateName(identifier);
return identifier.source;
} else {
// Function type parameter: [:void name(DartType arg):].
var functionExpression = node.selector.asFunctionExpression();
if (functionExpression != null &&
functionExpression.name.asIdentifier() != null) {
+ validateName(functionExpression.name);
return functionExpression.name.asIdentifier().source;
} else {
cancel(node,
@@ -4115,9 +4129,11 @@ class SignatureResolver extends CommonResolverVisitor<Element> {
node.selector.asFunctionExpression() != null) {
Element variables = new VariableListElementX.node(currentDefinitions,
ElementKind.VARIABLE_LIST, enclosingElement);
- SourceString source = node.selector.asIdentifier() != null ?
- node.selector.asIdentifier().source :
- node.selector.asFunctionExpression().name.asIdentifier().source;
+ Identifier identifier = node.selector.asIdentifier() != null ?
+ node.selector.asIdentifier() :
+ node.selector.asFunctionExpression().name.asIdentifier();
+ validateName(identifier);
+ SourceString source = identifier.source;
element = new VariableElementX(source, variables,
ElementKind.PARAMETER, node);
}
« no previous file with comments | « no previous file | sdk/lib/_internal/compiler/implementation/warnings.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698