X-Git-Url: http://git.phpeclipse.com

diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/ThisReference.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/ThisReference.java
index 9ae61ea..dd86d19 100644
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/ThisReference.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/ThisReference.java
@@ -1,72 +1,136 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2001, 2002 International Business Machines Corp. and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v0.5 
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v05.html
+/***********************************************************************************************************************************
+ * Copyright (c) 2000, 2003 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made
+ * available under the terms of the Common Public License v1.0 which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/cpl-v10.html
  * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- ******************************************************************************/
+ * Contributors: IBM Corporation - initial API and implementation
+ **********************************************************************************************************************************/
 package net.sourceforge.phpdt.internal.compiler.ast;
 
 import net.sourceforge.phpdt.internal.compiler.IAbstractSyntaxTreeVisitor;
-import net.sourceforge.phpdt.internal.compiler.codegen.*;
-import net.sourceforge.phpdt.internal.compiler.lookup.*;
+import net.sourceforge.phpdt.internal.compiler.flow.FlowContext;
+import net.sourceforge.phpdt.internal.compiler.flow.FlowInfo;
+import net.sourceforge.phpdt.internal.compiler.lookup.BlockScope;
+import net.sourceforge.phpdt.internal.compiler.lookup.MethodScope;
+import net.sourceforge.phpdt.internal.compiler.lookup.TypeBinding;
 
 public class ThisReference extends Reference {
-	
-	public static final ThisReference ThisImplicit = new ThisReference();
-	
-/**
- * ThisReference constructor comment.
- */
-public ThisReference() {
-	super();
-}
-public ThisReference(int s, int sourceEnd) {
-	this();
-	this.sourceStart = s ;
-	this.sourceEnd = sourceEnd;
-}
-protected boolean checkAccess(MethodScope methodScope) {
-	// this/super cannot be used in constructor call
-	if (methodScope.isConstructorCall) {
-		methodScope.problemReporter().fieldsOrThisBeforeConstructorInvocation(this);
-		return false;
+
+	public static ThisReference implicitThis() {
+
+		ThisReference implicitThis = new ThisReference(0, 0);
+		implicitThis.bits |= IsImplicitThisMask;
+		return implicitThis;
+	}
+
+	public ThisReference(int sourceStart, int sourceEnd) {
+
+		this.sourceStart = sourceStart;
+		this.sourceEnd = sourceEnd;
+	}
+
+	/*
+	 * @see Reference#analyseAssignment(...)
+	 */
+	public FlowInfo analyseAssignment(BlockScope currentScope,
+			FlowContext flowContext, FlowInfo flowInfo, Assignment assignment,
+			boolean isCompound) {
+
+		return flowInfo; // this cannot be assigned
+	}
+
+	public boolean checkAccess(MethodScope methodScope) {
+
+		// this/super cannot be used in constructor call
+		if (methodScope.isConstructorCall) {
+			methodScope.problemReporter()
+					.fieldsOrThisBeforeConstructorInvocation(this);
+			return false;
+		}
+
+		// static may not refer to this/super
+		if (methodScope.isStatic) {
+			methodScope.problemReporter().errorThisSuperInStatic(this);
+			return false;
+		}
+		return true;
+	}
+
+	/*
+	 * @see Reference#generateAssignment(...)
+	 */
+	// public void generateAssignment(BlockScope currentScope, CodeStream
+	// codeStream, Assignment assignment, boolean valueRequired) {
+	//
+	// // this cannot be assigned
+	// }
+	//
+	// public void generateCode(BlockScope currentScope, CodeStream codeStream,
+	// boolean valueRequired) {
+	//	
+	// int pc = codeStream.position;
+	// if (valueRequired)
+	// codeStream.aload_0();
+	// if ((this.bits & IsImplicitThisMask) == 0)
+	// codeStream.recordPositionsFrom(pc, this.sourceStart);
+	// }
+	//
+	// /*
+	// * @see Reference#generateCompoundAssignment(...)
+	// */
+	// public void generateCompoundAssignment(BlockScope currentScope,
+	// CodeStream codeStream, Expression expression, int operator, int
+	// assignmentImplicitConversion, boolean valueRequired) {
+	//
+	// // this cannot be assigned
+	// }
+	//	
+	// /*
+	// * @see
+	// net.sourceforge.phpdt.internal.compiler.ast.Reference#generatePostIncrement()
+	// */
+	// public void generatePostIncrement(BlockScope currentScope, CodeStream
+	// codeStream, CompoundAssignment postIncrement, boolean
+	// valueRequired) {
+	//
+	// // this cannot be assigned
+	// }
+	public boolean isImplicitThis() {
+
+		return (this.bits & IsImplicitThisMask) != 0;
+	}
+
+	public boolean isThis() {
+
+		return true;
+	}
+
+	public TypeBinding resolveType(BlockScope scope) {
+
+		constant = NotAConstant;
+		if (!this.isImplicitThis() && !checkAccess(scope.methodScope()))
+			return null;
+		return this.resolvedType = scope.enclosingSourceType();
 	}
 
-	// static may not refer to this/super
-	if (methodScope.isStatic) {
-		methodScope.problemReporter().errorThisSuperInStatic(this);
-		return false;
+	public StringBuffer printExpression(int indent, StringBuffer output) {
+
+		if (this.isImplicitThis())
+			return output;
+		return output.append("this"); //$NON-NLS-1$
+	}
+
+	public String toStringExpression() {
+
+		if (this.isImplicitThis())
+			return ""; //$NON-NLS-1$
+		return "this"; //$NON-NLS-1$
+	}
+
+	public void traverse(IAbstractSyntaxTreeVisitor visitor,
+			BlockScope blockScope) {
+
+		visitor.visit(this, blockScope);
+		visitor.endVisit(this, blockScope);
 	}
-	return true;
-}
-public void generateCode(BlockScope currentScope, CodeStream codeStream, boolean valueRequired) {
-	int pc = codeStream.position;
-	if (valueRequired)
-		codeStream.aload_0();
-	codeStream.recordPositionsFrom(pc, this.sourceStart);
-}
-public boolean isThis() {
-	
-	return true ;
-}
-public TypeBinding resolveType(BlockScope scope) {
-	// implicit this
-	constant = NotAConstant;
-	if (this != ThisImplicit && !checkAccess(scope.methodScope()))
-		return null;
-	return scope.enclosingSourceType();
-}
-public String toStringExpression(){
-
-	if (this == ThisImplicit) return "" ; //$NON-NLS-1$
-	return "this"; //$NON-NLS-1$
-}
-public void traverse(IAbstractSyntaxTreeVisitor visitor, BlockScope blockScope) {
-	visitor.visit(this, blockScope);
-	visitor.endVisit(this, blockScope);
-}
-}
+}
\ No newline at end of file