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

diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/lookup/LocalTypeBinding.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/lookup/LocalTypeBinding.java
index 681d714..73c9e06 100644
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/lookup/LocalTypeBinding.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/lookup/LocalTypeBinding.java
@@ -1,23 +1,25 @@
 /*******************************************************************************
- * 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.lookup;
 
-import net.sourceforge.phpdt.internal.compiler.ast.AnonymousLocalTypeDeclaration;
-import net.sourceforge.phpdt.internal.compiler.util.CharOperation;
+import net.sourceforge.phpdt.core.compiler.CharOperation;
 import net.sourceforge.phpdt.internal.compiler.util.Util;
+import net.sourceforge.phpeclipse.internal.compiler.ast.AnonymousLocalTypeDeclaration;
 
 public final class LocalTypeBinding extends NestedTypeBinding {
 	final static char[] LocalTypePrefix = { '$', 'L', 'o', 'c', 'a', 'l', '$' };
 
 	private InnerEmulationDependency[] dependents;
+	ArrayBinding[] localArrayBindings; // used to cache array bindings of various dimensions for this local type
+
 public LocalTypeBinding(ClassScope scope, SourceTypeBinding enclosingType) {
 	super(
 		new char[][] {CharOperation.concat(LocalTypePrefix, scope.referenceContext.name)},
@@ -34,7 +36,7 @@ public LocalTypeBinding(ClassScope scope, SourceTypeBinding enclosingType) {
 * all its dependents so as to update them (see updateInnerEmulationDependents()).
 */
 
-public void addInnerEmulationDependent(BlockScope scope, boolean wasEnclosingInstanceSupplied, boolean useDirectAccess) {
+public void addInnerEmulationDependent(BlockScope scope, boolean wasEnclosingInstanceSupplied) {
 	int index;
 	if (dependents == null) {
 		index = 0;
@@ -46,7 +48,7 @@ public void addInnerEmulationDependent(BlockScope scope, boolean wasEnclosingIns
 				return; // already stored
 		System.arraycopy(dependents, 0, (dependents = new InnerEmulationDependency[index + 1]), 0, index);
 	}
-	dependents[index] = new InnerEmulationDependency(scope, wasEnclosingInstanceSupplied, useDirectAccess);
+	dependents[index] = new InnerEmulationDependency(scope, wasEnclosingInstanceSupplied);
 	//  System.out.println("Adding dependency: "+ new String(scope.enclosingType().readableName()) + " --> " + new String(this.readableName()));
 }
 /* Answer the receiver's constant pool name.
@@ -57,9 +59,24 @@ public void addInnerEmulationDependent(BlockScope scope, boolean wasEnclosingIns
 public char[] constantPoolName() /* java/lang/Object */ {
 	return constantPoolName;
 }
-public void constantPoolName(char[] computedConstantPoolName) /* java/lang/Object */ {
-	this.constantPoolName = computedConstantPoolName;
+
+ArrayBinding createArrayType(int dimensionCount) {
+	if (localArrayBindings == null) {
+		localArrayBindings = new ArrayBinding[] {new ArrayBinding(this, dimensionCount)};
+		return localArrayBindings[0];
+	}
+
+	// find the cached array binding for this dimensionCount (if any)
+	int length = localArrayBindings.length;
+	for (int i = 0; i < length; i++)
+		if (localArrayBindings[i].dimensions == dimensionCount)
+			return localArrayBindings[i];
+
+	// no matching array
+	System.arraycopy(localArrayBindings, 0, localArrayBindings = new ArrayBinding[length + 1], 0, length); 
+	return localArrayBindings[length] = new ArrayBinding(this, dimensionCount);
 }
+
 public char[] readableName() {
 	if (isAnonymousType()) {
 		if (superInterfaces == NoSuperInterfaces)
@@ -72,15 +89,38 @@ public char[] readableName() {
 		return sourceName;
 	}
 }
-// Record that the type is a local member type
 
+public char[] shortReadableName() {
+	if (isAnonymousType()) {
+		if (superInterfaces == NoSuperInterfaces)
+			return ("<"+Util.bind("binding.subclass",new String(superclass.shortReadableName())) + ">").toCharArray(); //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-1$
+		else
+			return ("<"+Util.bind("binding.implementation",new String(superInterfaces[0].shortReadableName())) + ">").toCharArray();			 //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-1$
+	} else if (isMemberType()) {
+		return CharOperation.concat(enclosingType().shortReadableName(), sourceName, '.');
+	} else {
+		return sourceName;
+	}
+}
+
+// Record that the type is a local member type
 public void setAsMemberType() {
 	tagBits |= MemberTypeMask;
 }
+
+public void setConstantPoolName(char[] computedConstantPoolName) /* java/lang/Object */ {
+	this.constantPoolName = computedConstantPoolName;
+}
+
 public char[] sourceName() {
-	if (isAnonymousType())
-		return readableName();
-	else
+	if (isAnonymousType()) {
+		//return readableName();
+		if (superInterfaces == NoSuperInterfaces)
+			return ("<"+Util.bind("binding.subclass",new String(superclass.sourceName())) + ">").toCharArray(); //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-1$
+		else
+			return ("<"+Util.bind("binding.implementation",new String(superInterfaces[0].sourceName())) + ">").toCharArray();			 //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-1$
+			
+	} else
 		return sourceName;
 }
 public String toString() {
@@ -99,7 +139,7 @@ public void updateInnerEmulationDependents() {
 		for (int i = 0; i < dependents.length; i++) {
 			InnerEmulationDependency dependency = dependents[i];
 			// System.out.println("Updating " + new String(this.readableName()) + " --> " + new String(dependency.scope.enclosingType().readableName()));
-			dependency.scope.propagateInnerEmulation(this, dependency.wasEnclosingInstanceSupplied, dependency.useDirectAccess);
+			dependency.scope.propagateInnerEmulation(this, dependency.wasEnclosingInstanceSupplied);
 		}
 	}
 }