1) Fixed calculation of the new indentation method of splitted strings.

[phpeclipse.git] / net.sourceforge.phpeclipse / src / net / sourceforge / phpdt / internal / compiler / flow / InsideSubRoutineFlowContext.java

diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/flow/InsideSubRoutineFlowContext.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/flow/InsideSubRoutineFlowContext.java
index 3ed888f..bc3b10f 100644 (file)
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/flow/InsideSubRoutineFlowContext.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/flow/InsideSubRoutineFlowContext.java
@@ -1,42 +1,60 @@
 /*******************************************************************************
- * 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;
 
 /**
- * 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 InsideSubRoutineFlowContext extends FlowContext {
 
        public UnconditionalFlowInfo initsOnReturn;
-       
-       public InsideSubRoutineFlowContext(
-               FlowContext parent,
-               AstNode associatedNode) {
+
+       public InsideSubRoutineFlowContext(FlowContext parent,
+                       ASTNode associatedNode) {
                super(parent, associatedNode);
-               this.initsOnReturn = FlowInfo.DeadEnd;                          
+               this.initsOnReturn = FlowInfo.DEAD_END;
        }
-       
-       public boolean isNonReturningContext() {
-               return associatedNode.cannotReturn();
+
+       public String individualToString() {
+
+               StringBuffer buffer = new StringBuffer("Inside SubRoutine flow context"); //$NON-NLS-1$
+               buffer
+                               .append("[initsOnReturn -").append(initsOnReturn.toString()).append(']'); //$NON-NLS-1$
+               return buffer.toString();
+       }
+
+       public UnconditionalFlowInfo initsOnReturn() {
+               return this.initsOnReturn;
        }
-       
-       public AstNode subRoutine() {
+
+//     public boolean isNonReturningContext() {
+//             return associatedNode.cannotReturn();
+//     }
+
+       public ASTNode subRoutine() {
                return associatedNode;
        }
-       
-       public void recordReturnFrom(UnconditionalFlowInfo flowInfo) {
-               // record initializations which were performed at the return point
-               initsOnReturn = initsOnReturn.mergedWith(flowInfo);
+
+       public void recordReturnFrom(FlowInfo flowInfo) {
+
+               if (!flowInfo.isReachable())
+                       return;
+               if (initsOnReturn == FlowInfo.DEAD_END) {
+                       initsOnReturn = flowInfo.copy().unconditionalInits();
+               } else {
+                       initsOnReturn = initsOnReturn.mergedWith(flowInfo
+                                       .unconditionalInits());
+               }
        }
-}
\ No newline at end of file
+}