Skip to content

Commit

Permalink
Rename Reference.node2 to just 'node'.
Browse files Browse the repository at this point in the history 
[email protected]

Change-Id: Iddb1f3154ac7b711a3b7302f85e321cd896f61e0
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/110544
Reviewed-by: Brian Wilkerson <[email protected]>
  • Loading branch information
@scheglov
scheglov committed Jul 25, 2019
1 parent 95dcd5c commit de71dd4
Show file tree
Hide file tree
Showing 5 changed files with 40 additions and 44 deletions.
2 changes: 1 addition & 1 deletion pkg/analyzer/lib/src/dart/element/element.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9180,7 +9180,7 @@ class ParameterElementImpl extends VariableElementImpl
NormalFormalParameter parameterNode = node.parameter;
var name = parameterNode.identifier?.name ?? '';
var reference = containerRef.getChild(name);
reference.node2 = node;
reference.node = node;
if (parameterNode is FieldFormalParameter) {
return DefaultFieldFormalParameterElementImpl.forLinkedNode(
enclosing,
Expand Down
18 changes: 9 additions & 9 deletions pkg/analyzer/lib/src/summary2/builder/source_library_builder.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -105,25 +105,25 @@ class SourceLibraryBuilder {
if (node is ast.ClassDeclaration) {
var name = node.name.name;
var reference = classRef.getChild(name);
reference.node2 = node;
reference.node = node;
localScope.declare(name, reference);
} else if (node is ast.ClassTypeAlias) {
var name = node.name.name;
var reference = classRef.getChild(name);
reference.node2 = node;
reference.node = node;
localScope.declare(name, reference);
} else if (node is ast.EnumDeclaration) {
var name = node.name.name;
var reference = enumRef.getChild(name);
reference.node2 = node;
reference.node = node;
localScope.declare(name, reference);
} else if (node is ast.ExtensionDeclaration) {
var name = node.name?.name;
var refName = name ?? 'extension-${nextUnnamedExtensionId++}';
LazyExtensionDeclaration.get(node).setRefName(refName);

var reference = extensionRef.getChild(refName);
reference.node2 = node;
reference.node = node;

if (name != null) {
localScope.declare(name, reference);
Expand All @@ -141,7 +141,7 @@ class SourceLibraryBuilder {
}

var reference = containerRef.getChild(name);
reference.node2 = node;
reference.node = node;

if (node.isSetter) {
localScope.declare('$name=', reference);
Expand All @@ -151,26 +151,26 @@ class SourceLibraryBuilder {
} else if (node is ast.FunctionTypeAlias) {
var name = node.name.name;
var reference = typeAliasRef.getChild(name);
reference.node2 = node;
reference.node = node;

localScope.declare(name, reference);
} else if (node is ast.GenericTypeAlias) {
var name = node.name.name;
var reference = typeAliasRef.getChild(name);
reference.node2 = node;
reference.node = node;

localScope.declare(name, reference);
} else if (node is ast.MixinDeclaration) {
var name = node.name.name;
var reference = mixinRef.getChild(name);
reference.node2 = node;
reference.node = node;
localScope.declare(name, reference);
} else if (node is ast.TopLevelVariableDeclaration) {
for (var variable in node.variables.variables) {
var name = variable.name.name;

var reference = variableRef.getChild(name);
reference.node2 = node;
reference.node = node;

var getter = getterRef.getChild(name);
localScope.declare(name, getter);
Expand Down
48 changes: 24 additions & 24 deletions pkg/analyzer/lib/src/summary2/linked_element_factory.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -254,11 +254,11 @@ class _ElementRequest {

ClassElementImpl _class(
CompilationUnitElementImpl unit, Reference reference) {
if (reference.node2 == null) {
if (reference.node == null) {
_indexUnitElementDeclarations(unit);
assert(reference.node2 != null, '$reference');
assert(reference.node != null, '$reference');
}
ClassElementImpl.forLinkedNode(unit, reference, reference.node2);
ClassElementImpl.forLinkedNode(unit, reference, reference.node);
return reference.element;
}

Expand Down Expand Up @@ -332,21 +332,21 @@ class _ElementRequest {
}

EnumElementImpl _enum(CompilationUnitElementImpl unit, Reference reference) {
if (reference.node2 == null) {
if (reference.node == null) {
_indexUnitElementDeclarations(unit);
assert(reference.node2 != null, '$reference');
assert(reference.node != null, '$reference');
}
EnumElementImpl.forLinkedNode(unit, reference, reference.node2);
EnumElementImpl.forLinkedNode(unit, reference, reference.node);
return reference.element;
}

ExtensionElementImpl _extension(
CompilationUnitElementImpl unit, Reference reference) {
if (reference.node2 == null) {
if (reference.node == null) {
_indexUnitElementDeclarations(unit);
assert(reference.node2 != null, '$reference');
assert(reference.node != null, '$reference');
}
ExtensionElementImpl.forLinkedNode(unit, reference, reference.node2);
ExtensionElementImpl.forLinkedNode(unit, reference, reference.node);
return reference.element;
}

Expand Down Expand Up @@ -379,11 +379,11 @@ class _ElementRequest {

MixinElementImpl _mixin(
CompilationUnitElementImpl unit, Reference reference) {
if (reference.node2 == null) {
if (reference.node == null) {
_indexUnitElementDeclarations(unit);
assert(reference.node2 != null, '$reference');
assert(reference.node != null, '$reference');
}
MixinElementImpl.forLinkedNode(unit, reference, reference.node2);
MixinElementImpl.forLinkedNode(unit, reference, reference.node);
return reference.element;
}

Expand All @@ -403,11 +403,11 @@ class _ElementRequest {

GenericTypeAliasElementImpl _typeAlias(
CompilationUnitElementImpl unit, Reference reference) {
if (reference.node2 == null) {
if (reference.node == null) {
_indexUnitElementDeclarations(unit);
assert(reference.node2 != null, '$reference');
assert(reference.node != null, '$reference');
}
GenericTypeAliasElementImpl.forLinkedNode(unit, reference, reference.node2);
GenericTypeAliasElementImpl.forLinkedNode(unit, reference, reference.node);
return reference.element;
}

Expand All @@ -429,32 +429,32 @@ class _ElementRequest {
for (var declaration in unitNode.declarations) {
if (declaration is ClassDeclaration) {
var name = declaration.name.name;
classRef.getChild(name).node2 = declaration;
classRef.getChild(name).node = declaration;
} else if (declaration is ClassTypeAlias) {
var name = declaration.name.name;
classRef.getChild(name).node2 = declaration;
classRef.getChild(name).node = declaration;
} else if (declaration is ExtensionDeclaration) {
var refName = LazyExtensionDeclaration.get(declaration).refName;
extensionRef.getChild(refName).node2 = declaration;
extensionRef.getChild(refName).node = declaration;
} else if (declaration is EnumDeclaration) {
var name = declaration.name.name;
enumRef.getChild(name).node2 = declaration;
enumRef.getChild(name).node = declaration;
} else if (declaration is FunctionDeclaration) {
var name = declaration.name.name;
functionRef.getChild(name).node2 = declaration;
functionRef.getChild(name).node = declaration;
} else if (declaration is FunctionTypeAlias) {
var name = declaration.name.name;
typeAliasRef.getChild(name).node2 = declaration;
typeAliasRef.getChild(name).node = declaration;
} else if (declaration is GenericTypeAlias) {
var name = declaration.name.name;
typeAliasRef.getChild(name).node2 = declaration;
typeAliasRef.getChild(name).node = declaration;
} else if (declaration is MixinDeclaration) {
var name = declaration.name.name;
mixinRef.getChild(name).node2 = declaration;
mixinRef.getChild(name).node = declaration;
} else if (declaration is TopLevelVariableDeclaration) {
for (var variable in declaration.variables.variables) {
var name = variable.name.name;
variableRef.getChild(name).node2 = declaration;
variableRef.getChild(name).node = declaration;
}
}
}
Expand Down
12 changes: 4 additions & 8 deletions pkg/analyzer/lib/src/summary2/reference.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@

import 'package:analyzer/dart/ast/ast.dart';
import 'package:analyzer/dart/element/element.dart';
import 'package:analyzer/src/summary/idl.dart';
import 'package:analyzer/src/summary2/scope.dart';

/// Indirection between a name and the corresponding [Element].
Expand Down Expand Up @@ -33,11 +32,8 @@ class Reference {
/// The simple name of the reference in its [parent].
final String name;

/// The corresponding [LinkedNode], or `null` if a named container.
LinkedNode node;

/// The corresponding [AstNode], or `null` if a named container.
AstNode node2;
AstNode node;

/// The corresponding [Element], or `null` if a named container.
Element element;
Expand Down Expand Up @@ -89,11 +85,11 @@ class Reference {
/// The element might be not `null`, but the node is different in case of
/// duplicate declarations.
bool hasElementFor(AstNode node) {
if (element != null && node2 == node) {
if (element != null && this.node == node) {
return true;
} else {
if (node2 == null) {
node2 = node;
if (node == null) {
this.node = node;
}
return false;
}
Expand Down
4 changes: 2 additions & 2 deletions pkg/analyzer/lib/src/summary2/reference_resolver.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -279,7 +279,7 @@ class ReferenceResolver extends ThrowingAstVisitor<void> {

var name = node.identifier.name;
reference = reference.getChild('@parameter').getChild(name);
reference.node2 = node;
reference.node = node;

var element = ParameterElementImpl.forLinkedNode(
outerReference.element,
Expand Down Expand Up @@ -511,7 +511,7 @@ class ReferenceResolver extends ThrowingAstVisitor<void> {
var outerReference = this.reference;
var containerRef = outerReference.getChild('@typeParameter');
var reference = containerRef.getChild(node.name.name);
reference.node2 = node;
reference.node = node;

var element = TypeParameterElementImpl.forLinkedNode(
outerReference.element,
Expand Down

0 comments on commit de71dd4

Please sign in to comment.