a small bugfix for list(,$var) case

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

diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/GlobalStatement.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/GlobalStatement.java
index f86f678..bb09275 100644 (file)
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/GlobalStatement.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ast/GlobalStatement.java
@@ -2,11 +2,16 @@ package net.sourceforge.phpdt.internal.compiler.ast;
 
 import net.sourceforge.phpdt.internal.compiler.parser.Outlineable;
 import net.sourceforge.phpdt.internal.ui.PHPUiImages;
+import net.sourceforge.phpeclipse.PHPeclipsePlugin;
 import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.jface.text.Position;
+import org.eclipse.core.runtime.CoreException;
 
 import java.util.List;
 import java.util.ArrayList;
+import java.util.Arrays;
+
+import test.PHPParserSuperclass;
 
 /**
  * A GlobalStatement statement in php.
@@ -37,7 +42,7 @@ public class GlobalStatement extends Statement implements Outlineable {
       if (i != 0) {
         buff.append(", ");//$NON-NLS-1$
       }
-      buff.append(variables[i]);
+      buff.append(variables[i].toStringExpression());
     }
     return buff.toString();
   }
@@ -69,7 +74,7 @@ public class GlobalStatement extends Statement implements Outlineable {
   public List getOutsideVariable() {
     final ArrayList list = new ArrayList(variables.length);
     for (int i = 0; i < variables.length; i++) {
-      list.addAll(variables[i].getModifiedVariable());
+      list.addAll(variables[i].getUsedVariable());
     }
     return list;
   }
@@ -89,4 +94,25 @@ public class GlobalStatement extends Statement implements Outlineable {
   public List getUsedVariable() {
     return new ArrayList(1);
   }
+
+  /**
+   * We will analyse the code.
+   * if we have in globals a special variable it will be reported as a warning.
+   * @see Variable#SPECIAL_VARS
+   */
+  public void analyzeCode() {
+    for (int i = 0; i < variables.length; i++) {
+      if (arrayContains(Variable.SPECIAL_VARS, variables[i].getName())) {
+        try {
+          PHPParserSuperclass.setMarker("warning, you shouldn't request " + variables[i].getName() + " as global",
+                                        variables[i].sourceStart,
+                                        variables[i].sourceEnd,
+                                        PHPParserSuperclass.WARNING,
+                                        "");
+        } catch (CoreException e) {
+          PHPeclipsePlugin.log(e);
+        }
+      }
+    }
+  }
 }