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

diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/Block.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/Block.java
index 2e00658..ac3cdb5 100644
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/Block.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/Block.java
@@ -1,160 +1,82 @@
-/*******************************************************************************
- * 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;
 
+/**
+ * A Block.
+ * {
+ * statements
+ * }.
+ * @author Matthieu Casanova
+ */
 public class Block extends Statement {
-	
-	public Statement[] statements;
-	public int explicitDeclarations;
-	// the number of explicit declaration , used to create scope
-	public BlockScope scope;
-	public static final Block None = new Block(0);
-	
-	public Block(int explicitDeclarations) {
-		this.explicitDeclarations = explicitDeclarations;
-	}
-	
-	public FlowInfo analyseCode(
-		BlockScope currentScope,
-		FlowContext flowContext,
-		FlowInfo flowInfo) {
 
-		// empty block
-		if (statements == null)
-			return flowInfo;
-		for (int i = 0, max = statements.length; i < max; i++) {
-			Statement stat;
-			if (!flowInfo.complainIfUnreachable((stat = statements[i]), scope)) {
-				flowInfo = stat.analyseCode(scope, flowContext, flowInfo);
-			}
-		}
-		return flowInfo;
-	}
-
-	public static final Block EmptyWith(int sourceStart, int sourceEnd) {
-
-		//return an empty block which position is s and e
-		Block bk = new Block(0);
-		bk.sourceStart = sourceStart;
-		bk.sourceEnd = sourceEnd;
-		return bk;
-	}
-
-	/**
-	 * Code generation for a block
-	 */
-	public void generateCode(BlockScope currentScope, CodeStream codeStream) {
-
-		if ((bits & IsReachableMASK) == 0) {
-			return;
-		}
-		int pc = codeStream.position;
-		if (statements != null) {
-			for (int i = 0, max = statements.length; i < max; i++) {
-				statements[i].generateCode(scope, codeStream);
-			}
-		} // for local variable debug attributes
-		if (scope != currentScope) { // was really associated with its own scope
-			codeStream.exitUserScope(scope);
-		}
-		codeStream.recordPositionsFrom(pc, this.sourceStart);
-	}
-
-	public boolean isEmptyBlock() {
-
-		return statements == null;
-	}
-
-	public void resolve(BlockScope upperScope) {
-
-		if (statements != null) {
-			scope =
-				explicitDeclarations == 0
-					? upperScope
-					: new BlockScope(upperScope, explicitDeclarations);
-			int i = 0, length = statements.length;
-			while (i < length)
-				statements[i++].resolve(scope);
-		}
-	}
-
-	public void resolveUsing(BlockScope givenScope) {
-
-		// this optimized resolve(...) is sent only on none empty blocks
-		scope = givenScope;
-		if (statements != null) {
-			int i = 0, length = statements.length;
-			while (i < length)
-				statements[i++].resolve(scope);
-		}
-	}
-
-	public String toString(int tab) {
-
-		String s = tabString(tab);
-		if (this.statements == null) {
-			s += "{\n"; //$NON-NLS-1$
-			s += tabString(tab);
-			s += "}"; //$NON-NLS-1$
-			return s;
-		}
-		s += "{\n"; //$NON-NLS-1$
-		s += this.toStringStatements(tab);
-		s += tabString(tab);
-		s += "}"; //$NON-NLS-1$
-		return s;
-	}
-
-	public String toStringStatements(int tab) {
-
-		if (this.statements == null)
-			return ""; //$NON-NLS-1$
-		StringBuffer buffer = new StringBuffer();
-		for (int i = 0; i < statements.length; i++) {
-			buffer.append(statements[i].toString(tab + 1));
-			if (statements[i] instanceof Block) {
-				buffer.append("\n"); //$NON-NLS-1$
-			} else {
-				buffer.append(";\n"); //$NON-NLS-1$
-			}
-		};
-		return buffer.toString();
-	}
-
-	public void traverse(
-		IAbstractSyntaxTreeVisitor visitor,
-		BlockScope blockScope) {
-
-		if (visitor.visit(this, blockScope)) {
-			if (statements != null) {
-				int statementLength = statements.length;
-				for (int i = 0; i < statementLength; i++)
-					statements[i].traverse(visitor, scope);
-			}
-		}
-		visitor.endVisit(this, blockScope);
-	}
-	
-	/**
-	 * Dispatch the call on its last statement.
-	 */
-	public void branchChainTo(Label label) {
-		 if (this.statements != null) {
-		 	this.statements[statements.length - 1].branchChainTo(label);
-		 }
-	}
-	
-}
\ No newline at end of file
+  /** An array of statements inside the block. */
+  public Statement[] statements;
+
+  /**
+   * Create a block.
+   * @param statements the statements
+   * @param sourceStart starting offset
+   * @param sourceEnd ending offset
+   */
+  public Block(final Statement[] statements,
+               final int sourceStart,
+               final int sourceEnd) {
+    super(sourceStart, sourceEnd);
+    this.statements = statements;
+  }
+
+  /**
+   * tell if the block is empty.
+   * @return the block is empty if there are no statements in it
+   */
+  public boolean isEmptyBlock() {
+    return statements == null;
+  }
+
+  /**
+   * Return the block as String.
+   * @param tab how many tabs
+   * @return the string representation of the block
+   */
+  public String toString(final int tab) {
+    final String s = AstNode.tabString(tab);
+    final StringBuffer buff = new StringBuffer(s);
+    buff.append("{\n"); //$NON-NLS-1$
+    if (this.statements != null) {
+      for (int i = 0; i < statements.length; i++) {
+        buff.append(statements[i].toString(tab + 1)).append(";\n");//$NON-NLS-1$
+      }
+    }
+    buff.append("}\n"); //$NON-NLS-1$
+    return buff.toString();
+  }
+
+  /**
+   * Get the variables from outside (parameters, globals ...)
+   */
+  public void getOutsideVariable(final List list) {
+    for (int i = 0; i < statements.length; i++) {
+      statements[i].getOutsideVariable(list);
+    }
+  }
+
+  /**
+   * get the modified variables.
+   */
+  public void getModifiedVariable(final List list) {
+    for (int i = 0; i < statements.length; i++) {
+      statements[i].getModifiedVariable(list);
+    }
+  }
+
+  /**
+   * Get the variables used.
+   */
+  public void getUsedVariable(final List list) {
+    for (int i = 0; i < statements.length; i++) {
+      statements[i].getUsedVariable(list);
+    }
+  }
+}