little bugfixes

[phpeclipse.git] / net.sourceforge.phpeclipse / src / net / sourceforge / phpdt / internal / compiler / ast / Continue.java

diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/Continue.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/Continue.java
index de89d0a..16c3fcd 100644 (file)
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/Continue.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/Continue.java
@@ -1,112 +1,20 @@
-/*******************************************************************************
- * 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.flow.FlowContext;
-import net.sourceforge.phpdt.internal.compiler.flow.FlowInfo;
-import net.sourceforge.phpdt.internal.compiler.lookup.BlockScope;
-
+/**
+ * A continue statement.
+ * @author Matthieu Casanova
+ */
 public class Continue extends BranchStatement {
 
-       public Continue(char[] l, int s, int e) {
-               
-               super(l, s, e);
-       }
-       
-       public FlowInfo analyseCode(
-               BlockScope currentScope,
-               FlowContext flowContext,
-               FlowInfo flowInfo) {
-
-               // here requires to generate a sequence of finally blocks invocations depending corresponding
-               // to each of the traversed try statements, so that execution will terminate properly.
-
-               // lookup the label, this should answer the returnContext
-               FlowContext targetContext;
-               if (label == null) {
-                       targetContext = flowContext.getTargetContextForDefaultContinue();
-               } else {
-                       targetContext = flowContext.getTargetContextForContinueLabel(label);
-               }
-               if (targetContext == null) {
-                       if (label == null) {
-                               currentScope.problemReporter().invalidContinue(this);
-                       } else {
-                               currentScope.problemReporter().undefinedLabel(this); // need to improve
-                       }
-               } else {
-                       if (targetContext == FlowContext.NotContinuableContext) {
-                               currentScope.problemReporter().invalidContinue(this);
-                               return FlowInfo.DeadEnd;
-                       }
-                       targetLabel = targetContext.continueLabel();
-                       targetContext.recordContinueFrom(flowInfo);
-                       FlowContext traversedContext = flowContext;
-                       int subIndex = 0, maxSub = 5;
-                       subroutines = new AstNode[maxSub];
-                       while (true) {
-                               AstNode sub;
-                               if ((sub = traversedContext.subRoutine()) != null) {
-                                       if (subIndex == maxSub) {
-                                               System.arraycopy(
-                                                       subroutines,
-                                                       0,
-                                                       (subroutines = new AstNode[maxSub *= 2]),
-                                                       0,
-                                                       subIndex);
-                                               // grow
-                                       }
-                                       subroutines[subIndex++] = sub;
-                                       if (sub.cannotReturn()) {
-                                               break;
-                                       }
-                               }
-                               // remember the initialization at this
-                               // point for dealing with blank final variables.
-                               traversedContext.recordReturnFrom(flowInfo.unconditionalInits());
-
-                               if (traversedContext == targetContext) {
-                                       break;
-                               } else {
-                                       traversedContext = traversedContext.parent;
-                               }
-                       }
-                       // resize subroutines
-                       if (subIndex != maxSub) {
-                               System.arraycopy(
-                                       subroutines,
-                                       0,
-                                       (subroutines = new AstNode[subIndex]),
-                                       0,
-                                       subIndex);
-                       }
-               }
-               return FlowInfo.DeadEnd;
-       }
-
-       public String toString(int tab) {
-
-               String s = tabString(tab);
-               s = s + "continue "; //$NON-NLS-1$
-               if (label != null)
-                       s = s + new String(label);
-               return s;
-       }
-
-       public void traverse(
-               IAbstractSyntaxTreeVisitor visitor,
-               BlockScope blockScope) {
+  public Continue(final Expression expression, final int sourceStart, final int sourceEnd) {
+    super(expression, sourceStart, sourceEnd);
+  }
 
-               visitor.visit(this, blockScope);
-               visitor.endVisit(this, blockScope);
+  public String toString(final int tab) {
+    final String s = tabString(tab);
+    if (expression == null) {
+      return s + "continue";//$NON-NLS-1$
+    }
+    return s + "continue " + expression.toString();//$NON-NLS-1$
        }
-}
\ No newline at end of file
+}