added index manager to the new builder;

[phpeclipse.git] / net.sourceforge.phpeclipse / src / net / sourceforge / phpdt / internal / compiler / parser / UnitParser.java

diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/parser/UnitParser.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/parser/UnitParser.java
index 2da0761..f8ec712 100644 (file)
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/parser/UnitParser.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/parser/UnitParser.java
@@ -7,7 +7,6 @@ import net.sourceforge.phpdt.internal.compiler.env.ICompilationUnit;
 import net.sourceforge.phpdt.internal.compiler.problem.AbortCompilation;
 import net.sourceforge.phpdt.internal.compiler.problem.ProblemReporter;
 import net.sourceforge.phpdt.internal.compiler.util.Util;
-import net.sourceforge.phpdt.internal.core.BasicCompilationUnit;
 import net.sourceforge.phpeclipse.internal.compiler.ast.CompilationUnitDeclaration;
 import net.sourceforge.phpeclipse.internal.compiler.ast.ConstructorDeclaration;
 import net.sourceforge.phpeclipse.internal.compiler.ast.FieldDeclaration;
@@ -77,8 +76,8 @@ public class UnitParser extends Parser {
     firstToken = TokenNameMINUS_MINUS;
     scanner.recordLineSeparator = false;
   }
-  public void initialize() {
-    super.initialize();
+  public void initialize(boolean phpMode) {
+    super.initialize(phpMode);
     //positionning the parser for a new compilation unit
     //avoiding stack reallocation and all that....
     //         astPtr = -1;
@@ -132,13 +131,13 @@ public class UnitParser extends Parser {
 
   // A P I
 
-  public CompilationUnitDeclaration parse(ICompilationUnit sourceUnit, CompilationResult compilationResult) {
+  public CompilationUnitDeclaration parse(ICompilationUnit sourceUnit, CompilationResult compilationResult, boolean phpMode) {
     // parses a compilation unit and manages error handling (even bugs....)
 
     CompilationUnitDeclaration unit;
     try {
       /* automaton initialization */
-      initialize();
+      initialize(phpMode);
       goForCompilationUnit();
 
       /* scanner initialization */
@@ -161,8 +160,7 @@ public class UnitParser extends Parser {
 //        storeProblemsFor(((BasicCompilationUnit)sourceUnit).getResource(), compilationResult.getAllProblems());
 //      }
 //      // jsurfer end
-    } catch (CoreException e) {
-      e.printStackTrace();
+    
     } finally {
       unit = compilationUnit;
       compilationUnit = null; // reset parser
@@ -253,7 +251,7 @@ public class UnitParser extends Parser {
 
     //convert bugs into parse error
 
-    initialize();
+    initialize(false);
     goForConstructorBody();
     nestedMethod[nestedType]++;
 
@@ -265,15 +263,13 @@ public class UnitParser extends Parser {
       parse();
     } catch (AbortCompilation ex) {
       lastAct = ERROR_ACTION;
-    } catch (CoreException e) {
-      // TODO Auto-generated catch block
-      e.printStackTrace();
+    
     } finally {
       nestedMethod[nestedType]--;
     }
 
     if (lastAct == ERROR_ACTION) {
-      initialize();
+      initialize(false);
       return;
     }
 
@@ -317,7 +313,7 @@ public class UnitParser extends Parser {
 
     //convert bugs into parse error
 
-    initialize();
+    initialize(false);
     goForExpression();
     nestedMethod[nestedType]++;
 
@@ -330,9 +326,6 @@ public class UnitParser extends Parser {
       parse();
     } catch (AbortCompilation ex) {
       lastAct = ERROR_ACTION;
-    } catch (CoreException e) {
-      // TODO Auto-generated catch block
-      e.printStackTrace();
     } finally {
       nestedMethod[nestedType]--;
     }
@@ -356,7 +349,7 @@ public class UnitParser extends Parser {
 
     //convert bugs into parse error
 
-    initialize();
+    initialize(false);
     goForInitializer();
     nestedMethod[nestedType]++;
 
@@ -368,9 +361,6 @@ public class UnitParser extends Parser {
       parse();
     } catch (AbortCompilation ex) {
       lastAct = ERROR_ACTION;
-    } catch (CoreException e) {
-      // TODO Auto-generated catch block
-      e.printStackTrace();
     } finally {
       nestedMethod[nestedType]--;
     }
@@ -401,7 +391,7 @@ public class UnitParser extends Parser {
     // if ((md.modifiers & AccSemicolonBody) != 0)
     //         return;
 
-    initialize();
+    initialize(false);
     goForMethodBody();
     nestedMethod[nestedType]++;
 
@@ -414,9 +404,6 @@ public class UnitParser extends Parser {
       parse();
     } catch (AbortCompilation ex) {
       lastAct = ERROR_ACTION;
-    } catch (CoreException e) {
-      // TODO Auto-generated catch block
-      e.printStackTrace();
     } finally {
       nestedMethod[nestedType]--;
     }
@@ -445,7 +432,7 @@ public class UnitParser extends Parser {
     CompilationUnitDeclaration unit;
     try {
       /* automaton initialization */
-      initialize();
+      initialize(false);
       goForCompilationUnit();
 
       /* scanner initialization */
@@ -456,9 +443,6 @@ public class UnitParser extends Parser {
         compilationUnit = new CompilationUnitDeclaration(problemReporter, compilationResult, scanner.source.length);
       /* run automaton */
       parse();
-    } catch (CoreException e) {
-      // TODO Auto-generated catch block
-      e.printStackTrace();
     } catch (SyntaxError syntaxError) {
       // 
     } finally {
@@ -469,12 +453,15 @@ public class UnitParser extends Parser {
   }
 
   public CompilationUnitDeclaration dietParse(ICompilationUnit sourceUnit, CompilationResult compilationResult) {
+       return dietParse(sourceUnit, compilationResult, false);
+  }
+  public CompilationUnitDeclaration dietParse(ICompilationUnit sourceUnit, CompilationResult compilationResult, boolean phpMode) {
 
     CompilationUnitDeclaration parsedUnit;
     boolean old = diet;
     try {
       diet = true;
-      parsedUnit = parse(sourceUnit, compilationResult);
+      parsedUnit = parse(sourceUnit, compilationResult, phpMode);
     } finally {
       diet = old;
     }