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

diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/TypeReference.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/TypeReference.java
index d8c957f..d4dabea 100644
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/TypeReference.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/TypeReference.java
@@ -1,102 +1,122 @@
 /*******************************************************************************
- * 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.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.lookup.BlockScope;
+import net.sourceforge.phpdt.internal.compiler.lookup.ClassScope;
+import net.sourceforge.phpdt.internal.compiler.lookup.Scope;
+import net.sourceforge.phpdt.internal.compiler.lookup.TypeBinding;
 
 public abstract class TypeReference extends Expression {
-	public TypeBinding binding;
-public TypeReference() {
-		super () ;
-		}
-// allows us to trap completion & selection nodes
 
-public void aboutToResolve(Scope scope) {}
-/*
- * Answer a base type reference (can be an array of base type).
- */
-public static final TypeReference baseTypeReference(int baseType, int dim) {
-	
-	if (dim == 0) {
-		switch (baseType) {
-			case (T_void) :
-				return new SingleTypeReference(VoidBinding.simpleName, 0);
-			case (T_boolean) :
-				return new SingleTypeReference(BooleanBinding.simpleName, 0);
-			case (T_char) :
-				return new SingleTypeReference(CharBinding.simpleName, 0);
-			case (T_float) :
-				return new SingleTypeReference(FloatBinding.simpleName, 0);
-			case (T_double) :
-				return new SingleTypeReference(DoubleBinding.simpleName, 0);
-			case (T_byte) :
-				return new SingleTypeReference(ByteBinding.simpleName, 0);
-			case (T_short) :
-				return new SingleTypeReference(ShortBinding.simpleName, 0);
-			case (T_int) :
-				return new SingleTypeReference(IntBinding.simpleName, 0);
-			default : //T_long	
-				return new SingleTypeReference(LongBinding.simpleName, 0);
-		}
+	public TypeReference() {
+		super();
 	}
-	switch (baseType) {
-		case (T_void) :
-			return new ArrayTypeReference(VoidBinding.simpleName, dim, 0);
-		case (T_boolean) :
-			return new ArrayTypeReference(BooleanBinding.simpleName, dim, 0);
-		case (T_char) :
-			return new ArrayTypeReference(CharBinding.simpleName, dim, 0);
-		case (T_float) :
-			return new ArrayTypeReference(FloatBinding.simpleName, dim, 0);
-		case (T_double) :
-			return new ArrayTypeReference(DoubleBinding.simpleName, dim, 0);
-		case (T_byte) :
-			return new ArrayTypeReference(ByteBinding.simpleName, dim, 0);
-		case (T_short) :
-			return new ArrayTypeReference(ShortBinding.simpleName, dim, 0);
-		case (T_int) :
-			return new ArrayTypeReference(IntBinding.simpleName, dim, 0);
-		default : //T_long	
-			return new ArrayTypeReference(LongBinding.simpleName, dim, 0);
+
+	public FlowInfo analyseCode(BlockScope currentScope,
+			FlowContext flowContext, FlowInfo flowInfo) {
+		return flowInfo;
 	}
-}
-public abstract TypeReference copyDims(int dim);
-public int dimensions() {
-	return 0;
-}
-public abstract TypeBinding getTypeBinding(Scope scope);
-/**
- * @return char[][]
- */
-public abstract char [][] getTypeName() ;
-public boolean isTypeReference() {
-	return true;
-}
-public TypeBinding resolveType(BlockScope scope) {
-	// handle the error here
-	constant = NotAConstant;
-	if (binding != null) { // is a shared type reference which was already resolved
-		if (!binding.isValidBinding())
-			return null; // already reported error
-	} else {
-		binding = getTypeBinding(scope);
-		if (!binding.isValidBinding()) {
-			scope.problemReporter().invalidType(this, binding);
-			return null;
+
+	// allows us to trap completion & selection nodes
+	public void aboutToResolve(Scope scope) {
+	}
+
+	/*
+	 * Answer a base type reference (can be an array of base type).
+	 */
+	// public static final TypeReference baseTypeReference(int baseType, int
+	// dim) {
+	//	
+	// if (dim == 0) {
+	// switch (baseType) {
+	// case (T_void) :
+	// return new SingleTypeReference(VoidBinding.simpleName, 0);
+	// case (T_boolean) :
+	// return new SingleTypeReference(BooleanBinding.simpleName, 0);
+	// case (T_char) :
+	// return new SingleTypeReference(CharBinding.simpleName, 0);
+	// case (T_float) :
+	// return new SingleTypeReference(FloatBinding.simpleName, 0);
+	// case (T_double) :
+	// return new SingleTypeReference(DoubleBinding.simpleName, 0);
+	// case (T_byte) :
+	// return new SingleTypeReference(ByteBinding.simpleName, 0);
+	// case (T_short) :
+	// return new SingleTypeReference(ShortBinding.simpleName, 0);
+	// case (T_int) :
+	// return new SingleTypeReference(IntBinding.simpleName, 0);
+	// default : //T_long
+	// return new SingleTypeReference(LongBinding.simpleName, 0);
+	// }
+	// }
+	// switch (baseType) {
+	// case (T_void) :
+	// return new ArrayTypeReference(VoidBinding.simpleName, dim, 0);
+	// case (T_boolean) :
+	// return new ArrayTypeReference(BooleanBinding.simpleName, dim, 0);
+	// case (T_char) :
+	// return new ArrayTypeReference(CharBinding.simpleName, dim, 0);
+	// case (T_float) :
+	// return new ArrayTypeReference(FloatBinding.simpleName, dim, 0);
+	// case (T_double) :
+	// return new ArrayTypeReference(DoubleBinding.simpleName, dim, 0);
+	// case (T_byte) :
+	// return new ArrayTypeReference(ByteBinding.simpleName, dim, 0);
+	// case (T_short) :
+	// return new ArrayTypeReference(ShortBinding.simpleName, dim, 0);
+	// case (T_int) :
+	// return new ArrayTypeReference(IntBinding.simpleName, dim, 0);
+	// default : //T_long
+	// return new ArrayTypeReference(LongBinding.simpleName, dim, 0);
+	// }
+	// }
+	public abstract TypeReference copyDims(int dim);
+
+	public int dimensions() {
+		return 0;
+	}
+
+	public abstract TypeBinding getTypeBinding(Scope scope);
+
+	/**
+	 * @return char[][]
+	 */
+	public abstract char[][] getTypeName();
+
+	public boolean isTypeReference() {
+		return true;
+	}
+
+	public TypeBinding resolveType(BlockScope scope) {
+		// handle the error here
+		constant = NotAConstant;
+		if (this.resolvedType != null) { // is a shared type reference which
+											// was already resolved
+			if (!this.resolvedType.isValidBinding())
+				return null; // already reported error
+		} else {
+			this.resolvedType = getTypeBinding(scope);
+			if (!this.resolvedType.isValidBinding()) {
+				scope.problemReporter().invalidType(this, this.resolvedType);
+				return null;
+			}
+			if (isTypeUseDeprecated(this.resolvedType, scope))
+				scope.problemReporter().deprecatedType(this.resolvedType, this);
 		}
-		if (isTypeUseDeprecated(binding, scope))
-			scope.problemReporter().deprecatedType(binding, this);
+		return this.resolvedType;
 	}
-	return binding;
-}
-public abstract void traverse(IAbstractSyntaxTreeVisitor visitor, ClassScope classScope);
+
+	public abstract void traverse(ASTVisitor visitor, ClassScope classScope);
 }