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

diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/LabeledStatement.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/LabeledStatement.java
index 8998f6b..3acad54 100644
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/LabeledStatement.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/LabeledStatement.java
@@ -1,126 +1,69 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2001, 2002 International Business Machines Corp. and others.
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Common Public License v0.5 
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v05.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.codegen.*;
-import net.sourceforge.phpdt.internal.compiler.flow.*;
-import net.sourceforge.phpdt.internal.compiler.lookup.*;
+import java.util.List;
 
-public class LabeledStatement extends Statement {
-	
-	public Statement statement;
-	public char[] label;
-	public Label targetLabel;
+/**
+ * @author Matthieu Casanova
+ */
+public final class LabeledStatement extends Statement {
 
-	// for local variables table attributes
-	int mergedInitStateIndex = -1;
-	
-	/**
-	 * LabeledStatement constructor comment.
-	 */
-	public LabeledStatement(char[] l, Statement st, int s, int e) {
-		
-		this.statement = st;
-		this.label = l;
-		this.sourceStart = s;
-		this.sourceEnd = e;
-	}
-	
-	public FlowInfo analyseCode(
-		BlockScope currentScope,
-		FlowContext flowContext,
-		FlowInfo flowInfo) {
+  private final String label;
 
-		// need to stack a context to store explicit label, answer inits in case of normal completion merged
-		// with those relative to the exit path from break statement occurring inside the labeled statement.
-		if (statement == null) {
-			return flowInfo;
-		} else {
-			LabelFlowContext labelContext;
-			FlowInfo mergedInfo =
-				statement
-					.analyseCode(
-						currentScope,
-						(labelContext =
-							new LabelFlowContext(
-								flowContext,
-								this,
-								label,
-								(targetLabel = new Label()),
-								currentScope)),
-						flowInfo)
-					.mergedWith(labelContext.initsOnBreak);
-			mergedInitStateIndex =
-				currentScope.methodScope().recordInitializationStates(mergedInfo);
-			return mergedInfo;
-		}
-	}
-	
-	public AstNode concreteStatement() {
-		
-		return statement.concreteStatement();
-	}
-	
-	/**
-	 * Code generation for labeled statement
-	 *
-	 * may not need actual source positions recording
-	 *
-	 * @param currentScope org.eclipse.jdt.internal.compiler.lookup.BlockScope
-	 * @param codeStream org.eclipse.jdt.internal.compiler.codegen.CodeStream
-	 */
-	public void generateCode(BlockScope currentScope, CodeStream codeStream) {
-		
-		int pc = codeStream.position;
-		if (targetLabel != null) {
-			targetLabel.codeStream = codeStream;
-			if (statement != null) {
-				statement.generateCode(currentScope, codeStream);
-			}
-			targetLabel.place();
-		}
-		// May loose some local variable initializations : affecting the local variable attributes
-		if (mergedInitStateIndex != -1) {
-			codeStream.removeNotDefinitelyAssignedVariables(
-				currentScope,
-				mergedInitStateIndex);
-		}
-		codeStream.recordPositionsFrom(pc, this.sourceStart);
-	}
-	
-	public void resolve(BlockScope scope) {
-		
-		statement.resolve(scope);
-	}
-	
-	public String toString(int tab) {
+  private final Statement statement;
 
-		String s = tabString(tab);
-		s += new String(label) + ": " + statement.toString(0); //$NON-NLS-1$
-		return s;
-	}
+  public LabeledStatement(final String label,
+                          final Statement statement,
+                          final int sourceStart,
+                          final int sourceEnd) {
+    super(sourceStart, sourceEnd);
+    this.label = label;
+    this.statement = statement;
+  }
 
-	public void traverse(
-		IAbstractSyntaxTreeVisitor visitor,
-		BlockScope blockScope) {
+  /**
+   * Return the object into String.
+   * It should be overriden
+   * 
+   * @return a String
+   */
+  public String toString() {
+    return label + statement.toString();
+  }
 
-		if (visitor.visit(this, blockScope)) {
-			statement.traverse(visitor, blockScope);
-		}
-		visitor.endVisit(this, blockScope);
-	}
+  /**
+   * Return the object into String.
+   * 
+   * @param tab how many tabs (not used here
+   * @return a String
+   */
+  public String toString(final int tab) {
+    return tabString(tab) + toString();
+  }
 
-	public void resetStateForCodeGeneration() {
+  /**
+   * Get the variables from outside (parameters, globals ...)
+   *
+   * @param list the list where we will put variables
+   */
+  public void getOutsideVariable(final List list) {
+    statement.getOutsideVariable(list);
+  }
 
-		this.targetLabel.resetStateForCodeGeneration();
-	}
-}
\ No newline at end of file
+  /**
+   * get the modified variables.
+   *
+   * @param list the list where we will put variables
+   */
+  public void getModifiedVariable(final List list) {
+    statement.getModifiedVariable(list);
+  }
+
+  /**
+   * Get the variables used.
+   *
+   * @param list the list where we will put variables
+   */
+  public void getUsedVariable(final List list) {
+    statement.getUsedVariable(list);
+  }
+}