| Index: compiler/java/com/google/dart/compiler/backend/js/analysis/JavascriptElement.java
|
| diff --git a/compiler/java/com/google/dart/compiler/backend/js/analysis/JavascriptElement.java b/compiler/java/com/google/dart/compiler/backend/js/analysis/JavascriptElement.java
|
| index a9db92d7b7f788b1b1d0c37b0efd5f37a0d6ec39..0604773cb4e0cac88807057130ac2c3436170c53 100644
|
| --- a/compiler/java/com/google/dart/compiler/backend/js/analysis/JavascriptElement.java
|
| +++ b/compiler/java/com/google/dart/compiler/backend/js/analysis/JavascriptElement.java
|
| @@ -16,8 +16,8 @@ import java.util.List;
|
| */
|
| class JavascriptElement {
|
| private final JavascriptElement enclosingElement;
|
| - private JavascriptElement inherits;
|
| - private AstNode inheritsNode;
|
| + private JavascriptElement inheritsElement;
|
| + private JavascriptElement inheritsInvocation;
|
| private boolean instantiated;
|
| private final boolean isVirtual;
|
| private List<JavascriptElement> members = null;
|
| @@ -51,12 +51,12 @@ class JavascriptElement {
|
| return enclosingElement;
|
| }
|
|
|
| - public JavascriptElement getInherits() {
|
| - return inherits;
|
| + public JavascriptElement getInheritsElement() {
|
| + return inheritsElement;
|
| }
|
|
|
| - public AstNode getInheritsNode() {
|
| - return inheritsNode;
|
| + public JavascriptElement getInheritsInvocation() {
|
| + return inheritsInvocation;
|
| }
|
|
|
| /**
|
| @@ -113,18 +113,18 @@ class JavascriptElement {
|
| }
|
|
|
| public void setInherits(JavascriptElement inherits) {
|
| - this.inherits = inherits;
|
| + this.inheritsElement = inherits;
|
| }
|
|
|
| public void setInheritsNode(AstNode inheritsNode) {
|
| - this.inheritsNode = inheritsNode;
|
| + this.inheritsInvocation = new JavascriptElement(null,false, "", "", inheritsNode);
|
| }
|
|
|
| public void setInstantiated(boolean instantiated) {
|
| this.instantiated = instantiated;
|
|
|
| - if (inherits != null) {
|
| - inherits.setInstantiated(instantiated);
|
| + if (inheritsElement != null) {
|
| + inheritsElement.setInstantiated(instantiated);
|
| }
|
| }
|
| }
|
|
|