X-Git-Url: http://secure.phpeclipse.com diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/FieldReference.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/FieldReference.java index 5cb69fd..22d3e6c 100644 --- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/FieldReference.java +++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/FieldReference.java @@ -1,20 +1,28 @@ /******************************************************************************* - * Copyright (c) 2000, 2001, 2002 International Business Machines Corp. and others. + * 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 v0.5 + * 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-v05.html + * http://www.eclipse.org/legal/cpl-v10.html * * 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.impl.*; -import net.sourceforge.phpdt.internal.compiler.codegen.*; -import net.sourceforge.phpdt.internal.compiler.flow.*; -import net.sourceforge.phpdt.internal.compiler.lookup.*; +import net.sourceforge.phpdt.internal.compiler.ASTVisitor; +import net.sourceforge.phpdt.internal.compiler.flow.FlowContext; +import net.sourceforge.phpdt.internal.compiler.flow.FlowInfo; +import net.sourceforge.phpdt.internal.compiler.impl.Constant; +import net.sourceforge.phpdt.internal.compiler.lookup.BindingIds; +import net.sourceforge.phpdt.internal.compiler.lookup.BlockScope; +import net.sourceforge.phpdt.internal.compiler.lookup.FieldBinding; +import net.sourceforge.phpdt.internal.compiler.lookup.InvocationSite; +import net.sourceforge.phpdt.internal.compiler.lookup.MethodBinding; +import net.sourceforge.phpdt.internal.compiler.lookup.ReferenceBinding; +import net.sourceforge.phpdt.internal.compiler.lookup.Scope; +import net.sourceforge.phpdt.internal.compiler.lookup.SourceTypeBinding; +import net.sourceforge.phpdt.internal.compiler.lookup.TypeBinding; public class FieldReference extends Reference implements InvocationSite { @@ -30,8 +38,10 @@ public class FieldReference extends Reference implements InvocationSite { token = source; nameSourcePosition = pos; //by default the position are the one of the field (not true for super access) - sourceStart = (int) (pos >>> 32); - sourceEnd = (int) (pos & 0x00000000FFFFFFFFL); +// sourceStart = (int) (pos >>> 32); +// sourceEnd = (int) (pos & 0x00000000FFFFFFFFL); + sourceStart = (int) pos; + sourceEnd = sourceStart + source.length; bits |= BindingIds.FIELD; } @@ -45,7 +55,7 @@ public class FieldReference extends Reference implements InvocationSite { // compound assignment extra work if (isCompound) { // check the variable part is initialized if blank final - if (binding.isFinal() + if (binding.isBlankFinal() && receiver.isThis() && currentScope.allowBlankFinalFieldAssignment(binding) && (!flowInfo.isDefinitelyAssigned(binding))) { @@ -54,6 +64,10 @@ public class FieldReference extends Reference implements InvocationSite { } manageSyntheticReadAccessIfNecessary(currentScope); } + flowInfo = + receiver + .analyseCode(currentScope, flowContext, flowInfo, !binding.isStatic()) + .unconditionalInits(); if (assignment.expression != null) { flowInfo = assignment @@ -61,27 +75,27 @@ public class FieldReference extends Reference implements InvocationSite { .analyseCode(currentScope, flowContext, flowInfo) .unconditionalInits(); } - flowInfo = - receiver - .analyseCode(currentScope, flowContext, flowInfo, !binding.isStatic()) - .unconditionalInits(); manageSyntheticWriteAccessIfNecessary(currentScope); // check if assigning a final field if (binding.isFinal()) { // in a context where it can be assigned? - if (receiver.isThis() + if (binding.isBlankFinal() + && !isCompound + && receiver.isThis() && !(receiver instanceof QualifiedThisReference) + && ((receiver.bits & ParenthesizedMASK) == 0) // (this).x is forbidden && currentScope.allowBlankFinalFieldAssignment(binding)) { if (flowInfo.isPotentiallyAssigned(binding)) { currentScope.problemReporter().duplicateInitializationOfBlankFinalField( binding, this); + } else { + flowContext.recordSettingFinal(binding, this); } flowInfo.markAsDefinitelyAssigned(binding); - flowContext.recordSettingFinal(binding, this); } else { - // assigning a final field outside an initializer or constructor + // assigning a final field outside an initializer or constructor or wrong reference currentScope.problemReporter().cannotAssignToFinalField(binding, this); } } @@ -114,182 +128,187 @@ public class FieldReference extends Reference implements InvocationSite { return binding; } - public void generateAssignment( - BlockScope currentScope, - CodeStream codeStream, - Assignment assignment, - boolean valueRequired) { - - receiver.generateCode( - currentScope, - codeStream, - !this.codegenBinding.isStatic()); - assignment.expression.generateCode(currentScope, codeStream, true); - fieldStore( - codeStream, - this.codegenBinding, - syntheticWriteAccessor, - valueRequired); - if (valueRequired) { - codeStream.generateImplicitConversion(assignment.implicitConversion); - } - } +// public void generateAssignment( +// BlockScope currentScope, +// CodeStream codeStream, +// Assignment assignment, +// boolean valueRequired) { +// +// receiver.generateCode( +// currentScope, +// codeStream, +// !this.codegenBinding.isStatic()); +// assignment.expression.generateCode(currentScope, codeStream, true); +// fieldStore( +// codeStream, +// this.codegenBinding, +// syntheticWriteAccessor, +// valueRequired); +// if (valueRequired) { +// codeStream.generateImplicitConversion(assignment.implicitConversion); +// } +// } /** * Field reference code generation * - * @param currentScope org.eclipse.jdt.internal.compiler.lookup.BlockScope - * @param codeStream org.eclipse.jdt.internal.compiler.codegen.CodeStream + * @param currentScope net.sourceforge.phpdt.internal.compiler.lookup.BlockScope + * @param codeStream net.sourceforge.phpdt.internal.compiler.codegen.CodeStream * @param valueRequired boolean */ - public void generateCode( - BlockScope currentScope, - CodeStream codeStream, - boolean valueRequired) { - - int pc = codeStream.position; - if (constant != NotAConstant) { - if (valueRequired) { - codeStream.generateConstant(constant, implicitConversion); - } - } else { - boolean isStatic = this.codegenBinding.isStatic(); - receiver.generateCode( - currentScope, - codeStream, - valueRequired && (!isStatic) && (this.codegenBinding.constant == NotAConstant)); - if (valueRequired) { - if (this.codegenBinding.constant == NotAConstant) { - if (this.codegenBinding.declaringClass == null) { // array length - codeStream.arraylength(); - } else { - if (syntheticReadAccessor == null) { - if (isStatic) { - codeStream.getstatic(this.codegenBinding); - } else { - codeStream.getfield(this.codegenBinding); - } - } else { - codeStream.invokestatic(syntheticReadAccessor); - } - } - codeStream.generateImplicitConversion(implicitConversion); - } else { - codeStream.generateConstant(this.codegenBinding.constant, implicitConversion); - } - } - } - codeStream.recordPositionsFrom(pc, this.sourceStart); - } - - public void generateCompoundAssignment( - BlockScope currentScope, - CodeStream codeStream, - Expression expression, - int operator, - int assignmentImplicitConversion, - boolean valueRequired) { - - boolean isStatic; - receiver.generateCode( - currentScope, - codeStream, - !(isStatic = this.codegenBinding.isStatic())); - if (isStatic) { - if (syntheticReadAccessor == null) { - codeStream.getstatic(this.codegenBinding); - } else { - codeStream.invokestatic(syntheticReadAccessor); - } - } else { - codeStream.dup(); - if (syntheticReadAccessor == null) { - codeStream.getfield(this.codegenBinding); - } else { - codeStream.invokestatic(syntheticReadAccessor); - } - } - int operationTypeID; - if ((operationTypeID = implicitConversion >> 4) == T_String) { - codeStream.generateStringAppend(currentScope, null, expression); - } else { - // promote the array reference to the suitable operation type - codeStream.generateImplicitConversion(implicitConversion); - // generate the increment value (will by itself be promoted to the operation value) - if (expression == IntLiteral.One) { // prefix operation - codeStream.generateConstant(expression.constant, implicitConversion); - } else { - expression.generateCode(currentScope, codeStream, true); - } - // perform the operation - codeStream.sendOperator(operator, operationTypeID); - // cast the value back to the array reference type - codeStream.generateImplicitConversion(assignmentImplicitConversion); - } - fieldStore( - codeStream, - this.codegenBinding, - syntheticWriteAccessor, - valueRequired); - } - - public void generatePostIncrement( - BlockScope currentScope, - CodeStream codeStream, - CompoundAssignment postIncrement, - boolean valueRequired) { - - boolean isStatic; - receiver.generateCode( - currentScope, - codeStream, - !(isStatic = this.codegenBinding.isStatic())); - if (isStatic) { - if (syntheticReadAccessor == null) { - codeStream.getstatic(this.codegenBinding); - } else { - codeStream.invokestatic(syntheticReadAccessor); - } - } else { - codeStream.dup(); - if (syntheticReadAccessor == null) { - codeStream.getfield(this.codegenBinding); - } else { - codeStream.invokestatic(syntheticReadAccessor); - } - } - if (valueRequired) { - if (isStatic) { - if ((this.codegenBinding.type == LongBinding) - || (this.codegenBinding.type == DoubleBinding)) { - codeStream.dup2(); - } else { - codeStream.dup(); - } - } else { // Stack: [owner][old field value] ---> [old field value][owner][old field value] - if ((this.codegenBinding.type == LongBinding) - || (this.codegenBinding.type == DoubleBinding)) { - codeStream.dup2_x1(); - } else { - codeStream.dup_x1(); - } - } - } - codeStream.generateConstant( - postIncrement.expression.constant, - implicitConversion); - codeStream.sendOperator(postIncrement.operator, this.codegenBinding.type.id); - codeStream.generateImplicitConversion( - postIncrement.assignmentImplicitConversion); - fieldStore(codeStream, this.codegenBinding, syntheticWriteAccessor, false); - } +// public void generateCode( +// BlockScope currentScope, +// CodeStream codeStream, +// boolean valueRequired) { +// +// int pc = codeStream.position; +// if (constant != NotAConstant) { +// if (valueRequired) { +// codeStream.generateConstant(constant, implicitConversion); +// } +// } else { +// boolean isStatic = this.codegenBinding.isStatic(); +// receiver.generateCode(currentScope, codeStream, !isStatic); +// if (valueRequired) { +// if (this.codegenBinding.constant == NotAConstant) { +// if (this.codegenBinding.declaringClass == null) { // array length +// codeStream.arraylength(); +// } else { +// if (syntheticReadAccessor == null) { +// if (isStatic) { +// codeStream.getstatic(this.codegenBinding); +// } else { +// codeStream.getfield(this.codegenBinding); +// } +// } else { +// codeStream.invokestatic(syntheticReadAccessor); +// } +// } +// codeStream.generateImplicitConversion(implicitConversion); +// } else { +// if (!isStatic) { +// codeStream.invokeObjectGetClass(); // perform null check +// codeStream.pop(); +// } +// codeStream.generateConstant(this.codegenBinding.constant, implicitConversion); +// } +// } else { +// if (!isStatic){ +// codeStream.invokeObjectGetClass(); // perform null check +// codeStream.pop(); +// } +// } +// } +// codeStream.recordPositionsFrom(pc, this.sourceStart); +// } +// +// public void generateCompoundAssignment( +// BlockScope currentScope, +// CodeStream codeStream, +// Expression expression, +// int operator, +// int assignmentImplicitConversion, +// boolean valueRequired) { +// +// boolean isStatic; +// receiver.generateCode( +// currentScope, +// codeStream, +// !(isStatic = this.codegenBinding.isStatic())); +// if (isStatic) { +// if (syntheticReadAccessor == null) { +// codeStream.getstatic(this.codegenBinding); +// } else { +// codeStream.invokestatic(syntheticReadAccessor); +// } +// } else { +// codeStream.dup(); +// if (syntheticReadAccessor == null) { +// codeStream.getfield(this.codegenBinding); +// } else { +// codeStream.invokestatic(syntheticReadAccessor); +// } +// } +// int operationTypeID; +// if ((operationTypeID = implicitConversion >> 4) == T_String) { +// codeStream.generateStringAppend(currentScope, null, expression); +// } else { +// // promote the array reference to the suitable operation type +// codeStream.generateImplicitConversion(implicitConversion); +// // generate the increment value (will by itself be promoted to the operation value) +// if (expression == IntLiteral.One) { // prefix operation +// codeStream.generateConstant(expression.constant, implicitConversion); +// } else { +// expression.generateCode(currentScope, codeStream, true); +// } +// // perform the operation +// codeStream.sendOperator(operator, operationTypeID); +// // cast the value back to the array reference type +// codeStream.generateImplicitConversion(assignmentImplicitConversion); +// } +// fieldStore( +// codeStream, +// this.codegenBinding, +// syntheticWriteAccessor, +// valueRequired); +// } +// +// public void generatePostIncrement( +// BlockScope currentScope, +// CodeStream codeStream, +// CompoundAssignment postIncrement, +// boolean valueRequired) { +// +// boolean isStatic; +// receiver.generateCode( +// currentScope, +// codeStream, +// !(isStatic = this.codegenBinding.isStatic())); +// if (isStatic) { +// if (syntheticReadAccessor == null) { +// codeStream.getstatic(this.codegenBinding); +// } else { +// codeStream.invokestatic(syntheticReadAccessor); +// } +// } else { +// codeStream.dup(); +// if (syntheticReadAccessor == null) { +// codeStream.getfield(this.codegenBinding); +// } else { +// codeStream.invokestatic(syntheticReadAccessor); +// } +// } +// if (valueRequired) { +// if (isStatic) { +// if ((this.codegenBinding.type == LongBinding) +// || (this.codegenBinding.type == DoubleBinding)) { +// codeStream.dup2(); +// } else { +// codeStream.dup(); +// } +// } else { // Stack: [owner][old field value] ---> [old field value][owner][old field value] +// if ((this.codegenBinding.type == LongBinding) +// || (this.codegenBinding.type == DoubleBinding)) { +// codeStream.dup2_x1(); +// } else { +// codeStream.dup_x1(); +// } +// } +// } +// codeStream.generateConstant( +// postIncrement.expression.constant, +// implicitConversion); +// codeStream.sendOperator(postIncrement.operator, this.codegenBinding.type.id); +// codeStream.generateImplicitConversion( +// postIncrement.assignmentImplicitConversion); +// fieldStore(codeStream, this.codegenBinding, syntheticWriteAccessor, false); +// } public static final Constant getConstantFor( FieldBinding binding, - boolean implicitReceiver, Reference reference, - Scope referenceScope, - int indexInQualification) { + boolean isImplicit, + Scope referenceScope) { //propagation of the constant. @@ -298,7 +317,7 @@ public class FieldReference extends Reference implements InvocationSite { //if ref==null then indexInQualification==0 AND implicitReceiver == false. This case is a //degenerated case where a fake reference field (null) //is associted to a real FieldBinding in order - //to allow its constant computation using the regular path (i.e. find the fieldDeclaration + //to allow its constant computation using the regular path (in other words, find the fieldDeclaration //and proceed to its type resolution). As implicitReceiver is false, no error reporting //against ref will be used ==> no nullPointerException risk .... @@ -311,12 +330,8 @@ public class FieldReference extends Reference implements InvocationSite { return binding.constant = NotAConstant; } if (binding.constant != null) { - if (indexInQualification == 0) { - return binding.constant; - } - //see previous comment for the (sould-always-be) valid cast - QualifiedNameReference qualifiedReference = (QualifiedNameReference) reference; - if (indexInQualification == (qualifiedReference.indexOfFirstFieldBinding - 1)) { + if (isImplicit || (reference instanceof QualifiedNameReference + && binding == ((QualifiedNameReference)reference).binding)) { return binding.constant; } return NotAConstant; @@ -331,47 +346,15 @@ public class FieldReference extends Reference implements InvocationSite { TypeDeclaration typeDecl = typeBinding.scope.referenceContext; FieldDeclaration fieldDecl = typeDecl.declarationOf(binding); - //what scope to use (depend on the staticness of the field binding) - MethodScope fieldScope = - binding.isStatic() + fieldDecl.resolve(binding.isStatic() //side effect on binding ? typeDecl.staticInitializerScope - : typeDecl.initializerScope; + : typeDecl.initializerScope); - if (implicitReceiver) { //Determine if the ref is legal in the current class of the field - //i.e. not a forward reference .... (they are allowed when the receiver is explicit ! ... Please don't ask me why !...yet another java mystery...) - if (fieldScope.fieldDeclarationIndex == MethodScope.NotInFieldDecl) { - // no field is currently being analysed in typeDecl - fieldDecl.resolve(fieldScope); //side effect on binding :-) ... - return binding.constant; - } - //We are re-entering the same class fields analysing - if ((reference != null) - && (binding.declaringClass == referenceScope.enclosingSourceType()) // only complain for access inside same type - && (binding.id > fieldScope.fieldDeclarationIndex)) { - //forward reference. The declaration remains unresolved. - referenceScope.problemReporter().forwardReference(reference, indexInQualification, typeBinding); - return NotAConstant; - } - fieldDecl.resolve(fieldScope); //side effect on binding :-) ... - return binding.constant; - } - //the field reference is explicity. It has to be a "simple" like field reference to get the - //constant propagation. For example in Packahe.Type.field1.field2 , field1 may have its - //constant having a propagation where field2 is always not propagating its - if (indexInQualification == 0) { - fieldDecl.resolve(fieldScope); //side effect on binding :-) ... - return binding.constant; - } - // Side-effect on the field binding may not be propagated out for the qualified reference - // unless it occurs in first place of the name sequence - fieldDecl.resolve(fieldScope); //side effect on binding :-) ... - //see previous comment for the cast that should always be valid - QualifiedNameReference qualifiedReference = (QualifiedNameReference) reference; - if (indexInQualification == (qualifiedReference.indexOfFirstFieldBinding - 1)) { + if (isImplicit || (reference instanceof QualifiedNameReference + && binding == ((QualifiedNameReference)reference).binding)) { return binding.constant; - } else { - return NotAConstant; } + return NotAConstant; } public boolean isSuperAccess() { @@ -425,20 +408,20 @@ public class FieldReference extends Reference implements InvocationSite { } // if the binding declaring class is not visible, need special action // for runtime compatibility on 1.2 VMs : change the declaring class of the binding - // NOTE: from 1.4 on, field's declaring class is touched if any different from receiver type - if (binding.declaringClass != this.receiverType - && !this.receiverType.isArrayType() - && binding.declaringClass != null // array.length - && binding.constant == NotAConstant - && ((currentScope.environment().options.complianceLevel >= CompilerOptions.JDK1_4 - && binding.declaringClass.id != T_Object) - //no change for Object fields (in case there was) - || !binding.declaringClass.canBeSeenBy(currentScope))) { - this.codegenBinding = - currentScope.enclosingSourceType().getUpdatedFieldBinding( - binding, - (ReferenceBinding) this.receiverType); - } + // NOTE: from target 1.2 on, field's declaring class is touched if any different from receiver type +// if (binding.declaringClass != this.receiverType +// && !this.receiverType.isArrayType() +// && binding.declaringClass != null // array.length +// && binding.constant == NotAConstant +// && ((currentScope.environment().options.targetJDK >= CompilerOptions.JDK1_2 +// && binding.declaringClass.id != T_Object) +// //no change for Object fields (in case there was) +// || !binding.declaringClass.canBeSeenBy(currentScope))) { +// this.codegenBinding = +// currentScope.enclosingSourceType().getUpdatedFieldBinding( +// binding, +// (ReferenceBinding) this.receiverType); +// } } /* @@ -482,20 +465,20 @@ public class FieldReference extends Reference implements InvocationSite { } // if the binding declaring class is not visible, need special action // for runtime compatibility on 1.2 VMs : change the declaring class of the binding - // NOTE: from 1.4 on, field's declaring class is touched if any different from receiver type - if (binding.declaringClass != this.receiverType - && !this.receiverType.isArrayType() - && binding.declaringClass != null // array.length - && binding.constant == NotAConstant - && ((currentScope.environment().options.complianceLevel >= CompilerOptions.JDK1_4 - && binding.declaringClass.id != T_Object) - //no change for Object fields (in case there was) - || !binding.declaringClass.canBeSeenBy(currentScope))) { - this.codegenBinding = - currentScope.enclosingSourceType().getUpdatedFieldBinding( - binding, - (ReferenceBinding) this.receiverType); - } + // NOTE: from target 1.2 on, field's declaring class is touched if any different from receiver type +// if (binding.declaringClass != this.receiverType +// && !this.receiverType.isArrayType() +// && binding.declaringClass != null // array.length +// && binding.constant == NotAConstant +// && ((currentScope.environment().options.targetJDK >= CompilerOptions.JDK1_2 +// && binding.declaringClass.id != T_Object) +// //no change for Object fields (in case there was) +// || !binding.declaringClass.canBeSeenBy(currentScope))) { +// this.codegenBinding = +// currentScope.enclosingSourceType().getUpdatedFieldBinding( +// binding, +// (ReferenceBinding) this.receiverType); +// } } public TypeBinding resolveType(BlockScope scope) { @@ -522,18 +505,21 @@ public class FieldReference extends Reference implements InvocationSite { if (isFieldUseDeprecated(binding, scope)) scope.problemReporter().deprecatedField(binding, this); - // check for this.x in static is done in the resolution of the receiver - constant = - FieldReference.getConstantFor( - binding, - receiver == ThisReference.ThisImplicit, - this, - scope, - 0); - if (receiver != ThisReference.ThisImplicit) + boolean isImplicitThisRcv = receiver.isImplicitThis(); + constant = FieldReference.getConstantFor(binding, this, isImplicitThisRcv, scope); + if (!isImplicitThisRcv) { constant = NotAConstant; - - return binding.type; + } + if (binding.isStatic()) { + // static field accessed through receiver? legal but unoptimal (optional warning) + if (!(isImplicitThisRcv + || receiver.isSuper() + || (receiver instanceof NameReference + && (((NameReference) receiver).bits & BindingIds.TYPE) != 0))) { + scope.problemReporter().unnecessaryReceiverForStaticField(this, binding); + } + } + return this.resolvedType = binding.type; } public void setActualReceiverType(ReferenceBinding receiverType) { @@ -542,8 +528,8 @@ public class FieldReference extends Reference implements InvocationSite { public void setDepth(int depth) { + bits &= ~DepthMASK; // flush previous depth if any if (depth > 0) { - bits &= ~DepthMASK; // flush previous depth if any bits |= (depth & 0xFF) << DepthSHIFT; // encoded on 8 bits } } @@ -551,18 +537,21 @@ public class FieldReference extends Reference implements InvocationSite { public void setFieldIndex(int index) { // ignored } + public StringBuffer printExpression(int indent, StringBuffer output) { + return receiver.printExpression(0, output).append('.').append(token); + } public String toStringExpression() { return receiver.toString() + "." //$NON-NLS-1$ + new String(token); } - public void traverse(IAbstractSyntaxTreeVisitor visitor, BlockScope scope) { + public void traverse(ASTVisitor visitor, BlockScope scope) { if (visitor.visit(this, scope)) { receiver.traverse(visitor, scope); } visitor.endVisit(this, scope); } -} \ No newline at end of file +}