some bugfixes

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

diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/ArrayInitializer.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/ArrayInitializer.java
index 42ab9e4..ecabbc6 100644 (file)
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/ArrayInitializer.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/ArrayInitializer.java
@@ -28,17 +28,18 @@ public class ArrayInitializer extends Expression {
   public String toStringExpression() {
     final StringBuffer buff = new StringBuffer("array(");
     for (int i = 0; i < vars.length; i++) {
-      final ArrayVariableDeclaration var = vars[i];
       if (i != 0) {
         buff.append(",");
       }
-      buff.append(var.toStringExpression());
+      if (vars[i] != null) {
+        buff.append(vars[i].toStringExpression());
+      }
     }
     buff.append(")");
     return buff.toString();
   }
 
-             /**
+  /**
    * Get the variables from outside (parameters, globals ...)
    * @return the variables from outside
    */
@@ -53,7 +54,9 @@ public class ArrayInitializer extends Expression {
   public List getModifiedVariable() {
     final ArrayList list = new ArrayList();
     for (int i = 0; i < vars.length; i++) {
-      list.addAll(vars[i].getModifiedVariable());
+      if (vars[i] != null) {
+        list.addAll(vars[i].getModifiedVariable());
+      }
     }
     return list;
   }
@@ -65,7 +68,9 @@ public class ArrayInitializer extends Expression {
   public List getUsedVariable() {
     final ArrayList list = new ArrayList();
     for (int i = 0; i < vars.length; i++) {
-      list.addAll(vars[i].getUsedVariable());
+      if (vars[i] != null) {
+        list.addAll(vars[i].getUsedVariable());
+      }
     }
     return list;
   }