import eclipse 3.1 M4 compiler

[org.ibex.tool.git] / src / org / eclipse / jdt / internal / compiler / ast / JavadocMessageSend.java

diff --git a/src/org/eclipse/jdt/internal/compiler/ast/JavadocMessageSend.java b/src/org/eclipse/jdt/internal/compiler/ast/JavadocMessageSend.java
index ec69136..3d10d73 100644 (file)
--- a/src/org/eclipse/jdt/internal/compiler/ast/JavadocMessageSend.java
+++ b/src/org/eclipse/jdt/internal/compiler/ast/JavadocMessageSend.java
@@ -17,6 +17,7 @@ import org.eclipse.jdt.internal.compiler.lookup.*;
 public class JavadocMessageSend extends MessageSend {
 
        public int tagSourceStart, tagSourceEnd;
+       public int tagValue;
        public boolean superAccess = false;
 
        public JavadocMessageSend(char[] name, long pos) {
@@ -39,11 +40,11 @@ public class JavadocMessageSend extends MessageSend {
                // Base type promotion
                this.constant = NotAConstant;
                if (this.receiver == null) {
-                       this.receiverType = scope.enclosingSourceType();
+                       this.actualReceiverType = scope.enclosingSourceType();
                } else if (scope.kind == Scope.CLASS_SCOPE) {
-                       this.receiverType = this.receiver.resolveType((ClassScope) scope);
+                       this.actualReceiverType = this.receiver.resolveType((ClassScope) scope);
                } else {
-                       this.receiverType = this.receiver.resolveType((BlockScope) scope);
+                       this.actualReceiverType = this.receiver.resolveType((BlockScope) scope);
                }
 
                // will check for null after args are resolved
@@ -69,20 +70,19 @@ public class JavadocMessageSend extends MessageSend {
                }
 
                // check receiver type
-               if (this.receiverType == null) {
+               if (this.actualReceiverType == null) {
                        return null;
                }
-               this.qualifyingType = this.receiverType;
-               this.superAccess = scope.enclosingSourceType().isCompatibleWith(this.receiverType);
+               this.superAccess = scope.enclosingSourceType().isCompatibleWith(this.actualReceiverType);
 
                // base type cannot receive any message
-               if (this.receiverType.isBaseType()) {
-                       scope.problemReporter().javadocErrorNoMethodFor(this, this.receiverType, argumentTypes, scope.getDeclarationModifiers());
+               if (this.actualReceiverType.isBaseType()) {
+                       scope.problemReporter().javadocErrorNoMethodFor(this, this.actualReceiverType, argumentTypes, scope.getDeclarationModifiers());
                        return null;
                }
                this.binding = (this.receiver != null && this.receiver.isThis())
                        ? scope.getImplicitMethod(this.selector, argumentTypes, this)
-                       : scope.getMethod(this.receiverType, this.selector, argumentTypes, this);
+                       : scope.getMethod(this.actualReceiverType, this.selector, argumentTypes, this);
                if (!this.binding.isValidBinding()) {
                        // implicit lookup may discover issues due to static/constructor contexts. javadoc must be resilient
                        switch (this.binding.problemId()) {
@@ -97,10 +97,10 @@ public class JavadocMessageSend extends MessageSend {
                }
                if (!this.binding.isValidBinding()) {
                        if (this.binding.declaringClass == null) {
-                               if (this.receiverType instanceof ReferenceBinding) {
-                                       this.binding.declaringClass = (ReferenceBinding) this.receiverType;
+                               if (this.actualReceiverType instanceof ReferenceBinding) {
+                                       this.binding.declaringClass = (ReferenceBinding) this.actualReceiverType;
                                } else { 
-                                       scope.problemReporter().javadocErrorNoMethodFor(this, this.receiverType, argumentTypes, scope.getDeclarationModifiers());
+                                       scope.problemReporter().javadocErrorNoMethodFor(this, this.actualReceiverType, argumentTypes, scope.getDeclarationModifiers());
                                        return null;
                                }
                        }
@@ -108,7 +108,7 @@ public class JavadocMessageSend extends MessageSend {
                        // record the closest match, for clients who may still need hint about possible method match
                        if (this.binding instanceof ProblemMethodBinding){
                                MethodBinding closestMatch = ((ProblemMethodBinding)this.binding).closestMatch;
-                               if (closestMatch != null) this.codegenBinding = this.binding = closestMatch;
+                               if (closestMatch != null) this.binding = closestMatch;
                        }
                        return this.resolvedType = this.binding == null ? null : this.binding.returnType;
                }