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

diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/flow/InitializationFlowContext.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/flow/InitializationFlowContext.java
index b5a4b2b..03b3e3b 100644
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/flow/InitializationFlowContext.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/flow/InitializationFlowContext.java
@@ -1,86 +1,79 @@
 /*******************************************************************************
- * 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.flow;
 
-import net.sourceforge.phpdt.internal.compiler.ast.AstNode;
+import net.sourceforge.phpdt.internal.compiler.ast.ASTNode;
 import net.sourceforge.phpdt.internal.compiler.lookup.BlockScope;
 import net.sourceforge.phpdt.internal.compiler.lookup.ReferenceBinding;
 import net.sourceforge.phpdt.internal.compiler.lookup.TypeBinding;
 
 /**
- * Reflects the context of code analysis, keeping track of enclosing
- *	try statements, exception handlers, etc...
+ * Reflects the context of code analysis, keeping track of enclosing try
+ * statements, exception handlers, etc...
  */
 public class InitializationFlowContext extends ExceptionHandlingFlowContext {
 
 	public int exceptionCount;
+
 	public TypeBinding[] thrownExceptions = new TypeBinding[5];
-	public AstNode[] exceptionThrowers = new AstNode[5];
+
+	public ASTNode[] exceptionThrowers = new ASTNode[5];
+
 	public FlowInfo[] exceptionThrowerFlowInfos = new FlowInfo[5];
 
-	public InitializationFlowContext(
-		FlowContext parent,
-		AstNode associatedNode,
-		BlockScope scope) {
-		super(
-			parent,
-			associatedNode,
-			new ReferenceBinding[] { scope.getJavaLangThrowable()},
-		// tolerate any kind of exception, but record them
-		scope, FlowInfo.DeadEnd);
+	public InitializationFlowContext(FlowContext parent,
+			ASTNode associatedNode, BlockScope scope) {
+		super(parent, associatedNode, NoExceptions, // no exception allowed by
+													// default
+				scope, FlowInfo.DEAD_END);
+	}
+
+	public void checkInitializerExceptions(BlockScope currentScope,
+			FlowContext initializerContext, FlowInfo flowInfo) {
+		for (int i = 0; i < exceptionCount; i++) {
+			initializerContext.checkExceptionHandlers(thrownExceptions[i],
+					exceptionThrowers[i], exceptionThrowerFlowInfos[i],
+					currentScope);
+		}
 	}
 
-	public void checkInitializerExceptions(
-		BlockScope currentScope,
-		FlowContext initializerContext,
-		FlowInfo flowInfo) {
+	public String individualToString() {
+
+		StringBuffer buffer = new StringBuffer("Initialization flow context"); //$NON-NLS-1$
 		for (int i = 0; i < exceptionCount; i++) {
-			initializerContext.checkExceptionHandlers(
-				thrownExceptions[i],
-				exceptionThrowers[i],
-				exceptionThrowerFlowInfos[i],
-				currentScope);
+			buffer.append('[').append(thrownExceptions[i].readableName());
+			buffer.append('-').append(exceptionThrowerFlowInfos[i].toString())
+					.append(']');
 		}
+		return buffer.toString();
 	}
 
-	public void recordHandlingException(
-		ReferenceBinding exceptionType,
-		UnconditionalFlowInfo flowInfo,
-		TypeBinding raisedException,
-		AstNode invocationSite,
-		boolean wasMasked) {
-			
+	public void recordHandlingException(ReferenceBinding exceptionType,
+			UnconditionalFlowInfo flowInfo, TypeBinding raisedException,
+			ASTNode invocationSite, boolean wasMasked) {
+
+		// even if unreachable code, need to perform unhandled exception
+		// diagnosis
 		int size = thrownExceptions.length;
 		if (exceptionCount == size) {
-			System.arraycopy(
-				thrownExceptions,
-				0,
-				(thrownExceptions = new TypeBinding[size * 2]),
-				0,
-				size);
-			System.arraycopy(
-				exceptionThrowers,
-				0,
-				(exceptionThrowers = new AstNode[size * 2]),
-				0,
-				size);
-			System.arraycopy(
-				exceptionThrowerFlowInfos,
-				0,
-				(exceptionThrowerFlowInfos = new FlowInfo[size * 2]),
-				0,
-				size);
+			System.arraycopy(thrownExceptions, 0,
+					(thrownExceptions = new TypeBinding[size * 2]), 0, size);
+			System.arraycopy(exceptionThrowers, 0,
+					(exceptionThrowers = new ASTNode[size * 2]), 0, size);
+			System.arraycopy(exceptionThrowerFlowInfos, 0,
+					(exceptionThrowerFlowInfos = new FlowInfo[size * 2]), 0,
+					size);
 		}
 		thrownExceptions[exceptionCount] = raisedException;
 		exceptionThrowers[exceptionCount] = invocationSite;
 		exceptionThrowerFlowInfos[exceptionCount++] = flowInfo.copy();
-	}	
-}
\ No newline at end of file
+	}
+}