X-Git-Url: http://git.phpeclipse.com 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 d420454..d8a0199 100644 --- 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 @@ -1,5 +1,7 @@ package net.sourceforge.phpdt.internal.compiler.parser; +import java.util.Stack; + import net.sourceforge.phpdt.core.IJavaModelMarker; import net.sourceforge.phpdt.core.compiler.IProblem; import net.sourceforge.phpdt.internal.compiler.CompilationResult; @@ -7,7 +9,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; @@ -161,8 +162,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 @@ -265,9 +265,7 @@ 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]--; } @@ -330,9 +328,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]--; } @@ -368,9 +363,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]--; } @@ -389,52 +381,53 @@ public class UnitParser extends Parser { // A P I public void parse(MethodDeclaration md, CompilationUnitDeclaration unit) { - //only parse the method body of md - //fill out method statements - - //convert bugs into parse error - - if (md.isAbstract()) - return; - // if (md.isNative()) - // return; - // if ((md.modifiers & AccSemicolonBody) != 0) - // return; - - initialize(false); - goForMethodBody(); - nestedMethod[nestedType]++; - - referenceContext = md; - compilationUnit = unit; - - scanner.resetTo(md.sourceEnd + 1, md.declarationSourceEnd); - // reset the scanner to parser from { down to } - try { - parse(); - } catch (AbortCompilation ex) { - lastAct = ERROR_ACTION; - } catch (CoreException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } finally { - nestedMethod[nestedType]--; - } - - // if (lastAct == ERROR_ACTION) { - // return; - // } - // - // //refill statements - // md.explicitDeclarations = realBlockStack[realBlockPtr--]; - // int length; - // if ((length = astLengthStack[astLengthPtr--]) != 0) - // System.arraycopy( - // astStack, - // (astPtr -= length) + 1, - // md.statements = new Statement[length], - // 0, - // length); +// TODO jsurfer - make the parse process work on methods ? + return; + +// //only parse the method body of md +// //fill out method statements +// +// //convert bugs into parse error +// +// if (md.isAbstract()) +// return; +// // if (md.isNative()) +// // return; +// // if ((md.modifiers & AccSemicolonBody) != 0) +// // return; +// +// initialize(false); +// goForMethodBody(); +// nestedMethod[nestedType]++; +// +// referenceContext = md; +// compilationUnit = unit; +// +// scanner.resetTo(md.sourceEnd + 1, md.declarationSourceEnd); +// +// // reset the scanner to parser from { down to } +// try { +// parse(); +// } catch (AbortCompilation ex) { +// lastAct = ERROR_ACTION; +// } finally { +// nestedMethod[nestedType]--; +// } +// +// // if (lastAct == ERROR_ACTION) { +// // return; +// // } +// // +// // //refill statements +// // md.explicitDeclarations = realBlockStack[realBlockPtr--]; +// // int length; +// // if ((length = astLengthStack[astLengthPtr--]) != 0) +// // System.arraycopy( +// // astStack, +// // (astPtr -= length) + 1, +// // md.statements = new Statement[length], +// // 0, +// // length); } // A P I @@ -456,9 +449,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,7 +459,7 @@ public class UnitParser extends Parser { } public CompilationUnitDeclaration dietParse(ICompilationUnit sourceUnit, CompilationResult compilationResult) { - return dietParse(sourceUnit, compilationResult, true); + return dietParse(sourceUnit, compilationResult, false); } public CompilationUnitDeclaration dietParse(ICompilationUnit sourceUnit, CompilationResult compilationResult, boolean phpMode) {