Changes:

[phpeclipse.git] / net.sourceforge.phpeclipse / src / net / sourceforge / phpeclipse / phpeditor / PHPParserAction.java

diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/PHPParserAction.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/PHPParserAction.java
index e9376f5..3d78be7 100644 (file)
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/PHPParserAction.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/PHPParserAction.java
@@ -12,13 +12,14 @@ Contributors:
     Klaus Hartlage - www.eclipseproject.de
 **********************************************************************/
 
+import java.io.BufferedInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.List;
 
+import net.sourceforge.phpdt.internal.compiler.util.Util;
 import net.sourceforge.phpeclipse.PHPeclipsePlugin;
-import net.sourceforge.phpeclipse.phpeditor.phpparser.PHPParser;
 
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IMarker;
@@ -29,8 +30,11 @@ import org.eclipse.ui.IFileEditorInput;
 import org.eclipse.ui.texteditor.ITextEditor;
 import org.eclipse.ui.texteditor.TextEditorAction;
 
+import test.PHPParserManager;
+import test.PHPParserSuperclass;
+
 /**
- * Class that defines the action for parsing the current PHP file
+ * ClassDeclaration that defines the action for parsing the current PHP file
  */
 public class PHPParserAction extends TextEditorAction {
 
@@ -57,18 +61,27 @@ public class PHPParserAction extends TextEditorAction {
    */
   public void run() {
     boolean phpFlag = false;
+
+    //  try {
+    fileToParse = getPHPFile();
+    parseFile(fileToParse);
+  }
+
+  public static void parseFile(IFile fileToParse) {
+    boolean phpFlag = false;
     try {
-      fileToParse = getPHPFile();
+
       if (fileToParse == null) {
-        // should never happen
+        // TODO should never happen => should throw an exception
         System.err.println("Error : no file in the editor");
-        // should throw an exception
+
         return;
       }
-      String name = fileToParse.getName();
-      for (int i = 0; i<EXTENSIONS.length; i++) {
+      // TODO use isPHPFile()
+      String name = fileToParse.getName().toLowerCase();
+      for (int i = 0; i < EXTENSIONS.length; i++) {
         if (name.endsWith(EXTENSIONS[i])) {
-          phpFlag = true;  // php file extension
+          phpFlag = true; // php file extension
           break;
         }
       }
@@ -78,22 +91,23 @@ public class PHPParserAction extends TextEditorAction {
           // first delete all the previous markers
           fileToParse.deleteMarkers(IMarker.PROBLEM, false, 0);
 
-          try {
-            InputStream iStream = fileToParse.getContents();
-            //        int c = iStream.read();
-            parse(iStream);
-            iStream.close();
-          } catch (IOException e) {
-          }
+          //the tasks are removed here
+          fileToParse.deleteMarkers(IMarker.TASK, false, 0);
+
+          //                    try {
+          //                      InputStream iStream = fileToParse.getContents();
+          parse(fileToParse); //, iStream);
+          //                      iStream.close();
+          //                    } catch (IOException e) {
+          //                    }
         } else {
-          PHPParser.phpExternalParse(fileToParse);
+          PHPParserSuperclass.phpExternalParse(fileToParse);
         }
       }
     } catch (CoreException e) {
     }
 
   }
-
   /**
    * Finds the file that's currently opened in the PHP Text Editor
    */
@@ -137,7 +151,7 @@ public class PHPParserAction extends TextEditorAction {
   //    identifier.append((char) c);
   //    try {
   //      while ((c = iStream.read()) != (-1)) {
-  //        if (Character.isJavaIdentifierPart((char) c)) {
+  //        if (Scanner.isPHPIdentifierPart((char) c)) {
   //          identifier.append((char) c);
   //          //        } else if ((i == 0) && (c == '$')) {
   //          //          identifier.append((char)c);
@@ -151,23 +165,35 @@ public class PHPParserAction extends TextEditorAction {
   //    return identifier.toString();
   //  }
 
-  protected void parse(InputStream iStream) {
-
-    StringBuffer buf = new StringBuffer();
-    int c0;
-    try {
-      while ((c0 = iStream.read()) != (-1)) {
-        buf.append((char) c0);
-      }
-    } catch (IOException e) {
-      return;
-    }
-    String input = buf.toString();
-
-    PHPParser parser = new PHPParser(fileToParse);
+  protected static void parse(IFile fileToParse) {
+
+    //    StringBuffer buf = new StringBuffer();
+    //    int c0;
+    //    try {
+    //      while ((c0 = iStream.read()) != (-1)) {
+    //        buf.append((char) c0);
+    //      }
+    //    } catch (IOException e) {
+    //      return;
+    //    }
+    //    String input = buf.toString();
+
+    InputStream stream = null;
+    char[] charArray;
     try {
-      parser.parse(input);
+      stream = new BufferedInputStream(fileToParse.getContents());
+      charArray = Util.getInputStreamAsCharArray(stream, -1, null);
+      PHPParserSuperclass parser = PHPParserManager.getParser(fileToParse);
+      parser.parse(new String(charArray));
     } catch (CoreException e) {
+    } catch (IOException e) {
+    } finally {
+      try {
+       if (stream!=null) {
+          stream.close();
+       }
+      } catch (IOException e) {
+      }
     }
   }
 }
\ No newline at end of file