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

Unified Diff: lib/compiler/implementation/elements/elements.dart

Issue 10689036: First step towards having patch files for generic libraries. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Address review comments. Created 8 years, 6 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 | « lib/compiler/implementation/compiler.dart ('k') | lib/compiler/implementation/lib/web.dart » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: lib/compiler/implementation/elements/elements.dart
diff --git a/lib/compiler/implementation/elements/elements.dart b/lib/compiler/implementation/elements/elements.dart
index 0a47eb1e2ec0077dfb98be59d555fcc51cc8570f..5dd42b1aa05f61550dc0b3ec53bfe64714ad9a13 100644
--- a/lib/compiler/implementation/elements/elements.dart
+++ b/lib/compiler/implementation/elements/elements.dart
@@ -204,7 +204,7 @@ class Element implements Hashable {
return null;
}
- toString() {
+ String toString() {
if (!isTopLevel()) {
String holderName = enclosingElement.name.slowToString();
return '$kind($holderName#${name.slowToString()})';
@@ -304,11 +304,14 @@ class LibraryElement extends CompilationUnitElement {
ScriptTag libraryTag;
Map<SourceString, Element> elements;
bool canUseNative = false;
+ LibraryElement patch = null;
LibraryElement(Script script)
: elements = new Map<SourceString, Element>(),
super.library(script);
+ bool get isPatched() => patch !== null;
+
void addCompilationUnit(CompilationUnitElement element) {
compilationUnits = compilationUnits.prepend(element);
}
@@ -581,6 +584,14 @@ class FunctionElement extends Element {
FunctionSignature functionSignature;
/**
+ * A function declaration that should be parsed instead of the current one.
+ * The patch should be parsed as if it was in the current scope. Its
+ * signature must match this function's signature.
+ */
+ // TODO(lrn): Consider using [defaultImplementation] to store the patch.
+ FunctionElement patch = null;
+
+ /**
* If this is an interface constructor, [defaultImplementation] will
* changed by the resolver to point to the default
* implementation. Otherwise, [:defaultImplementation === this:].
@@ -591,21 +602,21 @@ class FunctionElement extends Element {
ElementKind kind,
Modifiers modifiers,
Element enclosing)
- : this.tooMuchOverloading(name, null, kind, modifiers, enclosing, null);
+ : this.tooMuchOverloading(name, null, kind, modifiers, enclosing, null);
FunctionElement.node(SourceString name,
FunctionExpression node,
ElementKind kind,
Modifiers modifiers,
Element enclosing)
- : this.tooMuchOverloading(name, node, kind, modifiers, enclosing, null);
+ : this.tooMuchOverloading(name, node, kind, modifiers, enclosing, null);
FunctionElement.from(SourceString name,
FunctionElement other,
Element enclosing)
- : this.tooMuchOverloading(name, other.cachedNode, other.kind,
- other.modifiers, enclosing,
- other.functionSignature);
+ : this.tooMuchOverloading(name, other.cachedNode, other.kind,
+ other.modifiers, enclosing,
+ other.functionSignature);
FunctionElement.tooMuchOverloading(SourceString name,
FunctionExpression this.cachedNode,
@@ -613,11 +624,31 @@ class FunctionElement extends Element {
Modifiers this.modifiers,
Element enclosing,
FunctionSignature this.functionSignature)
- : super(name, kind, enclosing)
- {
+ : super(name, kind, enclosing) {
defaultImplementation = this;
}
+ CompilationUnitElement getCompilationUnit() {
+ if (patch !== null) return patch.getCompilationUnit();
+ return super.getCompilationUnit();
+ }
+
+ bool get isPatched() => patch !== null;
+
+ /**
+ * Applies a patch function to this function. The patch function's body
+ * is used as replacement when parsing this function's body.
+ * This method must not be called after the function has been parsed,
+ * and it must be called at most once.
+ */
+ void setPatch(FunctionElement patchElement) {
+ // Sanity checks. The caller must check these things before calling.
+ assert(patch !== null);
+ assert(cachedNode !== null);
+ this.patch = patchElement;
+ cachedNode = patchElement.cachedNode;
+ }
+
bool isInstanceMember() {
return isMember()
&& kind != ElementKind.GENERATIVE_CONSTRUCTOR
@@ -651,7 +682,13 @@ class FunctionElement extends Element {
return type;
}
- Node parseNode(DiagnosticListener listener) => cachedNode;
+ Node parseNode(DiagnosticListener listener) {
+ if (cachedNode !== null) return cachedNode;
+ if (patch !== null) {
+ cachedNode = patch.parseNode(listener);
+ }
+ return cachedNode;
+ }
Token position() => cachedNode.getBeginToken();
@@ -721,6 +758,7 @@ class ClassElement extends ContainerElement {
Link<Element> backendMembers = const EmptyLink<Element>();
Link<Type> allSupertypes;
+ ClassElement patch = null;
ClassElement(SourceString name, CompilationUnitElement enclosing, this.id)
: localMembers = new Map<SourceString, Element>(),
« no previous file with comments | « lib/compiler/implementation/compiler.dart ('k') | lib/compiler/implementation/lib/web.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698