From: khartlage <khartlage>
Date: Thu, 10 Jun 2004 12:48:29 +0000 (+0000)
Subject: - added include declarations to Outline view
X-Git-Url: http://git.phpeclipse.com

- added include declarations to Outline view
- removed output to /bin subfolder in the builds
- "Open Include file" from editor
---

diff --git a/net.sourceforge.phpeclipse/build.properties b/net.sourceforge.phpeclipse/build.properties
index 18a879d..0a3443e 100644
--- a/net.sourceforge.phpeclipse/build.properties
+++ b/net.sourceforge.phpeclipse/build.properties
@@ -1 +1,11 @@
 source.phpeclipse.jar = src/
+bin.includes = phpeclipse.jar,\
+               bin/,\
+               .classpath,\
+               .project,\
+               .template,\
+               TODO,\
+               icons/,\
+               install.txt,\
+               plugin.properties,\
+               plugin.xml
diff --git a/net.sourceforge.phpeclipse/icons/obj16/impc_obj.gif b/net.sourceforge.phpeclipse/icons/obj16/impc_obj.gif
new file mode 100644
index 0000000..ea94702
Binary files /dev/null and b/net.sourceforge.phpeclipse/icons/obj16/impc_obj.gif differ
diff --git a/net.sourceforge.phpeclipse/plugin.xml b/net.sourceforge.phpeclipse/plugin.xml
index 0eb9dd0..2605ebe 100644
--- a/net.sourceforge.phpeclipse/plugin.xml
+++ b/net.sourceforge.phpeclipse/plugin.xml
@@ -186,14 +186,14 @@
             Create a new PHP project.
          </description>
       </wizard>
-  	 <wizard
+ <!-- 	 <wizard
 		id="net.sourceforge.phpdt.internal.ui.wizards.NewClassCreationWizard"
 		name="%NewPHPClass.label"
 		class="net.sourceforge.phpdt.internal.ui.wizards.NewClassCreationWizard"
 		category="net.sourceforge.phpeclipse.wizards.NewWizardCategoryPHP"
 		icon="icons/ctool16/newclass_wiz.gif">
 		<description>%NewPHPClass.description</description>
-	</wizard>      
+	</wizard>      -->
 <!--
 <this wizard replaces it as it works - maybe not as pretty but still>
 
diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/core/ICompilationUnit.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/core/ICompilationUnit.java
index b00a4e5..c25a7cc 100644
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/core/ICompilationUnit.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/core/ICompilationUnit.java
@@ -10,9 +10,9 @@
  *******************************************************************************/
 package net.sourceforge.phpdt.core;
 
+import net.sourceforge.phpdt.internal.core.ImportContainer;
+
 import org.eclipse.core.runtime.IProgressMonitor;
-import net.sourceforge.phpdt.core.IProblemRequestor;
-import net.sourceforge.phpdt.core.JavaModelException;
 
 
 
@@ -243,7 +243,7 @@ IJavaElement getElementAt(int position) throws JavaModelException;
  * @return a handle onto the corresponding import container. The 
  *		import contain may or may not exist.
  */
-//IImportContainer getImportContainer();
+ImportContainer getImportContainer();
 /**
  * Returns the import declarations in this compilation unit
  * in the order in which they appear in the source. This is
diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ISourceElementRequestor.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ISourceElementRequestor.java
index c929ee1..58c2541 100644
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ISourceElementRequestor.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/ISourceElementRequestor.java
@@ -51,11 +51,11 @@ public interface ISourceElementRequestor {
    *             is never included in the name.
    * @param onDemand set to true if the import is an import on demand (e.g. import java.io.*). False otherwise.
    */
-  //void acceptImport(
-  //	int declarationStart,
-  //	int declarationEnd,
-  //	char[] name,
-  //	boolean onDemand);
+  void acceptImport(
+  	int declarationStart,
+  	int declarationEnd,
+  	char[] name,
+  	boolean onDemand);
   /*
    * Table of line separator position. This table is passed once at the end
    * of the parse action, so as to allow computation of normalized ranges.
diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/SourceElementParser.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/SourceElementParser.java
index b66cb71..21df17c 100644
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/SourceElementParser.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/SourceElementParser.java
@@ -31,6 +31,7 @@ import net.sourceforge.phpeclipse.internal.compiler.ast.CompilationUnitDeclarati
 import net.sourceforge.phpeclipse.internal.compiler.ast.ConstructorDeclaration;
 import net.sourceforge.phpeclipse.internal.compiler.ast.ExplicitConstructorCall;
 import net.sourceforge.phpeclipse.internal.compiler.ast.FieldDeclaration;
+import net.sourceforge.phpeclipse.internal.compiler.ast.ImportReference;
 import net.sourceforge.phpeclipse.internal.compiler.ast.LocalTypeDeclaration;
 import net.sourceforge.phpeclipse.internal.compiler.ast.MemberTypeDeclaration;
 import net.sourceforge.phpeclipse.internal.compiler.ast.MethodDeclaration;
@@ -39,8 +40,6 @@ import net.sourceforge.phpeclipse.internal.compiler.ast.QualifiedAllocationExpre
 import net.sourceforge.phpeclipse.internal.compiler.ast.TypeDeclaration;
 import net.sourceforge.phpeclipse.internal.compiler.ast.TypeReference;
 
-
-
 /**
  * A source element parser extracts structural and reference information
  * from a piece of source.
@@ -60,1259 +59,1255 @@ import net.sourceforge.phpeclipse.internal.compiler.ast.TypeReference;
  * Any (parsing) problem encountered is also provided.
  */
 
-public class SourceElementParser  extends CommentRecorderParser {//extends UnitParser {
-	
-	ISourceElementRequestor requestor;
-	int fieldCount;
-	int localIntPtr;
-	int lastFieldEndPosition;
-	ISourceType sourceType;
-	boolean reportReferenceInfo;
-	char[][] typeNames; 
-	char[][] superTypeNames;
-	int nestedTypeIndex;
-	static final char[] JAVA_LANG_OBJECT = "java.lang.Object".toCharArray(); //$NON-NLS-1$
-	NameReference[] unknownRefs;
-	int unknownRefsCounter;
-	LocalDeclarationVisitor localDeclarationVisitor = null;
-//	CompilerOptions options;
-	
-/**
- * An ast visitor that visits local type declarations.
- */
-public class LocalDeclarationVisitor extends AbstractSyntaxTreeVisitorAdapter {
-//	public boolean visit(
-//			AnonymousLocalTypeDeclaration anonymousTypeDeclaration,
-//			BlockScope scope) {
-//		notifySourceElementRequestor(anonymousTypeDeclaration, sourceType == null);
-//		return false; // don't visit members as this was done during notifySourceElementRequestor(...)
-//	}
-	public boolean visit(LocalTypeDeclaration typeDeclaration, BlockScope scope) {
-		notifySourceElementRequestor(typeDeclaration, sourceType == null);
-		return false; // don't visit members as this was done during notifySourceElementRequestor(...)
-	}
-	public boolean visit(MemberTypeDeclaration typeDeclaration, ClassScope scope) {
-		notifySourceElementRequestor(typeDeclaration, sourceType == null);
-		return false; // don't visit members as this was done during notifySourceElementRequestor(...)
-	}
-	
-}
+public class SourceElementParser extends CommentRecorderParser {//extends
+                                                                // UnitParser {
 
-public SourceElementParser(
-	final ISourceElementRequestor requestor, 
-	IProblemFactory problemFactory,
- 	CompilerOptions options) {
-	// we want to notify all syntax error with the acceptProblem API
-	// To do so, we define the record method of the ProblemReporter
-	super(
-	new ProblemReporter(
-		DefaultErrorHandlingPolicies.exitAfterAllProblems(),
- 		options, 
-		problemFactory) {
-		public void record(IProblem problem, CompilationResult unitResult, ReferenceContext referenceContext) {
-			unitResult.record(problem, referenceContext);
-			requestor.acceptProblem(problem);
-		}
-	});
-//	true);
-//	options.sourceLevel >= CompilerOptions.JDK1_4);
-	this.requestor = requestor;
-	typeNames = new char[4][];
-	superTypeNames = new char[4][];
-	nestedTypeIndex = 0;
-	this.options = options;
-}
+  ISourceElementRequestor requestor;
+  int fieldCount;
+  int localIntPtr;
+  int lastFieldEndPosition;
+  ISourceType sourceType;
+  boolean reportReferenceInfo;
+  char[][] typeNames;
+  char[][] superTypeNames;
+  int nestedTypeIndex;
+  static final char[] JAVA_LANG_OBJECT = "java.lang.Object".toCharArray(); //$NON-NLS-1$
+  NameReference[] unknownRefs;
+  int unknownRefsCounter;
+  LocalDeclarationVisitor localDeclarationVisitor = null;
+  //	CompilerOptions options;
 
-/** @deprecated use SourceElementParser(ISourceElementRequestor, IProblemFactory, CompilerOptions) */
-//public SourceElementParser(
-//	final ISourceElementRequestor requestor, 
-//	IProblemFactory problemFactory) {
-//		this(requestor, problemFactory, new CompilerOptions());
-//}
+  /**
+   * An ast visitor that visits local type declarations.
+   */
+  public class LocalDeclarationVisitor extends AbstractSyntaxTreeVisitorAdapter {
+    //	public boolean visit(
+    //			AnonymousLocalTypeDeclaration anonymousTypeDeclaration,
+    //			BlockScope scope) {
+    //		notifySourceElementRequestor(anonymousTypeDeclaration, sourceType ==
+    // null);
+    //		return false; // don't visit members as this was done during
+    // notifySourceElementRequestor(...)
+    //	}
+    public boolean visit(LocalTypeDeclaration typeDeclaration, BlockScope scope) {
+      notifySourceElementRequestor(typeDeclaration, sourceType == null);
+      return false; // don't visit members as this was done during
+                    // notifySourceElementRequestor(...)
+    }
+    public boolean visit(MemberTypeDeclaration typeDeclaration, ClassScope scope) {
+      notifySourceElementRequestor(typeDeclaration, sourceType == null);
+      return false; // don't visit members as this was done during
+                    // notifySourceElementRequestor(...)
+    }
 
-//public SourceElementParser(
-//	final ISourceElementRequestor requestor, 
-//	IProblemFactory problemFactory,
-//	CompilerOptions options,
-//	boolean reportLocalDeclarations) {
-//		this(requestor, problemFactory, options);
-//		if (reportLocalDeclarations) {
-//			this.localDeclarationVisitor = new LocalDeclarationVisitor();
-//		}
-//}
+  }
 
-//public void checkAnnotation() {
-//	int firstCommentIndex = scanner.commentPtr;
-//
-//	super.checkAnnotation();
-//
-//	// modify the modifier source start to point at the first comment
-//	if (firstCommentIndex >= 0) {
-//		modifiersSourceStart = scanner.commentStarts[0]; 
-//	}
-//}
+  public SourceElementParser(final ISourceElementRequestor requestor, IProblemFactory problemFactory, CompilerOptions options) {
+    // we want to notify all syntax error with the acceptProblem API
+    // To do so, we define the record method of the ProblemReporter
+    super(new ProblemReporter(DefaultErrorHandlingPolicies.exitAfterAllProblems(), options, problemFactory) {
+      public void record(IProblem problem, CompilationResult unitResult, ReferenceContext referenceContext) {
+        unitResult.record(problem, referenceContext);
+        requestor.acceptProblem(problem);
+      }
+    });
+    //	true);
+    //	options.sourceLevel >= CompilerOptions.JDK1_4);
+    this.requestor = requestor;
+    typeNames = new char[4][];
+    superTypeNames = new char[4][];
+    nestedTypeIndex = 0;
+    this.options = options;
+  }
 
-//protected void classInstanceCreation(boolean alwaysQualified) {
-//
-//	boolean previousFlag = reportReferenceInfo;
-//	reportReferenceInfo = false; // not to see the type reference reported in super call to getTypeReference(...)
-//	super.classInstanceCreation(alwaysQualified);
-//	reportReferenceInfo = previousFlag;
-//	if (reportReferenceInfo){
-//		AllocationExpression alloc = (AllocationExpression)expressionStack[expressionPtr];
-//		TypeReference typeRef = alloc.type;
-//		requestor.acceptConstructorReference(
-//			typeRef instanceof SingleTypeReference 
-//				? ((SingleTypeReference) typeRef).token
-//				: CharOperation.concatWith(alloc.type.getTypeName(), '.'),
-//			alloc.arguments == null ? 0 : alloc.arguments.length, 
-//			alloc.sourceStart);
-//	}
-//}
-//protected void consumeConstructorHeaderName() {
-//	// ConstructorHeaderName ::=  Modifiersopt 'Identifier' '('
-//
-//	/* recovering - might be an empty message send */
-//	if (currentElement != null){
-//		if (lastIgnoredToken == TokenNamenew){ // was an allocation expression
-//			lastCheckPoint = scanner.startPosition; // force to restart at this exact position				
-//			restartRecovery = true;
-//			return;
-//		}
-//	}
-//	SourceConstructorDeclaration cd = new SourceConstructorDeclaration(this.compilationUnit.compilationResult);
-//
-//	//name -- this is not really revelant but we do .....
-//	cd.selector = identifierStack[identifierPtr];
-//	long selectorSourcePositions = identifierPositionStack[identifierPtr--];
-//	identifierLengthPtr--;
-//
-//	//modifiers
-//	cd.declarationSourceStart = intStack[intPtr--];
-//	cd.modifiers = intStack[intPtr--];
-//
-//	//highlight starts at the selector starts
-//	cd.sourceStart = (int) (selectorSourcePositions >>> 32);
-//	cd.selectorSourceEnd = (int) selectorSourcePositions;
-//	pushOnAstStack(cd);
-//
-//	cd.sourceEnd = lParenPos;
-//	cd.bodyStart = lParenPos+1;
-//	listLength = 0; // initialize listLength before reading parameters/throws
-//
-//	// recovery
-//	if (currentElement != null){
-//		lastCheckPoint = cd.bodyStart;
-//		if ((currentElement instanceof RecoveredType && lastIgnoredToken != TokenNameDOT)
-//			|| cd.modifiers != 0){
-//			currentElement = currentElement.add(cd, 0);
-//			lastIgnoredToken = -1;
-//		}
-//	}	
-//}
-///**
-// *
-// * INTERNAL USE-ONLY
-// */
-//protected void consumeExitVariableWithInitialization() {
-//	// ExitVariableWithInitialization ::= $empty
-//	// the scanner is located after the comma or the semi-colon.
-//	// we want to include the comma or the semi-colon
-//	super.consumeExitVariableWithInitialization();
-//	if (isLocalDeclaration() || ((currentToken != TokenNameCOMMA) && (currentToken != TokenNameSEMICOLON)))
-//		return;
-//	((SourceFieldDeclaration) astStack[astPtr]).fieldEndPosition = scanner.currentPosition - 1;
-//}
-//protected void consumeExitVariableWithoutInitialization() {
-//	// ExitVariableWithoutInitialization ::= $empty
-//	// do nothing by default
-//	super.consumeExitVariableWithoutInitialization();
-//	if (isLocalDeclaration() || ((currentToken != TokenNameCOMMA) && (currentToken != TokenNameSEMICOLON)))
-//		return;
-//	((SourceFieldDeclaration) astStack[astPtr]).fieldEndPosition = scanner.currentPosition - 1;
-//}
-///**
-// *
-// * INTERNAL USE-ONLY
-// */
-//protected void consumeFieldAccess(boolean isSuperAccess) {
-//	// FieldAccess ::= Primary '.' 'Identifier'
-//	// FieldAccess ::= 'super' '.' 'Identifier'
-//	super.consumeFieldAccess(isSuperAccess);
-//	FieldReference fr = (FieldReference) expressionStack[expressionPtr];
-//	if (reportReferenceInfo) {
-//		requestor.acceptFieldReference(fr.token, fr.sourceStart);
-//	}
-//}
-//protected void consumeMethodHeaderName() {
-//	// MethodHeaderName ::= Modifiersopt Type 'Identifier' '('
-//	SourceMethodDeclaration md = new SourceMethodDeclaration(this.compilationUnit.compilationResult);
-//
-//	//name
-//	md.selector = identifierStack[identifierPtr];
-//	long selectorSourcePositions = identifierPositionStack[identifierPtr--];
-//	identifierLengthPtr--;
-//	//type
-//	md.returnType = getTypeReference(intStack[intPtr--]);
-//	//modifiers
-//	md.declarationSourceStart = intStack[intPtr--];
-//	md.modifiers = intStack[intPtr--];
-//
-//	//highlight starts at selector start
-//	md.sourceStart = (int) (selectorSourcePositions >>> 32);
-//	md.selectorSourceEnd = (int) selectorSourcePositions;
-//	pushOnAstStack(md);
-//	md.sourceEnd = lParenPos;
-//	md.bodyStart = lParenPos+1;
-//	listLength = 0; // initialize listLength before reading parameters/throws
-//	
-//	// recovery
-//	if (currentElement != null){
-//		if (currentElement instanceof RecoveredType 
-//			//|| md.modifiers != 0
-//			|| (scanner.getLineNumber(md.returnType.sourceStart)
-//					== scanner.getLineNumber(md.sourceStart))){
-//			lastCheckPoint = md.bodyStart;
-//			currentElement = currentElement.add(md, 0);
-//			lastIgnoredToken = -1;			
-//		} else {
-//			lastCheckPoint = md.sourceStart;
-//			restartRecovery = true;
-//		}
-//	}		
-//}
-///**
-// *
-// * INTERNAL USE-ONLY
-// */
-//protected void consumeMethodInvocationName() {
-//	// MethodInvocation ::= Name '(' ArgumentListopt ')'
-//
-//	// when the name is only an identifier...we have a message send to "this" (implicit)
-//	super.consumeMethodInvocationName();
-//	MessageSend messageSend = (MessageSend) expressionStack[expressionPtr];
-//	Expression[] args = messageSend.arguments;
-//	if (reportReferenceInfo) {
-//		requestor.acceptMethodReference(
-//			messageSend.selector, 
-//			args == null ? 0 : args.length, 
-//			(int)(messageSend.nameSourcePosition >>> 32));
-//	}
-//}
-///**
-// *
-// * INTERNAL USE-ONLY
-// */
-//protected void consumeMethodInvocationPrimary() {
-//	super.consumeMethodInvocationPrimary();
-//	MessageSend messageSend = (MessageSend) expressionStack[expressionPtr];
-//	Expression[] args = messageSend.arguments;
-//	if (reportReferenceInfo) {
-//		requestor.acceptMethodReference(
-//			messageSend.selector, 
-//			args == null ? 0 : args.length, 
-//			(int)(messageSend.nameSourcePosition >>> 32));
-//	}
-//}
-///**
-// *
-// * INTERNAL USE-ONLY
-// */
-//protected void consumeMethodInvocationSuper() {
-//	// MethodInvocation ::= 'super' '.' 'Identifier' '(' ArgumentListopt ')'
-//	super.consumeMethodInvocationSuper();
-//	MessageSend messageSend = (MessageSend) expressionStack[expressionPtr];
-//	Expression[] args = messageSend.arguments;
-//	if (reportReferenceInfo) {
-//		requestor.acceptMethodReference(
-//			messageSend.selector, 
-//			args == null ? 0 : args.length, 
-//			(int)(messageSend.nameSourcePosition >>> 32));
-//	}
-//}
-//protected void consumeSingleTypeImportDeclarationName() {
-//	// SingleTypeImportDeclarationName ::= 'import' Name
-//	/* push an ImportRef build from the last name 
-//	stored in the identifier stack. */
-//
-//	super.consumeSingleTypeImportDeclarationName();
-//	ImportReference impt = (ImportReference)astStack[astPtr];
-//	if (reportReferenceInfo) {
-//		requestor.acceptTypeReference(impt.tokens, impt.sourceStart, impt.sourceEnd);
-//	}
-//}
-//protected void consumeTypeImportOnDemandDeclarationName() {
-//	// TypeImportOnDemandDeclarationName ::= 'import' Name '.' '*'
-//	/* push an ImportRef build from the last name 
-//	stored in the identifier stack. */
-//
-//	super.consumeTypeImportOnDemandDeclarationName();
-//	ImportReference impt = (ImportReference)astStack[astPtr];
-//	if (reportReferenceInfo) {
-//		requestor.acceptUnknownReference(impt.tokens, impt.sourceStart, impt.sourceEnd);
-//	}
-//}
-//protected FieldDeclaration createFieldDeclaration(Expression initialization, char[] name, int sourceStart, int sourceEnd) {
-//	return new SourceFieldDeclaration(null, name, sourceStart, sourceEnd);
-//}
-//protected CompilationUnitDeclaration endParse(int act) {
-//	if (sourceType != null) {
-//		if (sourceType.isInterface()) {
-//			consumeInterfaceDeclaration();
-//		} else {
-//			consumeClassDeclaration();
-//		}
-//	}
-//	if (compilationUnit != null) {
-//		CompilationUnitDeclaration result = super.endParse(act);
-//		return result;
-//	} else {
-//		return null;
-//	}		
-//}
-/*
- * Flush annotations defined prior to a given positions.
- *
- * Note: annotations are stacked in syntactical order
- *
- * Either answer given <position>, or the end position of a comment line 
- * immediately following the <position> (same line)
- *
- * e.g.
- * void foo(){
- * } // end of method foo
- */
-// 
-//public int flushAnnotationsDefinedPriorTo(int position) {
-//
-//	return lastFieldEndPosition = super.flushAnnotationsDefinedPriorTo(position);
-//}
-//public TypeReference getTypeReference(int dim) {
-//	/* build a Reference on a variable that may be qualified or not
-//	 * This variable is a type reference and dim will be its dimensions
-//	 */
-//	int length;
-//	if ((length = identifierLengthStack[identifierLengthPtr--]) == 1) {
-//		// single variable reference
-//		if (dim == 0) {
-//			SingleTypeReference ref = 
-//				new SingleTypeReference(
-//					identifierStack[identifierPtr], 
-//					identifierPositionStack[identifierPtr--]);
-//			if (reportReferenceInfo) {
-//				requestor.acceptTypeReference(ref.token, ref.sourceStart);
-//			}
-//			return ref;
-//		} else {
-//			ArrayTypeReference ref = 
-//				new ArrayTypeReference(
-//					identifierStack[identifierPtr], 
-//					dim, 
-//					identifierPositionStack[identifierPtr--]); 
-//			ref.sourceEnd = endPosition;
-//			if (reportReferenceInfo) {
-//				requestor.acceptTypeReference(ref.token, ref.sourceStart);
-//			}
-//			return ref;
-//		}
-//	} else {
-//		if (length < 0) { //flag for precompiled type reference on base types
-//			TypeReference ref = TypeReference.baseTypeReference(-length, dim);
-//			ref.sourceStart = intStack[intPtr--];
-//			if (dim == 0) {
-//				ref.sourceEnd = intStack[intPtr--];
-//			} else {
-//				intPtr--; // no need to use this position as it is an array
-//				ref.sourceEnd = endPosition;
-//			}
-//			if (reportReferenceInfo){
-//					requestor.acceptTypeReference(ref.getTypeName(), ref.sourceStart, ref.sourceEnd);
-//			}
-//			return ref;
-//		} else { //Qualified variable reference
-//			char[][] tokens = new char[length][];
-//			identifierPtr -= length;
-//			long[] positions = new long[length];
-//			System.arraycopy(identifierStack, identifierPtr + 1, tokens, 0, length);
-//			System.arraycopy(
-//				identifierPositionStack, 
-//				identifierPtr + 1, 
-//				positions, 
-//				0, 
-//				length); 
-//			if (dim == 0) {
-//				QualifiedTypeReference ref = new QualifiedTypeReference(tokens, positions);
-//				if (reportReferenceInfo) {
-//					requestor.acceptTypeReference(ref.tokens, ref.sourceStart, ref.sourceEnd);
-//				}
-//				return ref;
-//			} else {
-//				ArrayQualifiedTypeReference ref = 
-//					new ArrayQualifiedTypeReference(tokens, dim, positions); 
-//				ref.sourceEnd = endPosition;					
-//				if (reportReferenceInfo) {
-//					requestor.acceptTypeReference(ref.tokens, ref.sourceStart, ref.sourceEnd);
-//				}
-//				return ref;
-//			}
-//		}
-//	}
-//}
-//public NameReference getUnspecifiedReference() {
-//	/* build a (unspecified) NameReference which may be qualified*/
-//
-//	int length;
-//	if ((length = identifierLengthStack[identifierLengthPtr--]) == 1) {
-//		// single variable reference
-//		SingleNameReference ref = 
-//			new SingleNameReference(
-//				identifierStack[identifierPtr], 
-//				identifierPositionStack[identifierPtr--]); 
-//		if (reportReferenceInfo) {
-//			this.addUnknownRef(ref);
-//		}
-//		return ref;
-//	} else {
-//		//Qualified variable reference
-//		char[][] tokens = new char[length][];
-//		identifierPtr -= length;
-//		System.arraycopy(identifierStack, identifierPtr + 1, tokens, 0, length);
-//		QualifiedNameReference ref = 
-//			new QualifiedNameReference(
-//				tokens, 
-//				(int) (identifierPositionStack[identifierPtr + 1] >> 32), // sourceStart
-//				(int) identifierPositionStack[identifierPtr + length]); // sourceEnd
-//		if (reportReferenceInfo) {
-//			this.addUnknownRef(ref);
-//		}
-//		return ref;
-//	}
-//}
-//public NameReference getUnspecifiedReferenceOptimized() {
-//	/* build a (unspecified) NameReference which may be qualified
-//	The optimization occurs for qualified reference while we are
-//	certain in this case the last item of the qualified name is
-//	a field access. This optimization is IMPORTANT while it results
-//	that when a NameReference is build, the type checker should always
-//	look for that it is not a type reference */
-//
-//	int length;
-//	if ((length = identifierLengthStack[identifierLengthPtr--]) == 1) {
-//		// single variable reference
-//		SingleNameReference ref = 
-//			new SingleNameReference(
-//				identifierStack[identifierPtr], 
-//				identifierPositionStack[identifierPtr--]); 
-//		ref.bits &= ~AstNode.RestrictiveFlagMASK;
-//		ref.bits |= LOCAL | FIELD;
-//		if (reportReferenceInfo) {
-//			this.addUnknownRef(ref);
-//		}
-//		return ref;
-//	}
-//
-//	//Qualified-variable-reference
-//	//In fact it is variable-reference DOT field-ref , but it would result in a type
-//	//conflict tha can be only reduce by making a superclass (or inetrface ) between
-//	//nameReference and FiledReference or putting FieldReference under NameReference
-//	//or else..........This optimisation is not really relevant so just leave as it is
-//
-//	char[][] tokens = new char[length][];
-//	identifierPtr -= length;
-//	System.arraycopy(identifierStack, identifierPtr + 1, tokens, 0, length);
-//	QualifiedNameReference ref = 
-//		new QualifiedNameReference(
-//			tokens, 
-//			(int) (identifierPositionStack[identifierPtr + 1] >> 32), 
-//	// sourceStart
-//	 (int) identifierPositionStack[identifierPtr + length]); // sourceEnd
-//	ref.bits &= ~AstNode.RestrictiveFlagMASK;
-//	ref.bits |= LOCAL | FIELD;
-//	if (reportReferenceInfo) {
-//		this.addUnknownRef(ref);
-//	}
-//	return ref;
-//}
-///**
-// *
-// * INTERNAL USE-ONLY
-// */
-//private boolean isLocalDeclaration() {
-//	int nestedDepth = nestedType;
-//	while (nestedDepth >= 0) {
-//		if (nestedMethod[nestedDepth] != 0) {
-//			return true;
-//		}
-//		nestedDepth--;
-//	}
-//	return false;
-//}
-/*
- * Update the bodyStart of the corresponding parse node
- */
-public void notifySourceElementRequestor(CompilationUnitDeclaration parsedUnit) {
-	if (parsedUnit == null) {
-		// when we parse a single type member declaration the compilation unit is null, but we still
-		// want to be able to notify the requestor on the created ast node
-		if (astStack[0] instanceof AbstractMethodDeclaration) {
-			notifySourceElementRequestor((AbstractMethodDeclaration) astStack[0]);
-			return;
-		}
-		return;
-	}
-	// range check
-	boolean isInRange = 
-				scanner.initialPosition <= parsedUnit.sourceStart
-				&& scanner.eofPosition >= parsedUnit.sourceEnd;
-	
-//	if (reportReferenceInfo) {
-//		notifyAllUnknownReferences();
-//	}
-	// collect the top level ast nodes
-	int length = 0;
-	AstNode[] nodes = null;
-	if (sourceType == null){
-		if (isInRange) {
-			requestor.enterCompilationUnit();
-		}
-//		ImportReference currentPackage = parsedUnit.currentPackage;
-//		ImportReference[] imports = parsedUnit.imports;
-//		TypeDeclaration[] types = parsedUnit.types;
-		ArrayList types = parsedUnit.types;
-		if (types != null) {
-//		length = 
-//			(currentPackage == null ? 0 : 1) 
-//			+ (imports == null ? 0 : imports.length)
-//			+ (types == null ? 0 : types.length);
-//		nodes = new AstNode[length];
-			length = types.size();
-		nodes = new AstNode[length];
-		int index = 0;
-//		if (currentPackage != null) {
-//			nodes[index++] = currentPackage;
-//		}
-//		if (imports != null) {
-//			for (int i = 0, max = imports.length; i < max; i++) {
-//				nodes[index++] = imports[i];
-//			}
-//		}
+  /**
+   * @deprecated use SourceElementParser(ISourceElementRequestor,
+   *             IProblemFactory, CompilerOptions)
+   */
+  //public SourceElementParser(
+  //	final ISourceElementRequestor requestor,
+  //	IProblemFactory problemFactory) {
+  //		this(requestor, problemFactory, new CompilerOptions());
+  //}
+  //public SourceElementParser(
+  //	final ISourceElementRequestor requestor,
+  //	IProblemFactory problemFactory,
+  //	CompilerOptions options,
+  //	boolean reportLocalDeclarations) {
+  //		this(requestor, problemFactory, options);
+  //		if (reportLocalDeclarations) {
+  //			this.localDeclarationVisitor = new LocalDeclarationVisitor();
+  //		}
+  //}
+  //public void checkAnnotation() {
+  //	int firstCommentIndex = scanner.commentPtr;
+  //
+  //	super.checkAnnotation();
+  //
+  //	// modify the modifier source start to point at the first comment
+  //	if (firstCommentIndex >= 0) {
+  //		modifiersSourceStart = scanner.commentStarts[0];
+  //	}
+  //}
+  //protected void classInstanceCreation(boolean alwaysQualified) {
+  //
+  //	boolean previousFlag = reportReferenceInfo;
+  //	reportReferenceInfo = false; // not to see the type reference reported in
+  // super call to getTypeReference(...)
+  //	super.classInstanceCreation(alwaysQualified);
+  //	reportReferenceInfo = previousFlag;
+  //	if (reportReferenceInfo){
+  //		AllocationExpression alloc =
+  // (AllocationExpression)expressionStack[expressionPtr];
+  //		TypeReference typeRef = alloc.type;
+  //		requestor.acceptConstructorReference(
+  //			typeRef instanceof SingleTypeReference
+  //				? ((SingleTypeReference) typeRef).token
+  //				: CharOperation.concatWith(alloc.type.getTypeName(), '.'),
+  //			alloc.arguments == null ? 0 : alloc.arguments.length,
+  //			alloc.sourceStart);
+  //	}
+  //}
+  //protected void consumeConstructorHeaderName() {
+  //	// ConstructorHeaderName ::= Modifiersopt 'Identifier' '('
+  //
+  //	/* recovering - might be an empty message send */
+  //	if (currentElement != null){
+  //		if (lastIgnoredToken == TokenNamenew){ // was an allocation expression
+  //			lastCheckPoint = scanner.startPosition; // force to restart at this exact
+  // position
+  //			restartRecovery = true;
+  //			return;
+  //		}
+  //	}
+  //	SourceConstructorDeclaration cd = new
+  // SourceConstructorDeclaration(this.compilationUnit.compilationResult);
+  //
+  //	//name -- this is not really revelant but we do .....
+  //	cd.selector = identifierStack[identifierPtr];
+  //	long selectorSourcePositions = identifierPositionStack[identifierPtr--];
+  //	identifierLengthPtr--;
+  //
+  //	//modifiers
+  //	cd.declarationSourceStart = intStack[intPtr--];
+  //	cd.modifiers = intStack[intPtr--];
+  //
+  //	//highlight starts at the selector starts
+  //	cd.sourceStart = (int) (selectorSourcePositions >>> 32);
+  //	cd.selectorSourceEnd = (int) selectorSourcePositions;
+  //	pushOnAstStack(cd);
+  //
+  //	cd.sourceEnd = lParenPos;
+  //	cd.bodyStart = lParenPos+1;
+  //	listLength = 0; // initialize listLength before reading parameters/throws
+  //
+  //	// recovery
+  //	if (currentElement != null){
+  //		lastCheckPoint = cd.bodyStart;
+  //		if ((currentElement instanceof RecoveredType && lastIgnoredToken !=
+  // TokenNameDOT)
+  //			|| cd.modifiers != 0){
+  //			currentElement = currentElement.add(cd, 0);
+  //			lastIgnoredToken = -1;
+  //		}
+  //	}
+  //}
+  ///**
+  // *
+  // * INTERNAL USE-ONLY
+  // */
+  //protected void consumeExitVariableWithInitialization() {
+  //	// ExitVariableWithInitialization ::= $empty
+  //	// the scanner is located after the comma or the semi-colon.
+  //	// we want to include the comma or the semi-colon
+  //	super.consumeExitVariableWithInitialization();
+  //	if (isLocalDeclaration() || ((currentToken != TokenNameCOMMA) &&
+  // (currentToken != TokenNameSEMICOLON)))
+  //		return;
+  //	((SourceFieldDeclaration) astStack[astPtr]).fieldEndPosition =
+  // scanner.currentPosition - 1;
+  //}
+  //protected void consumeExitVariableWithoutInitialization() {
+  //	// ExitVariableWithoutInitialization ::= $empty
+  //	// do nothing by default
+  //	super.consumeExitVariableWithoutInitialization();
+  //	if (isLocalDeclaration() || ((currentToken != TokenNameCOMMA) &&
+  // (currentToken != TokenNameSEMICOLON)))
+  //		return;
+  //	((SourceFieldDeclaration) astStack[astPtr]).fieldEndPosition =
+  // scanner.currentPosition - 1;
+  //}
+  ///**
+  // *
+  // * INTERNAL USE-ONLY
+  // */
+  //protected void consumeFieldAccess(boolean isSuperAccess) {
+  //	// FieldAccess ::= Primary '.' 'Identifier'
+  //	// FieldAccess ::= 'super' '.' 'Identifier'
+  //	super.consumeFieldAccess(isSuperAccess);
+  //	FieldReference fr = (FieldReference) expressionStack[expressionPtr];
+  //	if (reportReferenceInfo) {
+  //		requestor.acceptFieldReference(fr.token, fr.sourceStart);
+  //	}
+  //}
+  //protected void consumeMethodHeaderName() {
+  //	// MethodHeaderName ::= Modifiersopt Type 'Identifier' '('
+  //	SourceMethodDeclaration md = new
+  // SourceMethodDeclaration(this.compilationUnit.compilationResult);
+  //
+  //	//name
+  //	md.selector = identifierStack[identifierPtr];
+  //	long selectorSourcePositions = identifierPositionStack[identifierPtr--];
+  //	identifierLengthPtr--;
+  //	//type
+  //	md.returnType = getTypeReference(intStack[intPtr--]);
+  //	//modifiers
+  //	md.declarationSourceStart = intStack[intPtr--];
+  //	md.modifiers = intStack[intPtr--];
+  //
+  //	//highlight starts at selector start
+  //	md.sourceStart = (int) (selectorSourcePositions >>> 32);
+  //	md.selectorSourceEnd = (int) selectorSourcePositions;
+  //	pushOnAstStack(md);
+  //	md.sourceEnd = lParenPos;
+  //	md.bodyStart = lParenPos+1;
+  //	listLength = 0; // initialize listLength before reading parameters/throws
+  //	
+  //	// recovery
+  //	if (currentElement != null){
+  //		if (currentElement instanceof RecoveredType
+  //			//|| md.modifiers != 0
+  //			|| (scanner.getLineNumber(md.returnType.sourceStart)
+  //					== scanner.getLineNumber(md.sourceStart))){
+  //			lastCheckPoint = md.bodyStart;
+  //			currentElement = currentElement.add(md, 0);
+  //			lastIgnoredToken = -1;
+  //		} else {
+  //			lastCheckPoint = md.sourceStart;
+  //			restartRecovery = true;
+  //		}
+  //	}
+  //}
+  ///**
+  // *
+  // * INTERNAL USE-ONLY
+  // */
+  //protected void consumeMethodInvocationName() {
+  //	// MethodInvocation ::= Name '(' ArgumentListopt ')'
+  //
+  //	// when the name is only an identifier...we have a message send to "this"
+  // (implicit)
+  //	super.consumeMethodInvocationName();
+  //	MessageSend messageSend = (MessageSend) expressionStack[expressionPtr];
+  //	Expression[] args = messageSend.arguments;
+  //	if (reportReferenceInfo) {
+  //		requestor.acceptMethodReference(
+  //			messageSend.selector,
+  //			args == null ? 0 : args.length,
+  //			(int)(messageSend.nameSourcePosition >>> 32));
+  //	}
+  //}
+  ///**
+  // *
+  // * INTERNAL USE-ONLY
+  // */
+  //protected void consumeMethodInvocationPrimary() {
+  //	super.consumeMethodInvocationPrimary();
+  //	MessageSend messageSend = (MessageSend) expressionStack[expressionPtr];
+  //	Expression[] args = messageSend.arguments;
+  //	if (reportReferenceInfo) {
+  //		requestor.acceptMethodReference(
+  //			messageSend.selector,
+  //			args == null ? 0 : args.length,
+  //			(int)(messageSend.nameSourcePosition >>> 32));
+  //	}
+  //}
+  ///**
+  // *
+  // * INTERNAL USE-ONLY
+  // */
+  //protected void consumeMethodInvocationSuper() {
+  //	// MethodInvocation ::= 'super' '.' 'Identifier' '(' ArgumentListopt ')'
+  //	super.consumeMethodInvocationSuper();
+  //	MessageSend messageSend = (MessageSend) expressionStack[expressionPtr];
+  //	Expression[] args = messageSend.arguments;
+  //	if (reportReferenceInfo) {
+  //		requestor.acceptMethodReference(
+  //			messageSend.selector,
+  //			args == null ? 0 : args.length,
+  //			(int)(messageSend.nameSourcePosition >>> 32));
+  //	}
+  //}
+  //protected void consumeSingleTypeImportDeclarationName() {
+  //	// SingleTypeImportDeclarationName ::= 'import' Name
+  //	/* push an ImportRef build from the last name
+  //	stored in the identifier stack. */
+  //
+  //	super.consumeSingleTypeImportDeclarationName();
+  //	ImportReference impt = (ImportReference)astStack[astPtr];
+  //	if (reportReferenceInfo) {
+  //		requestor.acceptTypeReference(impt.tokens, impt.sourceStart,
+  // impt.sourceEnd);
+  //	}
+  //}
+  //protected void consumeTypeImportOnDemandDeclarationName() {
+  //	// TypeImportOnDemandDeclarationName ::= 'import' Name '.' '*'
+  //	/* push an ImportRef build from the last name
+  //	stored in the identifier stack. */
+  //
+  //	super.consumeTypeImportOnDemandDeclarationName();
+  //	ImportReference impt = (ImportReference)astStack[astPtr];
+  //	if (reportReferenceInfo) {
+  //		requestor.acceptUnknownReference(impt.tokens, impt.sourceStart,
+  // impt.sourceEnd);
+  //	}
+  //}
+  //protected FieldDeclaration createFieldDeclaration(Expression
+  // initialization, char[] name, int sourceStart, int sourceEnd) {
+  //	return new SourceFieldDeclaration(null, name, sourceStart, sourceEnd);
+  //}
+  //protected CompilationUnitDeclaration endParse(int act) {
+  //	if (sourceType != null) {
+  //		if (sourceType.isInterface()) {
+  //			consumeInterfaceDeclaration();
+  //		} else {
+  //			consumeClassDeclaration();
+  //		}
+  //	}
+  //	if (compilationUnit != null) {
+  //		CompilationUnitDeclaration result = super.endParse(act);
+  //		return result;
+  //	} else {
+  //		return null;
+  //	}
+  //}
+  /*
+   * Flush annotations defined prior to a given positions.
+   * 
+   * Note: annotations are stacked in syntactical order
+   * 
+   * Either answer given <position>, or the end position of a comment line
+   * immediately following the <position> (same line)
+   * 
+   * e.g. void foo(){ } // end of method foo
+   */
+  // 
+  //public int flushAnnotationsDefinedPriorTo(int position) {
+  //
+  //	return lastFieldEndPosition =
+  // super.flushAnnotationsDefinedPriorTo(position);
+  //}
+  //public TypeReference getTypeReference(int dim) {
+  //	/* build a Reference on a variable that may be qualified or not
+  //	 * This variable is a type reference and dim will be its dimensions
+  //	 */
+  //	int length;
+  //	if ((length = identifierLengthStack[identifierLengthPtr--]) == 1) {
+  //		// single variable reference
+  //		if (dim == 0) {
+  //			SingleTypeReference ref =
+  //				new SingleTypeReference(
+  //					identifierStack[identifierPtr],
+  //					identifierPositionStack[identifierPtr--]);
+  //			if (reportReferenceInfo) {
+  //				requestor.acceptTypeReference(ref.token, ref.sourceStart);
+  //			}
+  //			return ref;
+  //		} else {
+  //			ArrayTypeReference ref =
+  //				new ArrayTypeReference(
+  //					identifierStack[identifierPtr],
+  //					dim,
+  //					identifierPositionStack[identifierPtr--]);
+  //			ref.sourceEnd = endPosition;
+  //			if (reportReferenceInfo) {
+  //				requestor.acceptTypeReference(ref.token, ref.sourceStart);
+  //			}
+  //			return ref;
+  //		}
+  //	} else {
+  //		if (length < 0) { //flag for precompiled type reference on base types
+  //			TypeReference ref = TypeReference.baseTypeReference(-length, dim);
+  //			ref.sourceStart = intStack[intPtr--];
+  //			if (dim == 0) {
+  //				ref.sourceEnd = intStack[intPtr--];
+  //			} else {
+  //				intPtr--; // no need to use this position as it is an array
+  //				ref.sourceEnd = endPosition;
+  //			}
+  //			if (reportReferenceInfo){
+  //					requestor.acceptTypeReference(ref.getTypeName(), ref.sourceStart,
+  // ref.sourceEnd);
+  //			}
+  //			return ref;
+  //		} else { //Qualified variable reference
+  //			char[][] tokens = new char[length][];
+  //			identifierPtr -= length;
+  //			long[] positions = new long[length];
+  //			System.arraycopy(identifierStack, identifierPtr + 1, tokens, 0, length);
+  //			System.arraycopy(
+  //				identifierPositionStack,
+  //				identifierPtr + 1,
+  //				positions,
+  //				0,
+  //				length);
+  //			if (dim == 0) {
+  //				QualifiedTypeReference ref = new QualifiedTypeReference(tokens, positions);
+  //				if (reportReferenceInfo) {
+  //					requestor.acceptTypeReference(ref.tokens, ref.sourceStart, ref.sourceEnd);
+  //				}
+  //				return ref;
+  //			} else {
+  //				ArrayQualifiedTypeReference ref =
+  //					new ArrayQualifiedTypeReference(tokens, dim, positions);
+  //				ref.sourceEnd = endPosition;
+  //				if (reportReferenceInfo) {
+  //					requestor.acceptTypeReference(ref.tokens, ref.sourceStart, ref.sourceEnd);
+  //				}
+  //				return ref;
+  //			}
+  //		}
+  //	}
+  //}
+  //public NameReference getUnspecifiedReference() {
+  //	/* build a (unspecified) NameReference which may be qualified*/
+  //
+  //	int length;
+  //	if ((length = identifierLengthStack[identifierLengthPtr--]) == 1) {
+  //		// single variable reference
+  //		SingleNameReference ref =
+  //			new SingleNameReference(
+  //				identifierStack[identifierPtr],
+  //				identifierPositionStack[identifierPtr--]);
+  //		if (reportReferenceInfo) {
+  //			this.addUnknownRef(ref);
+  //		}
+  //		return ref;
+  //	} else {
+  //		//Qualified variable reference
+  //		char[][] tokens = new char[length][];
+  //		identifierPtr -= length;
+  //		System.arraycopy(identifierStack, identifierPtr + 1, tokens, 0, length);
+  //		QualifiedNameReference ref =
+  //			new QualifiedNameReference(
+  //				tokens,
+  //				(int) (identifierPositionStack[identifierPtr + 1] >> 32), // sourceStart
+  //				(int) identifierPositionStack[identifierPtr + length]); // sourceEnd
+  //		if (reportReferenceInfo) {
+  //			this.addUnknownRef(ref);
+  //		}
+  //		return ref;
+  //	}
+  //}
+  //public NameReference getUnspecifiedReferenceOptimized() {
+  //	/* build a (unspecified) NameReference which may be qualified
+  //	The optimization occurs for qualified reference while we are
+  //	certain in this case the last item of the qualified name is
+  //	a field access. This optimization is IMPORTANT while it results
+  //	that when a NameReference is build, the type checker should always
+  //	look for that it is not a type reference */
+  //
+  //	int length;
+  //	if ((length = identifierLengthStack[identifierLengthPtr--]) == 1) {
+  //		// single variable reference
+  //		SingleNameReference ref =
+  //			new SingleNameReference(
+  //				identifierStack[identifierPtr],
+  //				identifierPositionStack[identifierPtr--]);
+  //		ref.bits &= ~AstNode.RestrictiveFlagMASK;
+  //		ref.bits |= LOCAL | FIELD;
+  //		if (reportReferenceInfo) {
+  //			this.addUnknownRef(ref);
+  //		}
+  //		return ref;
+  //	}
+  //
+  //	//Qualified-variable-reference
+  //	//In fact it is variable-reference DOT field-ref , but it would result in a
+  // type
+  //	//conflict tha can be only reduce by making a superclass (or inetrface )
+  // between
+  //	//nameReference and FiledReference or putting FieldReference under
+  // NameReference
+  //	//or else..........This optimisation is not really relevant so just leave
+  // as it is
+  //
+  //	char[][] tokens = new char[length][];
+  //	identifierPtr -= length;
+  //	System.arraycopy(identifierStack, identifierPtr + 1, tokens, 0, length);
+  //	QualifiedNameReference ref =
+  //		new QualifiedNameReference(
+  //			tokens,
+  //			(int) (identifierPositionStack[identifierPtr + 1] >> 32),
+  //	// sourceStart
+  //	 (int) identifierPositionStack[identifierPtr + length]); // sourceEnd
+  //	ref.bits &= ~AstNode.RestrictiveFlagMASK;
+  //	ref.bits |= LOCAL | FIELD;
+  //	if (reportReferenceInfo) {
+  //		this.addUnknownRef(ref);
+  //	}
+  //	return ref;
+  //}
+  ///**
+  // *
+  // * INTERNAL USE-ONLY
+  // */
+  //private boolean isLocalDeclaration() {
+  //	int nestedDepth = nestedType;
+  //	while (nestedDepth >= 0) {
+  //		if (nestedMethod[nestedDepth] != 0) {
+  //			return true;
+  //		}
+  //		nestedDepth--;
+  //	}
+  //	return false;
+  //}
+  /*
+   * Update the bodyStart of the corresponding parse node
+   */
+  public void notifySourceElementRequestor(CompilationUnitDeclaration parsedUnit) {
+    if (parsedUnit == null) {
+      // when we parse a single type member declaration the compilation unit is
+      // null, but we still
+      // want to be able to notify the requestor on the created ast node
+      if (astStack[0] instanceof AbstractMethodDeclaration) {
+        notifySourceElementRequestor((AbstractMethodDeclaration) astStack[0]);
+        return;
+      }
+      return;
+    }
+    // range check
+    boolean isInRange = scanner.initialPosition <= parsedUnit.sourceStart && scanner.eofPosition >= parsedUnit.sourceEnd;
 
-			for (int i = 0, max = types.size(); i < max; i++) {
-				nodes[index++] = (AstNode)types.get(i);
-			}
-		}
-	} else {
-//		TypeDeclaration[] types = parsedUnit.types;
-    ArrayList types = parsedUnit.types;
-		if (types != null) {
-			length = types.size();
-			nodes = new AstNode[length];
-			for (int i = 0, max = types.size(); i < max; i++) {
-				nodes[i] = (AstNode)types.get(i);
-			}
-		}
-	}
-	
-	// notify the nodes in the syntactical order
-	if (nodes != null && length > 0) {
-		quickSort(nodes, 0, length-1);
-		for (int i=0;i<length;i++) {
-			AstNode node = nodes[i];
-//			if (node instanceof ImportReference) {
-//				ImportReference importRef = (ImportReference)node;
-//				if (node == parsedUnit.currentPackage) {
-//					notifySourceElementRequestor(importRef, true);
-//				} else {
-//					notifySourceElementRequestor(importRef, false);
-//				}
-//			} else { // instanceof TypeDeclaration
-      if (node instanceof TypeDeclaration) {
-			  notifySourceElementRequestor((TypeDeclaration)node, sourceType == null);
-//				notifySourceElementRequestor((CompilationUnitDeclaration)node, sourceType == null);
-			}
-			// jsurfer - INSERT start
-			if (node instanceof AbstractMethodDeclaration) {
-				notifySourceElementRequestor((AbstractMethodDeclaration)node);
-			}
-//		jsurfer - INSERT end
-		}
-	}
-	
-	if (sourceType == null){
-		if (isInRange) {
-			requestor.exitCompilationUnit(parsedUnit.sourceEnd);
-		}
-	}
-}
+    //	if (reportReferenceInfo) {
+    //		notifyAllUnknownReferences();
+    //	}
+    // collect the top level ast nodes
+    int length = 0;
+    AstNode[] nodes = null;
+    if (sourceType == null) {
+      if (isInRange) {
+        requestor.enterCompilationUnit();
+      }
+      //		ImportReference currentPackage = parsedUnit.currentPackage;
+      ImportReference[] imports = parsedUnit.imports;
+      //		TypeDeclaration[] types = parsedUnit.types;
+      ArrayList types = parsedUnit.types;
+      if (types != null) {
+        //		length =
+        //			(currentPackage == null ? 0 : 1)
+        //			+ (imports == null ? 0 : imports.length)
+        //			+ (types == null ? 0 : types.length);
+        //		nodes = new AstNode[length];
+        length = (imports == null ? 0 : imports.length) + types.size();
+        nodes = new AstNode[length];
+        int index = 0;
+        //		if (currentPackage != null) {
+        //			nodes[index++] = currentPackage;
+        //		}
+        if (imports != null) {
+          for (int i = 0, max = imports.length; i < max; i++) {
+            nodes[index++] = imports[i];
+          }
+        }
 
-//private void notifyAllUnknownReferences() {
-//	for (int i = 0, max = this.unknownRefsCounter; i < max; i++) {
-//		NameReference nameRef = this.unknownRefs[i];
-//		if ((nameRef.bits & BindingIds.VARIABLE) != 0) {
-//			if ((nameRef.bits & BindingIds.TYPE) == 0) { 
-//				// variable but not type
-//				if (nameRef instanceof SingleNameReference) { 
-//					// local var or field
-//					requestor.acceptUnknownReference(((SingleNameReference) nameRef).token, nameRef.sourceStart);
-//				} else {
-//					// QualifiedNameReference
-//					// The last token is a field reference and the previous tokens are a type/variable references
-//					char[][] tokens = ((QualifiedNameReference) nameRef).tokens;
-//					int tokensLength = tokens.length;
-//					requestor.acceptFieldReference(tokens[tokensLength - 1], nameRef.sourceEnd - tokens[tokensLength - 1].length + 1);
-//					char[][] typeRef = new char[tokensLength - 1][];
-//					System.arraycopy(tokens, 0, typeRef, 0, tokensLength - 1);
-//					requestor.acceptUnknownReference(typeRef, nameRef.sourceStart, nameRef.sourceEnd - tokens[tokensLength - 1].length);
-//				}
-//			} else {
-//				// variable or type
-//				if (nameRef instanceof SingleNameReference) {
-//					requestor.acceptUnknownReference(((SingleNameReference) nameRef).token, nameRef.sourceStart);
-//				} else {
-//					//QualifiedNameReference
-//					requestor.acceptUnknownReference(((QualifiedNameReference) nameRef).tokens, nameRef.sourceStart, nameRef.sourceEnd);
-//				}
-//			}
-//		} else if ((nameRef.bits & BindingIds.TYPE) != 0) {
-//			if (nameRef instanceof SingleNameReference) {
-//				requestor.acceptTypeReference(((SingleNameReference) nameRef).token, nameRef.sourceStart);
-//			} else {
-//				// it is a QualifiedNameReference
-//				requestor.acceptTypeReference(((QualifiedNameReference) nameRef).tokens, nameRef.sourceStart, nameRef.sourceEnd);
-//			}
-//		}
-//	}
-//}
-/*
- * Update the bodyStart of the corresponding parse node
- */
-public void notifySourceElementRequestor(AbstractMethodDeclaration methodDeclaration) {
+        for (int i = 0, max = types.size(); i < max; i++) {
+          nodes[index++] = (AstNode) types.get(i);
+        }
+      }
+    } else {
+      //		TypeDeclaration[] types = parsedUnit.types;
+      ArrayList types = parsedUnit.types;
+      if (types != null) {
+        length = types.size();
+        nodes = new AstNode[length];
+        for (int i = 0, max = types.size(); i < max; i++) {
+          nodes[i] = (AstNode) types.get(i);
+        }
+      }
+    }
 
-	// range check
-	boolean isInRange = 
-				scanner.initialPosition <= methodDeclaration.declarationSourceStart
-				&& scanner.eofPosition >= methodDeclaration.declarationSourceEnd;
+    // notify the nodes in the syntactical order
+    if (nodes != null && length > 0) {
+      quickSort(nodes, 0, length - 1);
+      for (int i = 0; i < length; i++) {
+        AstNode node = nodes[i];
+        			if (node instanceof ImportReference) {
+        				ImportReference importRef = (ImportReference)node;
+//        				if (node == parsedUnit.currentPackage) {
+//        					notifySourceElementRequestor(importRef, true);
+//        				} else {
+        					notifySourceElementRequestor(importRef, false);
+//        				}
+       			} //else { instanceof TypeDeclaration
+        if (node instanceof TypeDeclaration) {
+          notifySourceElementRequestor((TypeDeclaration) node, sourceType == null);
+          //				notifySourceElementRequestor((CompilationUnitDeclaration)node,
+          // sourceType == null);
+        }
+        // jsurfer - INSERT start
+        if (node instanceof AbstractMethodDeclaration) {
+          notifySourceElementRequestor((AbstractMethodDeclaration) node);
+        }
+        //		jsurfer - INSERT end
+      }
+    }
 
-	if (methodDeclaration.isClinit()) {
-		this.visitIfNeeded(methodDeclaration);
-		return;
-	}
+    if (sourceType == null) {
+      if (isInRange) {
+        requestor.exitCompilationUnit(parsedUnit.sourceEnd);
+      }
+    }
+  }
 
-	if (methodDeclaration.isDefaultConstructor()) {
-		if (reportReferenceInfo) {
-			ConstructorDeclaration constructorDeclaration = (ConstructorDeclaration) methodDeclaration;
-			ExplicitConstructorCall constructorCall = constructorDeclaration.constructorCall;
-			if (constructorCall != null) {
-				switch(constructorCall.accessMode) {
-					case ExplicitConstructorCall.This :
-						requestor.acceptConstructorReference(
-							typeNames[nestedTypeIndex-1],
-							constructorCall.arguments == null ? 0 : constructorCall.arguments.length, 
-							constructorCall.sourceStart);
-						break;
-					case ExplicitConstructorCall.Super :
-					case ExplicitConstructorCall.ImplicitSuper :					
-						requestor.acceptConstructorReference(
-							superTypeNames[nestedTypeIndex-1],
-							constructorCall.arguments == null ? 0 : constructorCall.arguments.length, 
-							constructorCall.sourceStart);
-						break;
-				}
-			}
-		}	
-		return;	
-	}	
-	char[][] argumentTypes = null;
-	char[][] argumentNames = null;
-	Argument[] arguments = methodDeclaration.arguments;
-	if (arguments != null) {
-		int argumentLength = arguments.length;
-		argumentTypes = new char[argumentLength][];
-		argumentNames = new char[argumentLength][];
-		for (int i = 0; i < argumentLength; i++) {
-			argumentTypes[i] = returnTypeName(arguments[i].type);
-			argumentNames[i] = arguments[i].name;
-		}
-	}
-	char[][] thrownExceptionTypes = null;
-	TypeReference[] thrownExceptions = methodDeclaration.thrownExceptions;
-	if (thrownExceptions != null) {
-		int thrownExceptionLength = thrownExceptions.length;
-		thrownExceptionTypes = new char[thrownExceptionLength][];
-		for (int i = 0; i < thrownExceptionLength; i++) {
-			thrownExceptionTypes[i] = 
-				CharOperation.concatWith(thrownExceptions[i].getTypeName(), '.'); 
-		}
-	}
-	// by default no selector end position
-	int selectorSourceEnd = -1;
-	if (methodDeclaration.isConstructor()) {
-//		if (methodDeclaration instanceof SourceConstructorDeclaration) {
-//			selectorSourceEnd = 
-//				((SourceConstructorDeclaration) methodDeclaration).selectorSourceEnd; 
-//		}
-		if (isInRange){
-			requestor.enterConstructor(
-				methodDeclaration.declarationSourceStart, 
-				methodDeclaration.modifiers, 
-				methodDeclaration.selector, 
-				methodDeclaration.sourceStart, 
-				selectorSourceEnd, 
-				argumentTypes, 
-				argumentNames, 
-				thrownExceptionTypes);
-		}
-		if (reportReferenceInfo) {
-			ConstructorDeclaration constructorDeclaration = (ConstructorDeclaration) methodDeclaration;
-			ExplicitConstructorCall constructorCall = constructorDeclaration.constructorCall;
-			if (constructorCall != null) {
-				switch(constructorCall.accessMode) {
-					case ExplicitConstructorCall.This :
-						requestor.acceptConstructorReference(
-							typeNames[nestedTypeIndex-1],
-							constructorCall.arguments == null ? 0 : constructorCall.arguments.length, 
-							constructorCall.sourceStart);
-						break;
-					case ExplicitConstructorCall.Super :
-					case ExplicitConstructorCall.ImplicitSuper :
-						requestor.acceptConstructorReference(
-							superTypeNames[nestedTypeIndex-1],
-							constructorCall.arguments == null ? 0 : constructorCall.arguments.length, 
-							constructorCall.sourceStart);
-						break;
-				}
-			}
-		}
-		this.visitIfNeeded(methodDeclaration);
-		if (isInRange){
-			requestor.exitConstructor(methodDeclaration.declarationSourceEnd);
-		}
-		return;
-	}
-//	if (methodDeclaration instanceof SourceMethodDeclaration) {
-//		selectorSourceEnd = 
-//			((SourceMethodDeclaration) methodDeclaration).selectorSourceEnd; 
-//	}
-	if (isInRange) {
-		int modifiers = methodDeclaration.modifiers;
-//		boolean deprecated = (modifiers & AccDeprecated) != 0; // remember deprecation so as to not lose it below
-		requestor.enterMethod(
-			methodDeclaration.declarationSourceStart, 
-		modifiers, // deprecated ? (modifiers & AccJustFlag) | AccDeprecated : modifiers & AccJustFlag, 
-			returnTypeName(((MethodDeclaration) methodDeclaration).returnType), 
-			methodDeclaration.selector, 
-			methodDeclaration.sourceStart, 
-			selectorSourceEnd, 
-			argumentTypes, 
-			argumentNames, 
-			thrownExceptionTypes); 
-	}		
-	this.visitIfNeeded(methodDeclaration);
+  //private void notifyAllUnknownReferences() {
+  //	for (int i = 0, max = this.unknownRefsCounter; i < max; i++) {
+  //		NameReference nameRef = this.unknownRefs[i];
+  //		if ((nameRef.bits & BindingIds.VARIABLE) != 0) {
+  //			if ((nameRef.bits & BindingIds.TYPE) == 0) {
+  //				// variable but not type
+  //				if (nameRef instanceof SingleNameReference) {
+  //					// local var or field
+  //					requestor.acceptUnknownReference(((SingleNameReference) nameRef).token,
+  // nameRef.sourceStart);
+  //				} else {
+  //					// QualifiedNameReference
+  //					// The last token is a field reference and the previous tokens are a
+  // type/variable references
+  //					char[][] tokens = ((QualifiedNameReference) nameRef).tokens;
+  //					int tokensLength = tokens.length;
+  //					requestor.acceptFieldReference(tokens[tokensLength - 1], nameRef.sourceEnd
+  // - tokens[tokensLength - 1].length + 1);
+  //					char[][] typeRef = new char[tokensLength - 1][];
+  //					System.arraycopy(tokens, 0, typeRef, 0, tokensLength - 1);
+  //					requestor.acceptUnknownReference(typeRef, nameRef.sourceStart,
+  // nameRef.sourceEnd - tokens[tokensLength - 1].length);
+  //				}
+  //			} else {
+  //				// variable or type
+  //				if (nameRef instanceof SingleNameReference) {
+  //					requestor.acceptUnknownReference(((SingleNameReference) nameRef).token,
+  // nameRef.sourceStart);
+  //				} else {
+  //					//QualifiedNameReference
+  //					requestor.acceptUnknownReference(((QualifiedNameReference) nameRef).tokens,
+  // nameRef.sourceStart, nameRef.sourceEnd);
+  //				}
+  //			}
+  //		} else if ((nameRef.bits & BindingIds.TYPE) != 0) {
+  //			if (nameRef instanceof SingleNameReference) {
+  //				requestor.acceptTypeReference(((SingleNameReference) nameRef).token,
+  // nameRef.sourceStart);
+  //			} else {
+  //				// it is a QualifiedNameReference
+  //				requestor.acceptTypeReference(((QualifiedNameReference) nameRef).tokens,
+  // nameRef.sourceStart, nameRef.sourceEnd);
+  //			}
+  //		}
+  //	}
+  //}
+  /*
+   * Update the bodyStart of the corresponding parse node
+   */
+  public void notifySourceElementRequestor(AbstractMethodDeclaration methodDeclaration) {
 
-	if (isInRange){	
-		requestor.exitMethod(methodDeclaration.declarationSourceEnd);
-	}
-}
-/*
-* Update the bodyStart of the corresponding parse node
-*/
-public void notifySourceElementRequestor(FieldDeclaration fieldDeclaration) {
-	
-	// range check
-	boolean isInRange = 
-				scanner.initialPosition <= fieldDeclaration.declarationSourceStart
-				&& scanner.eofPosition >= fieldDeclaration.declarationSourceEnd;
+    // range check
+    boolean isInRange = scanner.initialPosition <= methodDeclaration.declarationSourceStart
+        && scanner.eofPosition >= methodDeclaration.declarationSourceEnd;
 
-	if (fieldDeclaration.isField()) {
-		int fieldEndPosition = fieldDeclaration.declarationSourceEnd;
-//		if (fieldDeclaration instanceof SourceFieldDeclaration) {
-//			fieldEndPosition = ((SourceFieldDeclaration) fieldDeclaration).fieldEndPosition;
-//			if (fieldEndPosition == 0) {
-//				// use the declaration source end by default
-//				fieldEndPosition = fieldDeclaration.declarationSourceEnd;
-//			}
-//		}
-		if (isInRange) {
-			int modifiers = fieldDeclaration.modifiers;
-			boolean deprecated = (modifiers & AccDeprecated) != 0; // remember deprecation so as to not lose it below
-			requestor.enterField(
-				fieldDeclaration.declarationSourceStart, 
-				deprecated ? (modifiers & AccJustFlag) | AccDeprecated : modifiers & AccJustFlag, 
-				returnTypeName(fieldDeclaration.type), 
-				fieldDeclaration.name, 
-				fieldDeclaration.sourceStart, 
-				fieldDeclaration.sourceEnd); 
-		}
-//		this.visitIfNeeded(fieldDeclaration);
-		if (isInRange){
-//			requestor.exitField(
-//				// filter out initializations that are not a constant (simple check)
-//				(fieldDeclaration.initialization == null 
-//						|| fieldDeclaration.initialization instanceof ArrayInitializer
-//						|| fieldDeclaration.initialization instanceof AllocationExpression
-//						|| fieldDeclaration.initialization instanceof ArrayAllocationExpression
-//						|| fieldDeclaration.initialization instanceof Assignment
-//						|| fieldDeclaration.initialization instanceof ClassLiteralAccess
-//						|| fieldDeclaration.initialization instanceof MessageSend
-//						|| fieldDeclaration.initialization instanceof ArrayReference
-//						|| fieldDeclaration.initialization instanceof ThisReference) ? 
-//					-1 :  
-//					fieldDeclaration.initialization.sourceStart, 
-//				fieldEndPosition,
-//				fieldDeclaration.declarationSourceEnd);
-			requestor.exitField(
-					// filter out initializations that are not a constant (simple check)
-					-1, 
-					fieldEndPosition,
-					fieldDeclaration.declarationSourceEnd);
-		}
+    if (methodDeclaration.isClinit()) {
+      this.visitIfNeeded(methodDeclaration);
+      return;
+    }
 
-	} else {
-//		if (isInRange){
-//			requestor.enterInitializer(
-//				fieldDeclaration.declarationSourceStart,
-//				fieldDeclaration.modifiers); 
-//		}
-//		this.visitIfNeeded((Initializer)fieldDeclaration);
-//		if (isInRange){
-//			requestor.exitInitializer(fieldDeclaration.declarationSourceEnd);
-//		}
-	}
-}
-//public void notifySourceElementRequestor(
-//	ImportReference importReference, 
-//	boolean isPackage) {
-//	if (isPackage) {
-//		requestor.acceptPackage(
-//			importReference.declarationSourceStart, 
-//			importReference.declarationSourceEnd, 
-//			CharOperation.concatWith(importReference.getImportName(), '.')); 
-//	} else {
-//		requestor.acceptImport(
-//			importReference.declarationSourceStart, 
-//			importReference.declarationSourceEnd, 
-//			CharOperation.concatWith(importReference.getImportName(), '.'), 
-//			importReference.onDemand); 
-//	}
-//}
-public void notifySourceElementRequestor(TypeDeclaration typeDeclaration, boolean notifyTypePresence) {
-////	public void notifySourceElementRequestor(AstNode typeDeclaration, boolean notifyTypePresence) {
-	
-	// range check
-	boolean isInRange = 
-				scanner.initialPosition <= typeDeclaration.declarationSourceStart
-				&& scanner.eofPosition >= typeDeclaration.declarationSourceEnd;
-	
-	FieldDeclaration[] fields = typeDeclaration.fields;
-	AbstractMethodDeclaration[] methods = typeDeclaration.methods;
-	MemberTypeDeclaration[] memberTypes = typeDeclaration.memberTypes;
-	int fieldCount = fields == null ? 0 : fields.length;
-	int methodCount = methods == null ? 0 : methods.length;
-	int memberTypeCount = memberTypes == null ? 0 : memberTypes.length;
-	int fieldIndex = 0;
-	int methodIndex = 0;
-	int memberTypeIndex = 0;
-	boolean isInterface = typeDeclaration.isInterface();
+    if (methodDeclaration.isDefaultConstructor()) {
+      if (reportReferenceInfo) {
+        ConstructorDeclaration constructorDeclaration = (ConstructorDeclaration) methodDeclaration;
+        ExplicitConstructorCall constructorCall = constructorDeclaration.constructorCall;
+        if (constructorCall != null) {
+          switch (constructorCall.accessMode) {
+            case ExplicitConstructorCall.This :
+              requestor.acceptConstructorReference(typeNames[nestedTypeIndex - 1], constructorCall.arguments == null
+                  ? 0
+                  : constructorCall.arguments.length, constructorCall.sourceStart);
+              break;
+            case ExplicitConstructorCall.Super :
+            case ExplicitConstructorCall.ImplicitSuper :
+              requestor.acceptConstructorReference(superTypeNames[nestedTypeIndex - 1], constructorCall.arguments == null
+                  ? 0
+                  : constructorCall.arguments.length, constructorCall.sourceStart);
+              break;
+          }
+        }
+      }
+      return;
+    }
+    char[][] argumentTypes = null;
+    char[][] argumentNames = null;
+    Argument[] arguments = methodDeclaration.arguments;
+    if (arguments != null) {
+      int argumentLength = arguments.length;
+      argumentTypes = new char[argumentLength][];
+      argumentNames = new char[argumentLength][];
+      for (int i = 0; i < argumentLength; i++) {
+        argumentTypes[i] = returnTypeName(arguments[i].type);
+        argumentNames[i] = arguments[i].name;
+      }
+    }
+    char[][] thrownExceptionTypes = null;
+    TypeReference[] thrownExceptions = methodDeclaration.thrownExceptions;
+    if (thrownExceptions != null) {
+      int thrownExceptionLength = thrownExceptions.length;
+      thrownExceptionTypes = new char[thrownExceptionLength][];
+      for (int i = 0; i < thrownExceptionLength; i++) {
+        thrownExceptionTypes[i] = CharOperation.concatWith(thrownExceptions[i].getTypeName(), '.');
+      }
+    }
+    // by default no selector end position
+    int selectorSourceEnd = -1;
+    if (methodDeclaration.isConstructor()) {
+      //		if (methodDeclaration instanceof SourceConstructorDeclaration) {
+      //			selectorSourceEnd =
+      //				((SourceConstructorDeclaration) methodDeclaration).selectorSourceEnd;
+      //		}
+      if (isInRange) {
+        requestor.enterConstructor(methodDeclaration.declarationSourceStart, methodDeclaration.modifiers,
+            methodDeclaration.selector, methodDeclaration.sourceStart, selectorSourceEnd, argumentTypes, argumentNames,
+            thrownExceptionTypes);
+      }
+      if (reportReferenceInfo) {
+        ConstructorDeclaration constructorDeclaration = (ConstructorDeclaration) methodDeclaration;
+        ExplicitConstructorCall constructorCall = constructorDeclaration.constructorCall;
+        if (constructorCall != null) {
+          switch (constructorCall.accessMode) {
+            case ExplicitConstructorCall.This :
+              requestor.acceptConstructorReference(typeNames[nestedTypeIndex - 1], constructorCall.arguments == null
+                  ? 0
+                  : constructorCall.arguments.length, constructorCall.sourceStart);
+              break;
+            case ExplicitConstructorCall.Super :
+            case ExplicitConstructorCall.ImplicitSuper :
+              requestor.acceptConstructorReference(superTypeNames[nestedTypeIndex - 1], constructorCall.arguments == null
+                  ? 0
+                  : constructorCall.arguments.length, constructorCall.sourceStart);
+              break;
+          }
+        }
+      }
+      this.visitIfNeeded(methodDeclaration);
+      if (isInRange) {
+        requestor.exitConstructor(methodDeclaration.declarationSourceEnd);
+      }
+      return;
+    }
+    //	if (methodDeclaration instanceof SourceMethodDeclaration) {
+    //		selectorSourceEnd =
+    //			((SourceMethodDeclaration) methodDeclaration).selectorSourceEnd;
+    //	}
+    if (isInRange) {
+      int modifiers = methodDeclaration.modifiers;
+      //		boolean deprecated = (modifiers & AccDeprecated) != 0; // remember
+      // deprecation so as to not lose it below
+      requestor.enterMethod(methodDeclaration.declarationSourceStart, modifiers, // deprecated
+                                                                                 // ?
+                                                                                 // (modifiers
+                                                                                 // &
+                                                                                 // AccJustFlag)
+                                                                                 // |
+                                                                                 // AccDeprecated
+                                                                                 // :
+                                                                                 // modifiers
+                                                                                 // &
+                                                                                 // AccJustFlag,
+          returnTypeName(((MethodDeclaration) methodDeclaration).returnType), methodDeclaration.selector,
+          methodDeclaration.sourceStart, selectorSourceEnd, argumentTypes, argumentNames, thrownExceptionTypes);
+    }
+    this.visitIfNeeded(methodDeclaration);
 
-	if (notifyTypePresence){
-		char[][] interfaceNames = null;
-		int superInterfacesLength = 0;
-		TypeReference[] superInterfaces = typeDeclaration.superInterfaces;
-		if (superInterfaces != null) {
-			superInterfacesLength = superInterfaces.length;
-			interfaceNames = new char[superInterfacesLength][];
-		} else {
-			if (typeDeclaration instanceof AnonymousLocalTypeDeclaration) {
-				// see PR 3442
-				QualifiedAllocationExpression alloc = ((AnonymousLocalTypeDeclaration)typeDeclaration).allocation;
-				if (alloc != null && alloc.type != null) {
-					superInterfaces = new TypeReference[] { ((AnonymousLocalTypeDeclaration)typeDeclaration).allocation.type};
-					superInterfacesLength = 1;
-					interfaceNames = new char[1][];
-				}
-			}
-		}
-		if (superInterfaces != null) {
-			for (int i = 0; i < superInterfacesLength; i++) {
-				interfaceNames[i] = 
-					CharOperation.concatWith(superInterfaces[i].getTypeName(), '.'); 
-			}
-		}
-		if (isInterface) {
-			if (isInRange){
-				int modifiers = typeDeclaration.modifiers;
-				boolean deprecated = false; //(modifiers & AccDeprecated) != 0; // remember deprecation so as to not lose it below
-				requestor.enterInterface(
-					typeDeclaration.declarationSourceStart, 
-					modifiers, //deprecated ? (modifiers & AccJustFlag) | AccDeprecated : modifiers & AccJustFlag, 
-					typeDeclaration.name, 
-					typeDeclaration.sourceStart, 
-					typeDeclaration.sourceEnd, 
-					interfaceNames);
-			}
-			if (nestedTypeIndex == typeNames.length) {
-				// need a resize
-				System.arraycopy(typeNames, 0, (typeNames = new char[nestedTypeIndex * 2][]), 0, nestedTypeIndex);
-				System.arraycopy(superTypeNames, 0, (superTypeNames = new char[nestedTypeIndex * 2][]), 0, nestedTypeIndex);
-			}
-			typeNames[nestedTypeIndex] = typeDeclaration.name;
-			superTypeNames[nestedTypeIndex++] = JAVA_LANG_OBJECT;
-		} else {
-			TypeReference superclass = typeDeclaration.superclass;
-			if (superclass == null) {
-				if (isInRange){
-					requestor.enterClass(
-						typeDeclaration.declarationSourceStart, 
-						typeDeclaration.modifiers, 
-						typeDeclaration.name, 
-						typeDeclaration.sourceStart, 
-						typeDeclaration.sourceEnd, 
-						null, 
-						interfaceNames); 
-				}
-			} else {
-				if (isInRange){
-					requestor.enterClass(
-						typeDeclaration.declarationSourceStart, 
-						typeDeclaration.modifiers, 
-						typeDeclaration.name, 
-						typeDeclaration.sourceStart, 
-						typeDeclaration.sourceEnd, 
-						CharOperation.concatWith(superclass.getTypeName(), '.'), 
-						interfaceNames); 
-				}
-			}
-			if (nestedTypeIndex == typeNames.length) {
-				// need a resize
-				System.arraycopy(typeNames, 0, (typeNames = new char[nestedTypeIndex * 2][]), 0, nestedTypeIndex);
-				System.arraycopy(superTypeNames, 0, (superTypeNames = new char[nestedTypeIndex * 2][]), 0, nestedTypeIndex);
-			}
-			typeNames[nestedTypeIndex] = typeDeclaration.name;
-			superTypeNames[nestedTypeIndex++] = superclass == null ? JAVA_LANG_OBJECT : CharOperation.concatWith(superclass.getTypeName(), '.');
-		}
-	}
-	while ((fieldIndex < fieldCount)
-		|| (memberTypeIndex < memberTypeCount)
-		|| (methodIndex < methodCount)) {
-		FieldDeclaration nextFieldDeclaration = null;
-		AbstractMethodDeclaration nextMethodDeclaration = null;
-		TypeDeclaration nextMemberDeclaration = null;
+    if (isInRange) {
+      requestor.exitMethod(methodDeclaration.declarationSourceEnd);
+    }
+  }
+  /*
+   * Update the bodyStart of the corresponding parse node
+   */
+  public void notifySourceElementRequestor(FieldDeclaration fieldDeclaration) {
 
-		int position = Integer.MAX_VALUE;
-		int nextDeclarationType = -1;
-		if (fieldIndex < fieldCount) {
-			nextFieldDeclaration = fields[fieldIndex];
-			if (nextFieldDeclaration.declarationSourceStart < position) {
-				position = nextFieldDeclaration.declarationSourceStart;
-				nextDeclarationType = 0; // FIELD
-			}
-		}
-		if (methodIndex < methodCount) {
-			nextMethodDeclaration = methods[methodIndex];
-			if (nextMethodDeclaration.declarationSourceStart < position) {
-				position = nextMethodDeclaration.declarationSourceStart;
-				nextDeclarationType = 1; // METHOD
-			}
-		}
-		if (memberTypeIndex < memberTypeCount) {
-			nextMemberDeclaration = memberTypes[memberTypeIndex];
-			if (nextMemberDeclaration.declarationSourceStart < position) {
-				position = nextMemberDeclaration.declarationSourceStart;
-				nextDeclarationType = 2; // MEMBER
-			}
-		}
-		switch (nextDeclarationType) {
-			case 0 :
-				fieldIndex++;
-				notifySourceElementRequestor(nextFieldDeclaration);
-				break;
-			case 1 :
-				methodIndex++;
-				notifySourceElementRequestor(nextMethodDeclaration);
-				break;
-			case 2 :
-				memberTypeIndex++;
-				notifySourceElementRequestor(nextMemberDeclaration, true);
-		}
-	}
-	if (notifyTypePresence){
-		if (isInRange){
-			if (isInterface) {
-				requestor.exitInterface(typeDeclaration.declarationSourceEnd);
-			} else {
-				requestor.exitClass(typeDeclaration.declarationSourceEnd);
-			}
-		}
-		nestedTypeIndex--;
-	}
-}
-public void parseCompilationUnit (
-	ICompilationUnit unit, 
-	int start, 
-	int end ) { 
-//	boolean needReferenceInfo) {
+    // range check
+    boolean isInRange = scanner.initialPosition <= fieldDeclaration.declarationSourceStart
+        && scanner.eofPosition >= fieldDeclaration.declarationSourceEnd;
 
-//	reportReferenceInfo = needReferenceInfo;
-//	boolean old = diet;
-//	if (needReferenceInfo) {
-//		unknownRefs = new NameReference[10];
-//		unknownRefsCounter = 0;
-//	}
-	
-	try {
-//		diet = true;
-		CompilationResult compilationUnitResult = new CompilationResult(unit, 0, 0, 10); //this.options.maxProblemsPerUnit);
-		CompilationUnitDeclaration parsedUnit = parse(unit, compilationUnitResult, start, end);
-//		if (scanner.recordLineSeparator) {
-//			requestor.acceptLineSeparatorPositions(scanner.getLineEnds());
-//		}
-//		if (this.localDeclarationVisitor != null || needReferenceInfo){
-//			diet = false;
-//			this.getMethodBodies(parsedUnit);
-//		}		
-//		this.scanner.resetTo(start, end);
-//		notifySourceElementRequestor(parsedUnit);
-	} catch (AbortCompilation e) {
-	} finally {
-//		diet = old;
-	}
-}
-public CompilationUnitDeclaration parseCompilationUnit(
-		ICompilationUnit unit, 
-		boolean fullParse) {
-			
-//		boolean old = diet;
-//		if (fullParse) {
-//			unknownRefs = new NameReference[10];
-//			unknownRefsCounter = 0;
-//		}
+    if (fieldDeclaration.isField()) {
+      int fieldEndPosition = fieldDeclaration.declarationSourceEnd;
+      //		if (fieldDeclaration instanceof SourceFieldDeclaration) {
+      //			fieldEndPosition = ((SourceFieldDeclaration)
+      // fieldDeclaration).fieldEndPosition;
+      //			if (fieldEndPosition == 0) {
+      //				// use the declaration source end by default
+      //				fieldEndPosition = fieldDeclaration.declarationSourceEnd;
+      //			}
+      //		}
+      if (isInRange) {
+        int modifiers = fieldDeclaration.modifiers;
+        boolean deprecated = (modifiers & AccDeprecated) != 0; // remember
+                                                               // deprecation so
+                                                               // as to not lose
+                                                               // it below
+        requestor.enterField(fieldDeclaration.declarationSourceStart, deprecated
+            ? (modifiers & AccJustFlag) | AccDeprecated
+            : modifiers & AccJustFlag, returnTypeName(fieldDeclaration.type), fieldDeclaration.name, fieldDeclaration.sourceStart,
+            fieldDeclaration.sourceEnd);
+      }
+      //		this.visitIfNeeded(fieldDeclaration);
+      if (isInRange) {
+        //			requestor.exitField(
+        //				// filter out initializations that are not a constant (simple check)
+        //				(fieldDeclaration.initialization == null
+        //						|| fieldDeclaration.initialization instanceof ArrayInitializer
+        //						|| fieldDeclaration.initialization instanceof AllocationExpression
+        //						|| fieldDeclaration.initialization instanceof
+        // ArrayAllocationExpression
+        //						|| fieldDeclaration.initialization instanceof Assignment
+        //						|| fieldDeclaration.initialization instanceof ClassLiteralAccess
+        //						|| fieldDeclaration.initialization instanceof MessageSend
+        //						|| fieldDeclaration.initialization instanceof ArrayReference
+        //						|| fieldDeclaration.initialization instanceof ThisReference) ?
+        //					-1 :
+        //					fieldDeclaration.initialization.sourceStart,
+        //				fieldEndPosition,
+        //				fieldDeclaration.declarationSourceEnd);
+        requestor.exitField(
+        // filter out initializations that are not a constant (simple check)
+            -1, fieldEndPosition, fieldDeclaration.declarationSourceEnd);
+      }
 
-		try {
-//			diet = true;
-			this.reportReferenceInfo = fullParse;
-			CompilationResult compilationUnitResult = new CompilationResult(unit, 0, 0, this.options.maxProblemsPerUnit);
-			CompilationUnitDeclaration parsedUnit = parse(unit, compilationUnitResult, false);
-			if (scanner.recordLineSeparator) {
-				requestor.acceptLineSeparatorPositions(scanner.getLineEnds());
-			}
-			int initialStart = this.scanner.initialPosition;
-			int initialEnd = this.scanner.eofPosition;
-//			if (this.localDeclarationVisitor != null || fullParse){
-//				diet = false;
-//				this.getMethodBodies(parsedUnit);
-//			}
-			this.scanner.resetTo(initialStart, initialEnd);
-			notifySourceElementRequestor(parsedUnit);
-			return parsedUnit;
-		} catch (AbortCompilation e) {
-			// ignore this exception
-		} finally {
-//			diet = old;
-		}
-		return null;
-	}
+    } else {
+      //		if (isInRange){
+      //			requestor.enterInitializer(
+      //				fieldDeclaration.declarationSourceStart,
+      //				fieldDeclaration.modifiers);
+      //		}
+      //		this.visitIfNeeded((Initializer)fieldDeclaration);
+      //		if (isInRange){
+      //			requestor.exitInitializer(fieldDeclaration.declarationSourceEnd);
+      //		}
+    }
+  }
+  public void notifySourceElementRequestor(
+  	ImportReference importReference,
+  	boolean isPackage) {
+//  	if (isPackage) {
+//  		requestor.acceptPackage(
+//  			importReference.declarationSourceStart,
+//  			importReference.declarationSourceEnd,
+//  			CharOperation.concatWith(importReference.getImportName(), '.'));
+//  	} else {
+  		requestor.acceptImport(
+  			importReference.declarationSourceStart,
+  			importReference.declarationSourceEnd,
+  			importReference.getIncludeName(), //CharOperation.concatWith(importReference.getImportName(), '.'),
+  			importReference.onDemand);
+//  	}
+  }
+  public void notifySourceElementRequestor(TypeDeclaration typeDeclaration, boolean notifyTypePresence) {
+    //// public void notifySourceElementRequestor(AstNode typeDeclaration,
+    // boolean notifyTypePresence) {
 
-//public void parseTypeMemberDeclarations(
-//	ISourceType sourceType, 
-//	ICompilationUnit sourceUnit, 
-//	int start, 
-//	int end, 
-//	boolean needReferenceInfo) {
-//	boolean old = diet;
-//	if (needReferenceInfo) {
-//		unknownRefs = new NameReference[10];
-//		unknownRefsCounter = 0;
-//	}
-//	
-//	try {
-//		diet = !needReferenceInfo;
-//		reportReferenceInfo = needReferenceInfo;
-//		CompilationResult compilationUnitResult = 
-//			new CompilationResult(sourceUnit, 0, 0, this.options.maxProblemsPerUnit); 
-//		CompilationUnitDeclaration unit = 
-//			SourceTypeConverter.buildCompilationUnit(
-//				new ISourceType[]{sourceType}, 
-//				false, // no need for field and methods
-//				false, // no need for member types
-//				false, // no need for field initialization
-//				problemReporter(), 
-//				compilationUnitResult); 
-//		if ((unit == null) || (unit.types == null) || (unit.types.length != 1))
-//			return;
-//		this.sourceType = sourceType;
-//		try {
-//			/* automaton initialization */
-//			initialize();
-//			goForClassBodyDeclarations();
-//			/* scanner initialization */
-//			scanner.setSource(sourceUnit.getContents());
-//			scanner.resetTo(start, end);
-//			/* unit creation */
-//			referenceContext = compilationUnit = unit;
-//			/* initialize the astStacl */
-//			// the compilationUnitDeclaration should contain exactly one type
-//			pushOnAstStack(unit.types[0]);
-//			/* run automaton */
-//			parse();
-//			notifySourceElementRequestor(unit);
-//		} finally {
-//			unit = compilationUnit;
-//			compilationUnit = null; // reset parser
-//		}
-//	} catch (AbortCompilation e) {
-//	} finally {
-//		if (scanner.recordLineSeparator) {
-//			requestor.acceptLineSeparatorPositions(scanner.getLineEnds());
-//		}
-//		diet = old;
-//	}
-//}
-//
-//public void parseTypeMemberDeclarations(
-//	char[] contents, 
-//	int start, 
-//	int end) {
-//
-//	boolean old = diet;
-//	
-//	try {
-//		diet = true;
-//
-//		/* automaton initialization */
-//		initialize();
-//		goForClassBodyDeclarations();
-//		/* scanner initialization */
-//		scanner.setSource(contents);
-//		scanner.recordLineSeparator = false;
-//		scanner.taskTags = null;
-//		scanner.taskPriorities = null;
-//		scanner.resetTo(start, end);
-//
-//		/* unit creation */
-//		referenceContext = null;
-//
-//		/* initialize the astStacl */
-//		// the compilationUnitDeclaration should contain exactly one type
-//		/* run automaton */
-//		parse();
-//		notifySourceElementRequestor((CompilationUnitDeclaration)null);
-//	} catch (AbortCompilation e) {
-//	} finally {
-//		diet = old;
-//	}
-//}
-/**
- * Sort the given ast nodes by their positions.
- */
-private static void quickSort(AstNode[] sortedCollection, int left, int right) {
-	int original_left = left;
-	int original_right = right;
-	AstNode mid = sortedCollection[ (left + right) / 2];
-	do {
-		while (sortedCollection[left].sourceStart < mid.sourceStart) {
-			left++;
-		}
-		while (mid.sourceStart < sortedCollection[right].sourceStart) {
-			right--;
-		}
-		if (left <= right) {
-			AstNode tmp = sortedCollection[left];
-			sortedCollection[left] = sortedCollection[right];
-			sortedCollection[right] = tmp;
-			left++;
-			right--;
-		}
-	} while (left <= right);
-	if (original_left < right) {
-		quickSort(sortedCollection, original_left, right);
-	}
-	if (left < original_right) {
-		quickSort(sortedCollection, left, original_right);
-	}
-}
-/*
- * Answer a char array representation of the type name formatted like:
- * - type name + dimensions
- * Example:
- * "A[][]".toCharArray()
- * "java.lang.String".toCharArray()
- */
-private char[] returnTypeName(TypeReference type) {
-	if (type == null)
-		return null;
-	int dimension = type.dimensions();
-	if (dimension != 0) {
-		char[] dimensionsArray = new char[dimension * 2];
-		for (int i = 0; i < dimension; i++) {
-			dimensionsArray[i * 2] = '[';
-			dimensionsArray[(i * 2) + 1] = ']';
-		}
-		return CharOperation.concat(
-			CharOperation.concatWith(type.getTypeName(), '.'), 
-			dimensionsArray); 
-	}
-	return CharOperation.concatWith(type.getTypeName(), '.');
-}
+    // range check
+    boolean isInRange = scanner.initialPosition <= typeDeclaration.declarationSourceStart
+        && scanner.eofPosition >= typeDeclaration.declarationSourceEnd;
+
+    FieldDeclaration[] fields = typeDeclaration.fields;
+    AbstractMethodDeclaration[] methods = typeDeclaration.methods;
+    MemberTypeDeclaration[] memberTypes = typeDeclaration.memberTypes;
+    int fieldCount = fields == null ? 0 : fields.length;
+    int methodCount = methods == null ? 0 : methods.length;
+    int memberTypeCount = memberTypes == null ? 0 : memberTypes.length;
+    int fieldIndex = 0;
+    int methodIndex = 0;
+    int memberTypeIndex = 0;
+    boolean isInterface = typeDeclaration.isInterface();
+
+    if (notifyTypePresence) {
+      char[][] interfaceNames = null;
+      int superInterfacesLength = 0;
+      TypeReference[] superInterfaces = typeDeclaration.superInterfaces;
+      if (superInterfaces != null) {
+        superInterfacesLength = superInterfaces.length;
+        interfaceNames = new char[superInterfacesLength][];
+      } else {
+        if (typeDeclaration instanceof AnonymousLocalTypeDeclaration) {
+          // see PR 3442
+          QualifiedAllocationExpression alloc = ((AnonymousLocalTypeDeclaration) typeDeclaration).allocation;
+          if (alloc != null && alloc.type != null) {
+            superInterfaces = new TypeReference[]{((AnonymousLocalTypeDeclaration) typeDeclaration).allocation.type};
+            superInterfacesLength = 1;
+            interfaceNames = new char[1][];
+          }
+        }
+      }
+      if (superInterfaces != null) {
+        for (int i = 0; i < superInterfacesLength; i++) {
+          interfaceNames[i] = CharOperation.concatWith(superInterfaces[i].getTypeName(), '.');
+        }
+      }
+      if (isInterface) {
+        if (isInRange) {
+          int modifiers = typeDeclaration.modifiers;
+          boolean deprecated = false; //(modifiers & AccDeprecated) != 0; //
+                                      // remember deprecation so as to not lose
+                                      // it below
+          requestor.enterInterface(typeDeclaration.declarationSourceStart, modifiers, //deprecated
+                                                                                      // ?
+                                                                                      // (modifiers
+                                                                                      // &
+                                                                                      // AccJustFlag)
+                                                                                      // |
+                                                                                      // AccDeprecated
+                                                                                      // :
+                                                                                      // modifiers
+                                                                                      // &
+                                                                                      // AccJustFlag,
+              typeDeclaration.name, typeDeclaration.sourceStart, typeDeclaration.sourceEnd, interfaceNames);
+        }
+        if (nestedTypeIndex == typeNames.length) {
+          // need a resize
+          System.arraycopy(typeNames, 0, (typeNames = new char[nestedTypeIndex * 2][]), 0, nestedTypeIndex);
+          System.arraycopy(superTypeNames, 0, (superTypeNames = new char[nestedTypeIndex * 2][]), 0, nestedTypeIndex);
+        }
+        typeNames[nestedTypeIndex] = typeDeclaration.name;
+        superTypeNames[nestedTypeIndex++] = JAVA_LANG_OBJECT;
+      } else {
+        TypeReference superclass = typeDeclaration.superclass;
+        if (superclass == null) {
+          if (isInRange) {
+            requestor.enterClass(typeDeclaration.declarationSourceStart, typeDeclaration.modifiers, typeDeclaration.name,
+                typeDeclaration.sourceStart, typeDeclaration.sourceEnd, null, interfaceNames);
+          }
+        } else {
+          if (isInRange) {
+            requestor.enterClass(typeDeclaration.declarationSourceStart, typeDeclaration.modifiers, typeDeclaration.name,
+                typeDeclaration.sourceStart, typeDeclaration.sourceEnd, CharOperation.concatWith(superclass.getTypeName(), '.'),
+                interfaceNames);
+          }
+        }
+        if (nestedTypeIndex == typeNames.length) {
+          // need a resize
+          System.arraycopy(typeNames, 0, (typeNames = new char[nestedTypeIndex * 2][]), 0, nestedTypeIndex);
+          System.arraycopy(superTypeNames, 0, (superTypeNames = new char[nestedTypeIndex * 2][]), 0, nestedTypeIndex);
+        }
+        typeNames[nestedTypeIndex] = typeDeclaration.name;
+        superTypeNames[nestedTypeIndex++] = superclass == null ? JAVA_LANG_OBJECT : CharOperation.concatWith(superclass
+            .getTypeName(), '.');
+      }
+    }
+    while ((fieldIndex < fieldCount) || (memberTypeIndex < memberTypeCount) || (methodIndex < methodCount)) {
+      FieldDeclaration nextFieldDeclaration = null;
+      AbstractMethodDeclaration nextMethodDeclaration = null;
+      TypeDeclaration nextMemberDeclaration = null;
+
+      int position = Integer.MAX_VALUE;
+      int nextDeclarationType = -1;
+      if (fieldIndex < fieldCount) {
+        nextFieldDeclaration = fields[fieldIndex];
+        if (nextFieldDeclaration.declarationSourceStart < position) {
+          position = nextFieldDeclaration.declarationSourceStart;
+          nextDeclarationType = 0; // FIELD
+        }
+      }
+      if (methodIndex < methodCount) {
+        nextMethodDeclaration = methods[methodIndex];
+        if (nextMethodDeclaration.declarationSourceStart < position) {
+          position = nextMethodDeclaration.declarationSourceStart;
+          nextDeclarationType = 1; // METHOD
+        }
+      }
+      if (memberTypeIndex < memberTypeCount) {
+        nextMemberDeclaration = memberTypes[memberTypeIndex];
+        if (nextMemberDeclaration.declarationSourceStart < position) {
+          position = nextMemberDeclaration.declarationSourceStart;
+          nextDeclarationType = 2; // MEMBER
+        }
+      }
+      switch (nextDeclarationType) {
+        case 0 :
+          fieldIndex++;
+          notifySourceElementRequestor(nextFieldDeclaration);
+          break;
+        case 1 :
+          methodIndex++;
+          notifySourceElementRequestor(nextMethodDeclaration);
+          break;
+        case 2 :
+          memberTypeIndex++;
+          notifySourceElementRequestor(nextMemberDeclaration, true);
+      }
+    }
+    if (notifyTypePresence) {
+      if (isInRange) {
+        if (isInterface) {
+          requestor.exitInterface(typeDeclaration.declarationSourceEnd);
+        } else {
+          requestor.exitClass(typeDeclaration.declarationSourceEnd);
+        }
+      }
+      nestedTypeIndex--;
+    }
+  }
+  public void parseCompilationUnit(ICompilationUnit unit, int start, int end) {
+    //	boolean needReferenceInfo) {
+
+    //	reportReferenceInfo = needReferenceInfo;
+    //	boolean old = diet;
+    //	if (needReferenceInfo) {
+    //		unknownRefs = new NameReference[10];
+    //		unknownRefsCounter = 0;
+    //	}
+
+    try {
+      //		diet = true;
+      CompilationResult compilationUnitResult = new CompilationResult(unit, 0, 0, 10); //this.options.maxProblemsPerUnit);
+      CompilationUnitDeclaration parsedUnit = parse(unit, compilationUnitResult, start, end);
+      //		if (scanner.recordLineSeparator) {
+      //			requestor.acceptLineSeparatorPositions(scanner.getLineEnds());
+      //		}
+      //		if (this.localDeclarationVisitor != null || needReferenceInfo){
+      //			diet = false;
+      //			this.getMethodBodies(parsedUnit);
+      //		}
+      //		this.scanner.resetTo(start, end);
+      //		notifySourceElementRequestor(parsedUnit);
+    } catch (AbortCompilation e) {
+    } finally {
+      //		diet = old;
+    }
+  }
+  public CompilationUnitDeclaration parseCompilationUnit(ICompilationUnit unit, boolean fullParse) {
+
+    //		boolean old = diet;
+    //		if (fullParse) {
+    //			unknownRefs = new NameReference[10];
+    //			unknownRefsCounter = 0;
+    //		}
+
+    try {
+      //			diet = true;
+      this.reportReferenceInfo = fullParse;
+      CompilationResult compilationUnitResult = new CompilationResult(unit, 0, 0, this.options.maxProblemsPerUnit);
+      CompilationUnitDeclaration parsedUnit = parse(unit, compilationUnitResult, false);
+      if (scanner.recordLineSeparator) {
+        requestor.acceptLineSeparatorPositions(scanner.getLineEnds());
+      }
+      int initialStart = this.scanner.initialPosition;
+      int initialEnd = this.scanner.eofPosition;
+      //			if (this.localDeclarationVisitor != null || fullParse){
+      //				diet = false;
+      //				this.getMethodBodies(parsedUnit);
+      //			}
+      this.scanner.resetTo(initialStart, initialEnd);
+      notifySourceElementRequestor(parsedUnit);
+      return parsedUnit;
+    } catch (AbortCompilation e) {
+      // ignore this exception
+    } finally {
+      //			diet = old;
+    }
+    return null;
+  }
+
+  //public void parseTypeMemberDeclarations(
+  //	ISourceType sourceType,
+  //	ICompilationUnit sourceUnit,
+  //	int start,
+  //	int end,
+  //	boolean needReferenceInfo) {
+  //	boolean old = diet;
+  //	if (needReferenceInfo) {
+  //		unknownRefs = new NameReference[10];
+  //		unknownRefsCounter = 0;
+  //	}
+  //	
+  //	try {
+  //		diet = !needReferenceInfo;
+  //		reportReferenceInfo = needReferenceInfo;
+  //		CompilationResult compilationUnitResult =
+  //			new CompilationResult(sourceUnit, 0, 0, this.options.maxProblemsPerUnit);
+  //		CompilationUnitDeclaration unit =
+  //			SourceTypeConverter.buildCompilationUnit(
+  //				new ISourceType[]{sourceType},
+  //				false, // no need for field and methods
+  //				false, // no need for member types
+  //				false, // no need for field initialization
+  //				problemReporter(),
+  //				compilationUnitResult);
+  //		if ((unit == null) || (unit.types == null) || (unit.types.length != 1))
+  //			return;
+  //		this.sourceType = sourceType;
+  //		try {
+  //			/* automaton initialization */
+  //			initialize();
+  //			goForClassBodyDeclarations();
+  //			/* scanner initialization */
+  //			scanner.setSource(sourceUnit.getContents());
+  //			scanner.resetTo(start, end);
+  //			/* unit creation */
+  //			referenceContext = compilationUnit = unit;
+  //			/* initialize the astStacl */
+  //			// the compilationUnitDeclaration should contain exactly one type
+  //			pushOnAstStack(unit.types[0]);
+  //			/* run automaton */
+  //			parse();
+  //			notifySourceElementRequestor(unit);
+  //		} finally {
+  //			unit = compilationUnit;
+  //			compilationUnit = null; // reset parser
+  //		}
+  //	} catch (AbortCompilation e) {
+  //	} finally {
+  //		if (scanner.recordLineSeparator) {
+  //			requestor.acceptLineSeparatorPositions(scanner.getLineEnds());
+  //		}
+  //		diet = old;
+  //	}
+  //}
+  //
+  //public void parseTypeMemberDeclarations(
+  //	char[] contents,
+  //	int start,
+  //	int end) {
+  //
+  //	boolean old = diet;
+  //	
+  //	try {
+  //		diet = true;
+  //
+  //		/* automaton initialization */
+  //		initialize();
+  //		goForClassBodyDeclarations();
+  //		/* scanner initialization */
+  //		scanner.setSource(contents);
+  //		scanner.recordLineSeparator = false;
+  //		scanner.taskTags = null;
+  //		scanner.taskPriorities = null;
+  //		scanner.resetTo(start, end);
+  //
+  //		/* unit creation */
+  //		referenceContext = null;
+  //
+  //		/* initialize the astStacl */
+  //		// the compilationUnitDeclaration should contain exactly one type
+  //		/* run automaton */
+  //		parse();
+  //		notifySourceElementRequestor((CompilationUnitDeclaration)null);
+  //	} catch (AbortCompilation e) {
+  //	} finally {
+  //		diet = old;
+  //	}
+  //}
+  /**
+   * Sort the given ast nodes by their positions.
+   */
+  private static void quickSort(AstNode[] sortedCollection, int left, int right) {
+    int original_left = left;
+    int original_right = right;
+    AstNode mid = sortedCollection[(left + right) / 2];
+    do {
+      while (sortedCollection[left].sourceStart < mid.sourceStart) {
+        left++;
+      }
+      while (mid.sourceStart < sortedCollection[right].sourceStart) {
+        right--;
+      }
+      if (left <= right) {
+        AstNode tmp = sortedCollection[left];
+        sortedCollection[left] = sortedCollection[right];
+        sortedCollection[right] = tmp;
+        left++;
+        right--;
+      }
+    } while (left <= right);
+    if (original_left < right) {
+      quickSort(sortedCollection, original_left, right);
+    }
+    if (left < original_right) {
+      quickSort(sortedCollection, left, original_right);
+    }
+  }
+  /*
+   * Answer a char array representation of the type name formatted like: - type
+   * name + dimensions Example: "A[][]".toCharArray()
+   * "java.lang.String".toCharArray()
+   */
+  private char[] returnTypeName(TypeReference type) {
+    if (type == null)
+      return null;
+    int dimension = type.dimensions();
+    if (dimension != 0) {
+      char[] dimensionsArray = new char[dimension * 2];
+      for (int i = 0; i < dimension; i++) {
+        dimensionsArray[i * 2] = '[';
+        dimensionsArray[(i * 2) + 1] = ']';
+      }
+      return CharOperation.concat(CharOperation.concatWith(type.getTypeName(), '.'), dimensionsArray);
+    }
+    return CharOperation.concatWith(type.getTypeName(), '.');
+  }
 
-public void addUnknownRef(NameReference nameRef) {
-	if (this.unknownRefs.length == this.unknownRefsCounter) {
-		// resize
-		System.arraycopy(
-			this.unknownRefs,
-			0,
-			(this.unknownRefs = new NameReference[this.unknownRefsCounter * 2]),
-			0,
-			this.unknownRefsCounter);
-	}
-	this.unknownRefs[this.unknownRefsCounter++] = nameRef;
-}
+  public void addUnknownRef(NameReference nameRef) {
+    if (this.unknownRefs.length == this.unknownRefsCounter) {
+      // resize
+      System.arraycopy(this.unknownRefs, 0, (this.unknownRefs = new NameReference[this.unknownRefsCounter * 2]), 0,
+          this.unknownRefsCounter);
+    }
+    this.unknownRefs[this.unknownRefsCounter++] = nameRef;
+  }
 
-private void visitIfNeeded(AbstractMethodDeclaration method) {
-	if (this.localDeclarationVisitor != null 
-		&& (method.bits & AstNode.HasLocalTypeMASK) != 0) {
-			if (method.statements != null) {
-				int statementsLength = method.statements.length;
-				for (int i = 0; i < statementsLength; i++)
-					method.statements[i].traverse(this.localDeclarationVisitor, method.scope);
-			}
-	}
-}
+  private void visitIfNeeded(AbstractMethodDeclaration method) {
+    if (this.localDeclarationVisitor != null && (method.bits & AstNode.HasLocalTypeMASK) != 0) {
+      if (method.statements != null) {
+        int statementsLength = method.statements.length;
+        for (int i = 0; i < statementsLength; i++)
+          method.statements[i].traverse(this.localDeclarationVisitor, method.scope);
+      }
+    }
+  }
 
-//private void visitIfNeeded(FieldDeclaration field) {
-//	if (this.localDeclarationVisitor != null 
-//		&& (field.bits & AstNode.HasLocalTypeMASK) != 0) {
-//			if (field.initialization != null) {
-//				field.initialization.traverse(this.localDeclarationVisitor, null);
-//			}
-//	}
-//}
-//
-//private void visitIfNeeded(Initializer initializer) {
-//	if (this.localDeclarationVisitor != null 
-//		&& (initializer.bits & AstNode.HasLocalTypeMASK) != 0) {
-//			if (initializer.block != null) {
-//				initializer.block.traverse(this.localDeclarationVisitor, null);
-//			}
-//	}
-//}
-//
-//protected void reportSyntaxError(int act, int currentKind, int stateStackTop) {
-//	if (compilationUnit == null) return;
-//	super.reportSyntaxError(act, currentKind,stateStackTop);
-//}
-protected CompilationUnitDeclaration endParse(int act) {
-//	if (sourceType != null) {
-//		if (sourceType.isInterface()) {
-//			consumeInterfaceDeclaration();
-//		} else {
-//			consumeClassDeclaration();
-//		}
-//	}
-	if (compilationUnit != null) {
-		CompilationUnitDeclaration result = super.endParse(act);
-		return result;
-	} else {
-		return null;
-	}		
-}
-}
+  //private void visitIfNeeded(FieldDeclaration field) {
+  //	if (this.localDeclarationVisitor != null
+  //		&& (field.bits & AstNode.HasLocalTypeMASK) != 0) {
+  //			if (field.initialization != null) {
+  //				field.initialization.traverse(this.localDeclarationVisitor, null);
+  //			}
+  //	}
+  //}
+  //
+  //private void visitIfNeeded(Initializer initializer) {
+  //	if (this.localDeclarationVisitor != null
+  //		&& (initializer.bits & AstNode.HasLocalTypeMASK) != 0) {
+  //			if (initializer.block != null) {
+  //				initializer.block.traverse(this.localDeclarationVisitor, null);
+  //			}
+  //	}
+  //}
+  //
+  //protected void reportSyntaxError(int act, int currentKind, int
+  // stateStackTop) {
+  //	if (compilationUnit == null) return;
+  //	super.reportSyntaxError(act, currentKind,stateStackTop);
+  //}
+  protected CompilationUnitDeclaration endParse(int act) {
+    //	if (sourceType != null) {
+    //		if (sourceType.isInterface()) {
+    //			consumeInterfaceDeclaration();
+    //		} else {
+    //			consumeClassDeclaration();
+    //		}
+    //	}
+    if (compilationUnit != null) {
+      CompilationUnitDeclaration result = super.endParse(act);
+      return result;
+    } else {
+      return null;
+    }
+  }
+}
\ No newline at end of file
diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/lookup/ClassScope.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/lookup/ClassScope.java
index 6ec975c..6e26e42 100644
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/lookup/ClassScope.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/lookup/ClassScope.java
@@ -685,8 +685,8 @@ public class ClassScope extends Scope {
 	private void connectTypeHierarchyWithoutMembers() {
 		// must ensure the imports are resolved
 		if (parent instanceof CompilationUnitScope) {
-			if (((CompilationUnitScope) parent).imports == null)
-				 ((CompilationUnitScope) parent).checkAndSetImports();
+//			if (((CompilationUnitScope) parent).imports == null)
+//				 ((CompilationUnitScope) parent).checkAndSetImports();
 		} else if (parent instanceof ClassScope) {
 			// ensure that the enclosing type has already been checked
 			 ((ClassScope) parent).connectTypeHierarchyWithoutMembers();
diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/lookup/CompilationUnitScope.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/lookup/CompilationUnitScope.java
index d50f6f7..c6dcbb6 100644
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/lookup/CompilationUnitScope.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/lookup/CompilationUnitScope.java
@@ -43,8 +43,8 @@ public class CompilationUnitScope extends Scope {
     this.environment = environment;
     this.referenceContext = unit;
     unit.scope = this;
-    this.currentPackageName = unit.currentPackage == null ? CharOperation.NO_CHAR_CHAR : unit.currentPackage.tokens;
-
+//    this.currentPackageName = unit.currentPackage == null ? CharOperation.NO_CHAR_CHAR : unit.currentPackage.tokens;
+    this.currentPackageName = null; 
     //	if (environment.options.produceReferenceInfo) {
     //		this.qualifiedReferences = new CompoundNameVector();
     //		this.simpleNameReferences = new SimpleNameVector();
@@ -130,66 +130,66 @@ public class CompilationUnitScope extends Scope {
     if (count != topLevelTypes.length)
       System.arraycopy(topLevelTypes, 0, topLevelTypes = new SourceTypeBinding[count], 0, count);
   }
-  void checkAndSetImports() {
-    // initialize the default imports if necessary... share the default java.lang.* import
-    if (environment.defaultImports == null) {
-      Binding importBinding = environment.getTopLevelPackage(JAVA);
-      if (importBinding != null)
-        importBinding = ((PackageBinding) importBinding).getTypeOrPackage(JAVA_LANG[1]);
-
-      // abort if java.lang cannot be found...
-      if (importBinding == null || !importBinding.isValidBinding())
-        problemReporter().isClassPathCorrect(JAVA_LANG_OBJECT, referenceCompilationUnit());
-
-      environment.defaultImports = new ImportBinding[] { new ImportBinding(JAVA_LANG, true, importBinding, null)};
-    }
-    if (referenceContext.imports == null) {
-      imports = environment.defaultImports;
-      return;
-    }
-
-    // allocate the import array, add java.lang.* by default
-    int numberOfStatements = referenceContext.imports.length;
-    int numberOfImports = numberOfStatements + 1;
-    for (int i = 0; i < numberOfStatements; i++) {
-      ImportReference importReference = referenceContext.imports[i];
-      if (importReference.onDemand && CharOperation.equals(JAVA_LANG, importReference.tokens)) {
-        numberOfImports--;
-        break;
-      }
-    }
-    ImportBinding[] resolvedImports = new ImportBinding[numberOfImports];
-    resolvedImports[0] = environment.defaultImports[0];
-    int index = 1;
-
-    nextImport : for (int i = 0; i < numberOfStatements; i++) {
-      ImportReference importReference = referenceContext.imports[i];
-      char[][] compoundName = importReference.tokens;
-
-      // skip duplicates or imports of the current package
-      for (int j = 0; j < index; j++)
-        if (resolvedImports[j].onDemand == importReference.onDemand)
-          if (CharOperation.equals(compoundName, resolvedImports[j].compoundName))
-            continue nextImport;
-      if (importReference.onDemand == true)
-        if (CharOperation.equals(compoundName, currentPackageName))
-          continue nextImport;
-
-      if (importReference.onDemand) {
-        Binding importBinding = findOnDemandImport(compoundName);
-        if (!importBinding.isValidBinding())
-          continue nextImport; // we report all problems in faultInImports()
-        resolvedImports[index++] = new ImportBinding(compoundName, true, importBinding, importReference);
-      } else {
-        resolvedImports[index++] = new ImportBinding(compoundName, false, null, importReference);
-      }
-    }
-
-    // shrink resolvedImports... only happens if an error was reported
-    if (resolvedImports.length > index)
-      System.arraycopy(resolvedImports, 0, resolvedImports = new ImportBinding[index], 0, index);
-    imports = resolvedImports;
-  }
+//  void checkAndSetImports() {
+//    // initialize the default imports if necessary... share the default java.lang.* import
+//    if (environment.defaultImports == null) {
+//      Binding importBinding = environment.getTopLevelPackage(JAVA);
+//      if (importBinding != null)
+//        importBinding = ((PackageBinding) importBinding).getTypeOrPackage(JAVA_LANG[1]);
+//
+//      // abort if java.lang cannot be found...
+//      if (importBinding == null || !importBinding.isValidBinding())
+//        problemReporter().isClassPathCorrect(JAVA_LANG_OBJECT, referenceCompilationUnit());
+//
+//      environment.defaultImports = new ImportBinding[] { new ImportBinding(JAVA_LANG, true, importBinding, null)};
+//    }
+//    if (referenceContext.imports == null) {
+//      imports = environment.defaultImports;
+//      return;
+//    }
+//
+//    // allocate the import array, add java.lang.* by default
+//    int numberOfStatements = referenceContext.imports.length;
+//    int numberOfImports = numberOfStatements + 1;
+//    for (int i = 0; i < numberOfStatements; i++) {
+//      ImportReference importReference = referenceContext.imports[i];
+//      if (importReference.onDemand && CharOperation.equals(JAVA_LANG, importReference.tokens)) {
+//        numberOfImports--;
+//        break;
+//      }
+//    }
+//    ImportBinding[] resolvedImports = new ImportBinding[numberOfImports];
+//    resolvedImports[0] = environment.defaultImports[0];
+//    int index = 1;
+//
+//    nextImport : for (int i = 0; i < numberOfStatements; i++) {
+//      ImportReference importReference = referenceContext.imports[i];
+//      char[][] compoundName = importReference.tokens;
+//
+//      // skip duplicates or imports of the current package
+//      for (int j = 0; j < index; j++)
+//        if (resolvedImports[j].onDemand == importReference.onDemand)
+//          if (CharOperation.equals(compoundName, resolvedImports[j].compoundName))
+//            continue nextImport;
+//      if (importReference.onDemand == true)
+//        if (CharOperation.equals(compoundName, currentPackageName))
+//          continue nextImport;
+//
+//      if (importReference.onDemand) {
+//        Binding importBinding = findOnDemandImport(compoundName);
+//        if (!importBinding.isValidBinding())
+//          continue nextImport; // we report all problems in faultInImports()
+//        resolvedImports[index++] = new ImportBinding(compoundName, true, importBinding, importReference);
+//      } else {
+//        resolvedImports[index++] = new ImportBinding(compoundName, false, null, importReference);
+//      }
+//    }
+//
+//    // shrink resolvedImports... only happens if an error was reported
+//    if (resolvedImports.length > index)
+//      System.arraycopy(resolvedImports, 0, resolvedImports = new ImportBinding[index], 0, index);
+//    imports = resolvedImports;
+//  }
   /*
    * INTERNAL USE-ONLY
    * Innerclasses get their name computed as they are generated, since some may not
@@ -239,102 +239,102 @@ public class CompilationUnitScope extends Scope {
     for (int i = 0, length = topLevelTypes.length; i < length; i++)
       topLevelTypes[i].scope.connectTypeHierarchy();
   }
-  void faultInImports() {
-    if (referenceContext.imports == null)
-      return;
-
-    // collect the top level type names if a single type import exists
-    int numberOfStatements = referenceContext.imports.length;
-    HashtableOfType typesBySimpleNames = null;
-    for (int i = 0; i < numberOfStatements; i++) {
-      if (!referenceContext.imports[i].onDemand) {
-        typesBySimpleNames = new HashtableOfType(topLevelTypes.length + numberOfStatements);
-        for (int j = 0, length = topLevelTypes.length; j < length; j++)
-          typesBySimpleNames.put(topLevelTypes[j].sourceName, topLevelTypes[j]);
-        break;
-      }
-    }
-
-    // allocate the import array, add java.lang.* by default
-    int numberOfImports = numberOfStatements + 1;
-    for (int i = 0; i < numberOfStatements; i++) {
-      ImportReference importReference = referenceContext.imports[i];
-      if (importReference.onDemand && CharOperation.equals(JAVA_LANG, importReference.tokens)) {
-        numberOfImports--;
-        break;
-      }
-    }
-    ImportBinding[] resolvedImports = new ImportBinding[numberOfImports];
-    resolvedImports[0] = environment.defaultImports[0];
-    int index = 1;
-
-    nextImport : for (int i = 0; i < numberOfStatements; i++) {
-      ImportReference importReference = referenceContext.imports[i];
-      char[][] compoundName = importReference.tokens;
-
-      // skip duplicates or imports of the current package
-      for (int j = 0; j < index; j++)
-        if (resolvedImports[j].onDemand == importReference.onDemand)
-          if (CharOperation.equals(compoundName, resolvedImports[j].compoundName)) {
-            problemReporter().unusedImport(importReference); // since skipped, must be reported now
-            continue nextImport;
-          }
-      if (importReference.onDemand == true)
-        if (CharOperation.equals(compoundName, currentPackageName)) {
-          problemReporter().unusedImport(importReference); // since skipped, must be reported now
-          continue nextImport;
-        }
-      if (importReference.onDemand) {
-        Binding importBinding = findOnDemandImport(compoundName);
-        if (!importBinding.isValidBinding()) {
-          problemReporter().importProblem(importReference, importBinding);
-          continue nextImport;
-        }
-        resolvedImports[index++] = new ImportBinding(compoundName, true, importBinding, importReference);
-      } else {
-        Binding typeBinding = findSingleTypeImport(compoundName);
-        if (!typeBinding.isValidBinding()) {
-          problemReporter().importProblem(importReference, typeBinding);
-          continue nextImport;
-        }
-        if (typeBinding instanceof PackageBinding) {
-          problemReporter().cannotImportPackage(importReference);
-          continue nextImport;
-        }
-        if (typeBinding instanceof ReferenceBinding) {
-          ReferenceBinding referenceBinding = (ReferenceBinding) typeBinding;
-          if (importReference.isTypeUseDeprecated(referenceBinding, this)) {
-            problemReporter().deprecatedType((TypeBinding) typeBinding, importReference);
-          }
-        }
-        ReferenceBinding existingType = typesBySimpleNames.get(compoundName[compoundName.length - 1]);
-        if (existingType != null) {
-          // duplicate test above should have caught this case, but make sure
-          if (existingType == typeBinding) {
-            continue nextImport;
-          }
-          // either the type collides with a top level type or another imported type
-          for (int j = 0, length = topLevelTypes.length; j < length; j++) {
-            if (CharOperation.equals(topLevelTypes[j].sourceName, existingType.sourceName)) {
-              problemReporter().conflictingImport(importReference);
-              continue nextImport;
-            }
-          }
-          problemReporter().duplicateImport(importReference);
-          continue nextImport;
-        }
-        resolvedImports[index++] = new ImportBinding(compoundName, false, typeBinding, importReference);
-        typesBySimpleNames.put(compoundName[compoundName.length - 1], (ReferenceBinding) typeBinding);
-      }
-    }
-
-    // shrink resolvedImports... only happens if an error was reported
-    if (resolvedImports.length > index)
-      System.arraycopy(resolvedImports, 0, resolvedImports = new ImportBinding[index], 0, index);
-    imports = resolvedImports;
-  }
+//  void faultInImports() {
+//    if (referenceContext.imports == null)
+//      return;
+//
+//    // collect the top level type names if a single type import exists
+//    int numberOfStatements = referenceContext.imports.length;
+//    HashtableOfType typesBySimpleNames = null;
+//    for (int i = 0; i < numberOfStatements; i++) {
+//      if (!referenceContext.imports[i].onDemand) {
+//        typesBySimpleNames = new HashtableOfType(topLevelTypes.length + numberOfStatements);
+//        for (int j = 0, length = topLevelTypes.length; j < length; j++)
+//          typesBySimpleNames.put(topLevelTypes[j].sourceName, topLevelTypes[j]);
+//        break;
+//      }
+//    }
+//
+//    // allocate the import array, add java.lang.* by default
+//    int numberOfImports = numberOfStatements + 1;
+//    for (int i = 0; i < numberOfStatements; i++) {
+//      ImportReference importReference = referenceContext.imports[i];
+//      if (importReference.onDemand && CharOperation.equals(JAVA_LANG, importReference.tokens)) {
+//        numberOfImports--;
+//        break;
+//      }
+//    }
+//    ImportBinding[] resolvedImports = new ImportBinding[numberOfImports];
+//    resolvedImports[0] = environment.defaultImports[0];
+//    int index = 1;
+//
+//    nextImport : for (int i = 0; i < numberOfStatements; i++) {
+//      ImportReference importReference = referenceContext.imports[i];
+//      char[][] compoundName = importReference.tokens;
+//
+//      // skip duplicates or imports of the current package
+//      for (int j = 0; j < index; j++)
+//        if (resolvedImports[j].onDemand == importReference.onDemand)
+//          if (CharOperation.equals(compoundName, resolvedImports[j].compoundName)) {
+//            problemReporter().unusedImport(importReference); // since skipped, must be reported now
+//            continue nextImport;
+//          }
+//      if (importReference.onDemand == true)
+//        if (CharOperation.equals(compoundName, currentPackageName)) {
+//          problemReporter().unusedImport(importReference); // since skipped, must be reported now
+//          continue nextImport;
+//        }
+//      if (importReference.onDemand) {
+//        Binding importBinding = findOnDemandImport(compoundName);
+//        if (!importBinding.isValidBinding()) {
+//          problemReporter().importProblem(importReference, importBinding);
+//          continue nextImport;
+//        }
+//        resolvedImports[index++] = new ImportBinding(compoundName, true, importBinding, importReference);
+//      } else {
+//        Binding typeBinding = findSingleTypeImport(compoundName);
+//        if (!typeBinding.isValidBinding()) {
+//          problemReporter().importProblem(importReference, typeBinding);
+//          continue nextImport;
+//        }
+//        if (typeBinding instanceof PackageBinding) {
+//          problemReporter().cannotImportPackage(importReference);
+//          continue nextImport;
+//        }
+//        if (typeBinding instanceof ReferenceBinding) {
+//          ReferenceBinding referenceBinding = (ReferenceBinding) typeBinding;
+//          if (importReference.isTypeUseDeprecated(referenceBinding, this)) {
+//            problemReporter().deprecatedType((TypeBinding) typeBinding, importReference);
+//          }
+//        }
+//        ReferenceBinding existingType = typesBySimpleNames.get(compoundName[compoundName.length - 1]);
+//        if (existingType != null) {
+//          // duplicate test above should have caught this case, but make sure
+//          if (existingType == typeBinding) {
+//            continue nextImport;
+//          }
+//          // either the type collides with a top level type or another imported type
+//          for (int j = 0, length = topLevelTypes.length; j < length; j++) {
+//            if (CharOperation.equals(topLevelTypes[j].sourceName, existingType.sourceName)) {
+//              problemReporter().conflictingImport(importReference);
+//              continue nextImport;
+//            }
+//          }
+//          problemReporter().duplicateImport(importReference);
+//          continue nextImport;
+//        }
+//        resolvedImports[index++] = new ImportBinding(compoundName, false, typeBinding, importReference);
+//        typesBySimpleNames.put(compoundName[compoundName.length - 1], (ReferenceBinding) typeBinding);
+//      }
+//    }
+//
+//    // shrink resolvedImports... only happens if an error was reported
+//    if (resolvedImports.length > index)
+//      System.arraycopy(resolvedImports, 0, resolvedImports = new ImportBinding[index], 0, index);
+//    imports = resolvedImports;
+//  }
   public void faultInTypes() {
-    faultInImports();
+//    faultInImports();
     if (topLevelTypes==null) {
 			topLevelTypes = new SourceTypeBinding[0];
     }
diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/lookup/LookupEnvironment.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/lookup/LookupEnvironment.java
index d497ee5..c2be8ee 100644
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/lookup/LookupEnvironment.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/lookup/LookupEnvironment.java
@@ -199,8 +199,8 @@ public void completeTypeBindings(CompilationUnitDeclaration parsedUnit) {
 	} else {
 		if (parsedUnit.scope == null) return; // parsing errors were too severe
 
-		if (stepCompleted >= CHECK_AND_SET_IMPORTS)
-			parsedUnit.scope.checkAndSetImports();
+//		if (stepCompleted >= CHECK_AND_SET_IMPORTS)
+//			parsedUnit.scope.checkAndSetImports();
 
 		if (stepCompleted >= CONNECT_TYPE_HIERARCHY)
 			parsedUnit.scope.connectTypeHierarchy();
@@ -217,7 +217,7 @@ public void completeTypeBindings(CompilationUnitDeclaration parsedUnit) {
 public void completeTypeBindings(CompilationUnitDeclaration parsedUnit, boolean buildFieldsAndMethods) {
 	if (parsedUnit.scope == null) return; // parsing errors were too severe
 
-	parsedUnit.scope.checkAndSetImports();
+//	parsedUnit.scope.checkAndSetImports();
 	parsedUnit.scope.connectTypeHierarchy();
 
 	if (buildFieldsAndMethods)
@@ -308,35 +308,36 @@ public BinaryTypeBinding createBinaryTypeFrom(IBinaryType binaryType, PackageBin
 */
 
 PackageBinding createPackage(char[][] compoundName) {
-	PackageBinding packageBinding = getPackage0(compoundName[0]);
-	if (packageBinding == null || packageBinding == TheNotFoundPackage) {
-		packageBinding = new PackageBinding(compoundName[0], this);
-		knownPackages.put(compoundName[0], packageBinding);
-	}
-
-	for (int i = 1, length = compoundName.length; i < length; i++) {
-		// check to see if it collides with a known type...
-		// this case can only happen if the package does not exist as a directory in the file system
-		// otherwise when the source type was defined, the correct error would have been reported
-		// unless its an unresolved type which is referenced from an inconsistent class file
-		ReferenceBinding type = packageBinding.getType0(compoundName[i]);
-		if (type != null && type != TheNotFoundType && !(type instanceof UnresolvedReferenceBinding))
-			return null;
-
-		PackageBinding parent = packageBinding;
-		if ((packageBinding = parent.getPackage0(compoundName[i])) == null || packageBinding == TheNotFoundPackage) {
-			// if the package is unknown, check to see if a type exists which would collide with the new package
-			// catches the case of a package statement of: package java.lang.Object;
-			// since the package can be added after a set of source files have already been compiled, we need
-			// whenever a package statement is encountered
-			if (nameEnvironment.findType(compoundName[i], parent.compoundName) != null)
-				return null;
-
-			packageBinding = new PackageBinding(CharOperation.subarray(compoundName, 0, i + 1), parent, this);
-			parent.addPackage(packageBinding);
-		}
-	}
-	return packageBinding;
+    return null;
+//	PackageBinding packageBinding = getPackage0(compoundName[0]);
+//	if (packageBinding == null || packageBinding == TheNotFoundPackage) {
+//		packageBinding = new PackageBinding(compoundName[0], this);
+//		knownPackages.put(compoundName[0], packageBinding);
+//	}
+//
+//	for (int i = 1, length = compoundName.length; i < length; i++) {
+//		// check to see if it collides with a known type...
+//		// this case can only happen if the package does not exist as a directory in the file system
+//		// otherwise when the source type was defined, the correct error would have been reported
+//		// unless its an unresolved type which is referenced from an inconsistent class file
+//		ReferenceBinding type = packageBinding.getType0(compoundName[i]);
+//		if (type != null && type != TheNotFoundType && !(type instanceof UnresolvedReferenceBinding))
+//			return null;
+//
+//		PackageBinding parent = packageBinding;
+//		if ((packageBinding = parent.getPackage0(compoundName[i])) == null || packageBinding == TheNotFoundPackage) {
+//			// if the package is unknown, check to see if a type exists which would collide with the new package
+//			// catches the case of a package statement of: package java.lang.Object;
+//			// since the package can be added after a set of source files have already been compiled, we need
+//			// whenever a package statement is encountered
+//			if (nameEnvironment.findType(compoundName[i], parent.compoundName) != null)
+//				return null;
+//
+//			packageBinding = new PackageBinding(CharOperation.subarray(compoundName, 0, i + 1), parent, this);
+//			parent.addPackage(packageBinding);
+//		}
+//	}
+//	return packageBinding;
 }
 /* Answer the type for the compoundName if it exists in the cache.
 * Answer theNotFoundType if it could not be resolved the first time
diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/parser/Parser.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/parser/Parser.java
index d2b5e96..2ab8088 100644
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/parser/Parser.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/parser/Parser.java
@@ -30,4066 +30,3901 @@ import net.sourceforge.phpeclipse.internal.compiler.ast.TypeDeclaration;
 
 import org.eclipse.core.resources.IFile;
 public class Parser //extends PHPParserSuperclass
-		implements ITerminalSymbols, CompilerModifiers, ParserBasicInformation {
-	//internal data for the automat
-	protected final static int StackIncrement = 255;
-	protected int stateStackTop;
-	protected int[] stack = new int[StackIncrement];
-	public int firstToken; // handle for multiple parsing goals
-	public int lastAct; //handle for multiple parsing goals
-	protected RecoveredElement currentElement;
-	public static boolean VERBOSE_RECOVERY = false;
-	protected boolean diet = false; //tells the scanner to jump over some
-	// parts of the code/expressions like
-	// method bodies
-	//scanner token
-	public Scanner scanner;
-	private ArrayList phpList;
-	private int currentPHPString;
-	private boolean phpEnd;
-	// private static HashMap keywordMap = null;
-	private String str;
-	// current character
-	//  char ch;
-	// current token
-	int token;
-	// row counter for syntax errors:
-	//int rowCount;
-	// column counter for syntax errors:
-	//int columnCount;
-	//int chIndx;
-	//
-	//	// current identifier
-	//	String identifier;
-	Long longNumber;
-	Double doubleNumber;
-	private String stringValue;
-	/** Contains the current expression. */
-	// private StringBuffer expression;
-	//private boolean phpMode;
-	protected int modifiers;
-	protected int modifiersSourceStart;
-	protected Parser(ProblemReporter problemReporter) {
-		this.problemReporter = problemReporter;
-		this.options = problemReporter.options;
-		this.currentPHPString = 0;
-		//		PHPParserSuperclass.fileToParse = fileToParse;
-		this.phpList = null;
-		this.str = "";
-		this.token = TokenNameEOF;
-		//    this.chIndx = 0;
-		//    this.rowCount = 1;
-		//    this.columnCount = 0;
-		this.phpEnd = false;
-		//   getNextToken();
-		this.initializeScanner();
-	}
-	public void setFileToParse(IFile fileToParse) {
-		this.currentPHPString = 0;
-		//    PHPParserSuperclass.fileToParse = fileToParse;
-		this.phpList = null;
-		this.str = "";
-		this.token = TokenNameEOF;
-		this.phpEnd = false;
-		this.initializeScanner();
-	}
-	/**
-	 * ClassDeclaration Constructor.
-	 * 
-	 * @param s
-	 * @param sess
-	 *            Description of Parameter
-	 * @see
-	 */
-	public Parser(IFile fileToParse) {
-		//    if (keywordMap == null) {
-		//      keywordMap = new HashMap();
-		//      for (int i = 0; i < PHP_KEYWORS.length; i++) {
-		//        keywordMap.put(PHP_KEYWORS[i], new Integer(PHP_KEYWORD_TOKEN[i]));
-		//      }
-		//    }
-		this.currentPHPString = 0;
-		//    PHPParserSuperclass.fileToParse = fileToParse;
-		this.phpList = null;
-		this.str = "";
-		this.token = TokenNameEOF;
-		//    this.chIndx = 0;
-		//    this.rowCount = 1;
-		//    this.columnCount = 0;
-		this.phpEnd = false;
-		//   getNextToken();
-		this.initializeScanner();
-	}
-	public void initializeScanner() {
-		this.scanner = new Scanner(
-				false /* comment */,
-				false /* whitespace */,
-				this.options.getSeverity(CompilerOptions.NonExternalizedString) != ProblemSeverities.Ignore /* nls */,
-				false, false, this.options.taskTags/* taskTags */,
-				this.options.taskPriorites/* taskPriorities */);
-	}
-	/**
-	 * Create marker for the parse error
-	 */
-	//  private void setMarker(String message, int charStart, int charEnd, int
-	// errorLevel) {
-	//    setMarker(fileToParse, message, charStart, charEnd, errorLevel);
-	//  }
-	/**
-	 * This method will throw the SyntaxError. It will add the good lines and
-	 * columns to the Error
-	 * 
-	 * @param error
-	 *            the error message
-	 * @throws SyntaxError
-	 *             the error raised
-	 */
-	private void throwSyntaxError(String error) {
-		int problemStartPosition = scanner.getCurrentTokenStartPosition();
-		int problemEndPosition = scanner.getCurrentTokenEndPosition();
-		throwSyntaxError(error, problemStartPosition, problemEndPosition + 1);
-	}
-	/**
-	 * This method will throw the SyntaxError. It will add the good lines and
-	 * columns to the Error
-	 * 
-	 * @param error
-	 *            the error message
-	 * @throws SyntaxError
-	 *             the error raised
-	 */
-	//  private void throwSyntaxError(String error, int startRow) {
-	//    throw new SyntaxError(startRow, 0, " ", error);
-	//  }
-	private void throwSyntaxError(String error, int problemStartPosition,
-			int problemEndPosition) {
-		problemReporter.phpParsingError(new String[]{error},
-				problemStartPosition, problemEndPosition, referenceContext,
-				compilationUnit.compilationResult);
-		throw new SyntaxError(1, 0, " ", error);
-	}
-	private void reportSyntaxError(String error, int problemStartPosition,
-			int problemEndPosition) {
-		problemReporter.phpParsingError(new String[]{error},
-				problemStartPosition, problemEndPosition, referenceContext,
-				compilationUnit.compilationResult);
-	}
-	private void reportSyntaxWarning(String error, int problemStartPosition,
-			int problemEndPosition) {
-		problemReporter.phpParsingWarning(new String[]{error},
-				problemStartPosition, problemEndPosition, referenceContext,
-				compilationUnit.compilationResult);
-	}
-	/**
-	 * Method Declaration.
-	 * 
-	 * @see
-	 */
-	//  private void getChar() {
-	//    if (str.length() > chIndx) {
-	//      ch = str.charAt(chIndx++);
-	//
-	//      return;
-	//    }
-	//
-	//    chIndx = str.length() + 1;
-	//    ch = ' ';
-	//    // token = TokenNameEOF;
-	//    phpEnd = true;
-	//  }
-	/**
-	 * gets the next token from input
-	 */
-	private void getNextToken() {
-		try {
-			token = scanner.getNextToken();
-			if (Scanner.DEBUG) {
-				int currentEndPosition = scanner.getCurrentTokenEndPosition();
-				int currentStartPosition = scanner
-						.getCurrentTokenStartPosition();
-				System.out.print(currentStartPosition + ","
-						+ currentEndPosition + ": ");
-				System.out.println(scanner.toStringAction(token));
-			}
-		} catch (InvalidInputException e) {
-			token = TokenNameERROR;
-		}
-		return;
-	}
-	public void init(String s) {
-		this.str = s;
-		this.token = TokenNameEOF;
-		//    this.chIndx = 0;
-		//    this.rowCount = 1;
-		//    this.columnCount = 0;
-		this.phpEnd = false;
-		//    this.phpMode = false;
-		/* scanner initialization */
-		scanner.setSource(s.toCharArray());
-		scanner.setPHPMode(false);
-	}
-	protected void initialize(boolean phpMode) {
-		compilationUnit = null;
-		referenceContext = null;
-		this.str = "";
-		this.token = TokenNameEOF;
-		//    this.chIndx = 0;
-		//    this.rowCount = 1;
-		//    this.columnCount = 0;
-		this.phpEnd = false;
-		//    this.phpMode = phpMode;
-		scanner.setPHPMode(phpMode);
-	}
-	/**
-	 * Parses a string with php tags i.e. '&lt;body&gt; &lt;?php phpinfo() ?&gt;
-	 * &lt;/body&gt;'
-	 */
-	public void parse(String s) {
-		init(s);
-		parse();
-	}
-	/**
-	 * Parses a string with php tags i.e. '&lt;body&gt; &lt;?php phpinfo() ?&gt;
-	 * &lt;/body&gt;'
-	 */
-	protected void parse() {
-		getNextToken();
-		do {
-			try {
-				if (token != TokenNameEOF && token != TokenNameERROR) {
-					statementList();
-				}
-				if (token != TokenNameEOF) {
-					if (token == TokenNameERROR) {
-						throwSyntaxError("Scanner error (Found unknown token: "
-								+ scanner.toStringAction(token) + ")");
-					}
-					if (token == TokenNameRPAREN) {
-						throwSyntaxError("Too many closing ')'; end-of-file not reached.");
-					}
-					if (token == TokenNameRBRACE) {
-						throwSyntaxError("Too many closing '}'; end-of-file not reached.");
-					}
-					if (token == TokenNameRBRACKET) {
-						throwSyntaxError("Too many closing ']'; end-of-file not reached.");
-					}
-					if (token == TokenNameLPAREN) {
-						throwSyntaxError("Read character '('; end-of-file not reached.");
-					}
-					if (token == TokenNameLBRACE) {
-						throwSyntaxError("Read character '{';  end-of-file not reached.");
-					}
-					if (token == TokenNameLBRACKET) {
-						throwSyntaxError("Read character '[';  end-of-file not reached.");
-					}
-					throwSyntaxError("End-of-file not reached.");
-				}
-				break;
-			} catch (SyntaxError sytaxErr1) {
-				// setMarker(sytaxErr1.getMessage(), sytaxErr1.getLine(),
-				// ERROR);
-				//        setMarker(sytaxErr1.getMessage(),
-				// scanner.getCurrentTokenStartPosition(),
-				// scanner.getCurrentTokenEndPosition(), ERROR);
-				try {
-					// if an error occured,
-					// try to find keywords 'class' or 'function'
-					// to parse the rest of the string
-					while (token != TokenNameEOF && token != TokenNameERROR) {
-						if (token == TokenNameabstract
-								|| token == TokenNamefinal
-								|| token == TokenNameclass
-								|| token == TokenNamefunction) {
-							break;
-						}
-						getNextToken();
-					}
-					if (token == TokenNameEOF || token == TokenNameERROR) {
-						break;
-					}
-				} catch (SyntaxError sytaxErr2) {
-					//    setMarker(sytaxErr2.getMessage(), sytaxErr2.getLine(),
-					// ERROR);
-					//          setMarker(sytaxErr2.getMessage(),
-					// scanner.getCurrentTokenStartPosition(),
-					// scanner.getCurrentTokenEndPosition(), ERROR);
-					break;
-				}
-			}
-		} while (true);
+    implements ITerminalSymbols, CompilerModifiers, ParserBasicInformation {
+  //internal data for the automat
+  protected final static int StackIncrement = 255;
+  protected int stateStackTop;
+  protected int[] stack = new int[StackIncrement];
+  public int firstToken; // handle for multiple parsing goals
+  public int lastAct; //handle for multiple parsing goals
+  protected RecoveredElement currentElement;
+  public static boolean VERBOSE_RECOVERY = false;
+  protected boolean diet = false; //tells the scanner to jump over some
+  // parts of the code/expressions like
+  // method bodies
+  //scanner token
+  public Scanner scanner;
+  private ArrayList phpList;
+  private int currentPHPString;
+  private boolean phpEnd;
+  // private static HashMap keywordMap = null;
+  private String str;
+  // current character
+  //  char ch;
+  // current token
+  int token;
+  // row counter for syntax errors:
+  //int rowCount;
+  // column counter for syntax errors:
+  //int columnCount;
+  //int chIndx;
+  //
+  //	// current identifier
+  //	String identifier;
+  Long longNumber;
+  Double doubleNumber;
+  private String stringValue;
+  /** Contains the current expression. */
+  // private StringBuffer expression;
+  //private boolean phpMode;
+  protected int modifiers;
+  protected int modifiersSourceStart;
+  protected Parser(ProblemReporter problemReporter) {
+    this.problemReporter = problemReporter;
+    this.options = problemReporter.options;
+    this.currentPHPString = 0;
+    //		PHPParserSuperclass.fileToParse = fileToParse;
+    this.phpList = null;
+    this.str = "";
+    this.token = TokenNameEOF;
+    //    this.chIndx = 0;
+    //    this.rowCount = 1;
+    //    this.columnCount = 0;
+    this.phpEnd = false;
+    //   getNextToken();
+    this.initializeScanner();
+  }
+  public void setFileToParse(IFile fileToParse) {
+    this.currentPHPString = 0;
+    //    PHPParserSuperclass.fileToParse = fileToParse;
+    this.phpList = null;
+    this.str = "";
+    this.token = TokenNameEOF;
+    this.phpEnd = false;
+    this.initializeScanner();
+  }
+  /**
+   * ClassDeclaration Constructor.
+   * 
+   * @param s
+   * @param sess
+   *          Description of Parameter
+   * @see
+   */
+  public Parser(IFile fileToParse) {
+    //    if (keywordMap == null) {
+    //      keywordMap = new HashMap();
+    //      for (int i = 0; i < PHP_KEYWORS.length; i++) {
+    //        keywordMap.put(PHP_KEYWORS[i], new Integer(PHP_KEYWORD_TOKEN[i]));
+    //      }
+    //    }
+    this.currentPHPString = 0;
+    //    PHPParserSuperclass.fileToParse = fileToParse;
+    this.phpList = null;
+    this.includesList = null;
+    this.str = "";
+    this.token = TokenNameEOF;
+    //    this.chIndx = 0;
+    //    this.rowCount = 1;
+    //    this.columnCount = 0;
+    this.phpEnd = false;
+    //   getNextToken();
+    this.initializeScanner();
+  }
+  public void initializeScanner() {
+    this.scanner = new Scanner(false /* comment */, false /* whitespace */, this.options
+        .getSeverity(CompilerOptions.NonExternalizedString) != ProblemSeverities.Ignore /* nls */, false, false,
+        this.options.taskTags/* taskTags */, this.options.taskPriorites/* taskPriorities */);
+  }
+  /**
+   * Create marker for the parse error
+   */
+  //  private void setMarker(String message, int charStart, int charEnd, int
+  // errorLevel) {
+  //    setMarker(fileToParse, message, charStart, charEnd, errorLevel);
+  //  }
+  /**
+   * This method will throw the SyntaxError. It will add the good lines and
+   * columns to the Error
+   * 
+   * @param error
+   *          the error message
+   * @throws SyntaxError
+   *           the error raised
+   */
+  private void throwSyntaxError(String error) {
+    int problemStartPosition = scanner.getCurrentTokenStartPosition();
+    int problemEndPosition = scanner.getCurrentTokenEndPosition();
+    throwSyntaxError(error, problemStartPosition, problemEndPosition + 1);
+  }
+  /**
+   * This method will throw the SyntaxError. It will add the good lines and
+   * columns to the Error
+   * 
+   * @param error
+   *          the error message
+   * @throws SyntaxError
+   *           the error raised
+   */
+  //  private void throwSyntaxError(String error, int startRow) {
+  //    throw new SyntaxError(startRow, 0, " ", error);
+  //  }
+  private void throwSyntaxError(String error, int problemStartPosition, int problemEndPosition) {
+    problemReporter.phpParsingError(new String[]{error}, problemStartPosition, problemEndPosition, referenceContext,
+        compilationUnit.compilationResult);
+    throw new SyntaxError(1, 0, " ", error);
+  }
+  private void reportSyntaxError(String error, int problemStartPosition, int problemEndPosition) {
+    problemReporter.phpParsingError(new String[]{error}, problemStartPosition, problemEndPosition, referenceContext,
+        compilationUnit.compilationResult);
+  }
+  private void reportSyntaxWarning(String error, int problemStartPosition, int problemEndPosition) {
+    problemReporter.phpParsingWarning(new String[]{error}, problemStartPosition, problemEndPosition, referenceContext,
+        compilationUnit.compilationResult);
+  }
+  /**
+   * Method Declaration.
+   * 
+   * @see
+   */
+  //  private void getChar() {
+  //    if (str.length() > chIndx) {
+  //      ch = str.charAt(chIndx++);
+  //
+  //      return;
+  //    }
+  //
+  //    chIndx = str.length() + 1;
+  //    ch = ' ';
+  //    // token = TokenNameEOF;
+  //    phpEnd = true;
+  //  }
+  /**
+   * gets the next token from input
+   */
+  private void getNextToken() {
+    try {
+      token = scanner.getNextToken();
+      if (Scanner.DEBUG) {
+        int currentEndPosition = scanner.getCurrentTokenEndPosition();
+        int currentStartPosition = scanner.getCurrentTokenStartPosition();
+        System.out.print(currentStartPosition + "," + currentEndPosition + ": ");
+        System.out.println(scanner.toStringAction(token));
+      }
+    } catch (InvalidInputException e) {
+      token = TokenNameERROR;
+    }
+    return;
+  }
+  public void init(String s) {
+    this.str = s;
+    this.token = TokenNameEOF;
+    //    this.chIndx = 0;
+    //    this.rowCount = 1;
+    //    this.columnCount = 0;
+    this.phpEnd = false;
+    //    this.phpMode = false;
+    /* scanner initialization */
+    scanner.setSource(s.toCharArray());
+    scanner.setPHPMode(false);
+  }
+  protected void initialize(boolean phpMode) {
+    compilationUnit = null;
+    referenceContext = null;
+    includesList = new ArrayList();
+    this.str = "";
+    this.token = TokenNameEOF;
+    //    this.chIndx = 0;
+    //    this.rowCount = 1;
+    //    this.columnCount = 0;
+    this.phpEnd = false;
+    //    this.phpMode = phpMode;
+    scanner.setPHPMode(phpMode);
+  }
+  /**
+   * Parses a string with php tags i.e. '&lt;body&gt; &lt;?php phpinfo() ?&gt;
+   * &lt;/body&gt;'
+   */
+  public void parse(String s) {
+    init(s);
+    parse();
+  }
+  /**
+   * Parses a string with php tags i.e. '&lt;body&gt; &lt;?php phpinfo() ?&gt;
+   * &lt;/body&gt;'
+   */
+  protected void parse() {
+    getNextToken();
+    do {
+      try {
+        if (token != TokenNameEOF && token != TokenNameERROR) {
+          statementList();
+        }
+        if (token != TokenNameEOF) {
+          if (token == TokenNameERROR) {
+            throwSyntaxError("Scanner error (Found unknown token: " + scanner.toStringAction(token) + ")");
+          }
+          if (token == TokenNameRPAREN) {
+            throwSyntaxError("Too many closing ')'; end-of-file not reached.");
+          }
+          if (token == TokenNameRBRACE) {
+            throwSyntaxError("Too many closing '}'; end-of-file not reached.");
+          }
+          if (token == TokenNameRBRACKET) {
+            throwSyntaxError("Too many closing ']'; end-of-file not reached.");
+          }
+          if (token == TokenNameLPAREN) {
+            throwSyntaxError("Read character '('; end-of-file not reached.");
+          }
+          if (token == TokenNameLBRACE) {
+            throwSyntaxError("Read character '{';  end-of-file not reached.");
+          }
+          if (token == TokenNameLBRACKET) {
+            throwSyntaxError("Read character '[';  end-of-file not reached.");
+          }
+          throwSyntaxError("End-of-file not reached.");
+        }
+        break;
+      } catch (SyntaxError sytaxErr1) {
+        // setMarker(sytaxErr1.getMessage(), sytaxErr1.getLine(),
+        // ERROR);
+        //        setMarker(sytaxErr1.getMessage(),
+        // scanner.getCurrentTokenStartPosition(),
+        // scanner.getCurrentTokenEndPosition(), ERROR);
+        try {
+          // if an error occured,
+          // try to find keywords 'class' or 'function'
+          // to parse the rest of the string
+          while (token != TokenNameEOF && token != TokenNameERROR) {
+            if (token == TokenNameabstract || token == TokenNamefinal || token == TokenNameclass || token == TokenNamefunction) {
+              break;
+            }
+            getNextToken();
+          }
+          if (token == TokenNameEOF || token == TokenNameERROR) {
+            break;
+          }
+        } catch (SyntaxError sytaxErr2) {
+          //    setMarker(sytaxErr2.getMessage(), sytaxErr2.getLine(),
+          // ERROR);
+          //          setMarker(sytaxErr2.getMessage(),
+          // scanner.getCurrentTokenStartPosition(),
+          // scanner.getCurrentTokenEndPosition(), ERROR);
+          break;
+        }
+      }
+    } while (true);
 
-		endParse(0);
-	}
+    endParse(0);
+  }
 
-	protected CompilationUnitDeclaration endParse(int act) {
+  protected CompilationUnitDeclaration endParse(int act) {
 
-		this.lastAct = act;
+    this.lastAct = act;
 
-		if (currentElement != null) {
-			currentElement.topElement().updateParseTree();
-			if (VERBOSE_RECOVERY) {
-				System.out.print(Util.bind("parser.syntaxRecovery")); //$NON-NLS-1$
-				System.out.println("--------------------------"); //$NON-NLS-1$
-				System.out.println(compilationUnit);
-				System.out.println("----------------------------------"); //$NON-NLS-1$
-			}
-		} else {
-			if (diet & VERBOSE_RECOVERY) {
-				System.out.print(Util.bind("parser.regularParse")); //$NON-NLS-1$
-				System.out.println("--------------------------"); //$NON-NLS-1$
-				System.out.println(compilationUnit);
-				System.out.println("----------------------------------"); //$NON-NLS-1$
-			}
-		}
-		if (scanner.recordLineSeparator) {
-			compilationUnit.compilationResult.lineSeparatorPositions = scanner
-					.getLineEnds();
-		}
-		if (scanner.taskTags != null) {
-			for (int i = 0; i < scanner.foundTaskCount; i++) {
-				problemReporter().task(
-						new String(scanner.foundTaskTags[i]),
-						new String(scanner.foundTaskMessages[i]),
-						scanner.foundTaskPriorities[i] == null
-								? null
-								: new String(scanner.foundTaskPriorities[i]),
-						scanner.foundTaskPositions[i][0],
-						scanner.foundTaskPositions[i][1]);
-			}
-		}
-		return compilationUnit;
-	}
-	//  public PHPOutlineInfo parseInfo(Object parent, String s) {
-	//    PHPOutlineInfo outlineInfo = new PHPOutlineInfo(parent);
-	//    // Stack stack = new Stack();
-	//    // stack.push(outlineInfo.getDeclarations());
-	//    this.str = s;
-	//    this.token = TokenNameEOF;
-	//    // this.chIndx = 0;
-	//    // this.rowCount = 1;
-	//    // this.columnCount = 0;
-	//    this.phpEnd = false;
-	//    this.phpMode = false;
-	//    scanner.setSource(s.toCharArray());
-	//    scanner.setPHPMode(false);
-	//    
-	//    getNextToken();
-	//    parseDeclarations(outlineInfo, outlineInfo.getDeclarations(), false);
-	//    
-	//    return outlineInfo;
-	//  }
-	private boolean isVariable() {
-		return token == TokenNameVariable; //  || token == TokenNamethis;
-	}
-	//  private void parseDeclarations(PHPOutlineInfo outlineInfo,
-	//      OutlineableWithChildren current, boolean goBack) {
-	//    char[] ident;
-	//    // PHPClassDeclaration current = (PHPClassDeclaration) stack.peek();
-	//    PHPSegmentWithChildren temp;
-	//    int counter = 0;
-	//    IPreferenceStore store =
-	// PHPeclipsePlugin.getDefault().getPreferenceStore();
-	//    try {
-	//      while (token != TokenNameEOF && token != TokenNameERROR) {
-	//        if (token == TokenNameVariable) {
-	//          ident = scanner.getCurrentIdentifierSource();
-	//          outlineInfo.addVariable(new String(ident));
-	//          getNextToken();
-	//        } else if (token == TokenNamevar) {
-	//          getNextToken();
-	//          if (token == TokenNameVariable
-	//              && store.getBoolean(PHPeclipsePlugin.PHP_OUTLINE_VAR)) {
-	//            ident = scanner.getCurrentIdentifierSource();
-	//            //substring(1) added because PHPVarDeclaration doesn't
-	//            // need the $ anymore
-	//            String variableName = new String(ident).substring(1);
-	//            outlineInfo.addVariable(variableName);
-	//            getNextToken();
-	//            if (token != TokenNameSEMICOLON) {
-	//              getNextToken();
-	//              ident = scanner.getCurrentTokenSource();
-	//              if (token > TokenNameKEYWORD) {
-	//                current.add(new PHPVarDeclaration(current, variableName,
-	//                // chIndx - ident.length,
-	//                    scanner.getCurrentTokenStartPosition(), new String(ident)));
-	//              } else {
-	//                switch (token) {
-	//                  case TokenNameVariable :
-	//                  case TokenNamethis :
-	//                    current.add(new PHPVarDeclaration(current, variableName,
-	//                    // chIndx -
-	//                        // ident.length,
-	//                        scanner.getCurrentTokenStartPosition(), new String(
-	//                            ident)));
-	//                    break;
-	//                  case TokenNameIdentifier :
-	//                    current.add(new PHPVarDeclaration(current, variableName,
-	//                    // chIndx -
-	//                        // ident.length,
-	//                        scanner.getCurrentTokenStartPosition(), new String(
-	//                            ident)));
-	//                    break;
-	//                  case TokenNameDoubleLiteral :
-	//                    current.add(new PHPVarDeclaration(current, variableName
-	//                        + doubleNumber,
-	//                    // chIndx -
-	//                        // ident.length,
-	//                        scanner.getCurrentTokenStartPosition(), new String(
-	//                            ident)));
-	//                    break;
-	//                  case TokenNameIntegerLiteral :
-	//                    current.add(new PHPVarDeclaration(current, variableName,
-	//                    // chIndx -
-	//                        // ident.length,
-	//                        scanner.getCurrentTokenStartPosition(), new String(
-	//                            ident)));
-	//                    break;
-	//                  case TokenNameStringInterpolated :
-	//                  case TokenNameStringLiteral :
-	//                    current.add(new PHPVarDeclaration(current, variableName,
-	//                    // chIndx -
-	//                        // ident.length,
-	//                        scanner.getCurrentTokenStartPosition(), new String(
-	//                            ident)));
-	//                    break;
-	//                  case TokenNameStringConstant :
-	//                    current.add(new PHPVarDeclaration(current, variableName,
-	//                    // chIndx -
-	//                        // ident.length,
-	//                        scanner.getCurrentTokenStartPosition(), new String(
-	//                            ident)));
-	//                    break;
-	//                  default :
-	//                    current.add(new PHPVarDeclaration(current, variableName,
-	//                    // chIndx -
-	//                        // ident.length
-	//                        scanner.getCurrentTokenStartPosition()));
-	//                    break;
-	//                }
-	//              }
-	//            } else {
-	//              ident = scanner.getCurrentIdentifierSource();
-	//              current.add(new PHPVarDeclaration(current, variableName,
-	//              // chIndx - ident.length
-	//                  scanner.getCurrentTokenStartPosition()));
-	//            }
-	//          }
-	//        } else if (token == TokenNamefunction) {
-	//          getNextToken();
-	//          if (token == TokenNameAND) {
-	//            getNextToken();
-	//          }
-	//          if (token == TokenNameIdentifier
-	//              && store.getBoolean(PHPeclipsePlugin.PHP_OUTLINE_FUNC)) {
-	//            ident = scanner.getCurrentIdentifierSource();
-	//            outlineInfo.addVariable(new String(ident));
-	//            temp = new PHPFunctionDeclaration(current, new String(ident),
-	//            // chIndx - ident.length
-	//                scanner.getCurrentTokenStartPosition());
-	//            current.add(temp);
-	//            getNextToken();
-	//            parseDeclarations(outlineInfo, temp, true);
-	//          }
-	//        } else if (token == TokenNameclass) {
-	//          getNextToken();
-	//          if (token == TokenNameIdentifier
-	//              && store.getBoolean(PHPeclipsePlugin.PHP_OUTLINE_CLASS)) {
-	//            ident = scanner.getCurrentIdentifierSource();
-	//            outlineInfo.addVariable(new String(ident));
-	//            temp = new PHPClassDeclaration(current, new String(ident),
-	//            // chIndx - ident.len
-	//                scanner.getCurrentTokenStartPosition());
-	//            current.add(temp);
-	//            // stack.push(temp);
-	//            getNextToken();
-	//            //skip tokens for classname, extends and others until
-	//            // we have the opening '{'
-	//            while (token != TokenNameLBRACE && token != TokenNameEOF
-	//                && token != TokenNameERROR) {
-	//              getNextToken();
-	//            }
-	//            parseDeclarations(outlineInfo, temp, true);
-	//            // stack.pop();
-	//          }
-	//        } else if ((token == TokenNameLBRACE)
-	//            || (token == TokenNameDOLLAR_LBRACE)) {
-	//          getNextToken();
-	//          counter++;
-	//        } else if (token == TokenNameRBRACE) {
-	//          getNextToken();
-	//          --counter;
-	//          if (counter == 0 && goBack) {
-	//            return;
-	//          }
-	//        } else if (token == TokenNamerequire || token == TokenNamerequire_once
-	//            || token == TokenNameinclude || token == TokenNameinclude_once) {
-	//          ident = scanner.getCurrentTokenSource();
-	//          getNextToken();
-	//          int startPosition = scanner.getCurrentTokenStartPosition();
-	//          expr();
-	//          char[] expr = scanner.getCurrentTokenSource(startPosition);
-	//          outlineInfo.addVariable(new String(ident));
-	//          current.add(new PHPReqIncDeclaration(current, new String(ident),
-	//          // chIndx - ident.length,
-	//              startPosition, new String(expr)));
-	//          getNextToken();
-	//        } else {
-	//          getNextToken();
-	//        }
-	//      }
-	//    } catch (SyntaxError sytaxErr) {
-	//      // try {
-	//      // // setMarker(sytaxErr.getMessage(), sytaxErr.getLine(), ERROR);
-	//      // setMarker(sytaxErr.getMessage(),
-	//      // scanner.getCurrentTokenStartPosition(),
-	//      // scanner.getCurrentTokenEndPosition(), ERROR);
-	//      // } catch (CoreException e) {
-	//      // }
-	//    }
-	//  }
-	private void statementList() {
-		do {
-			statement(TokenNameEOF);
-			if ((token == TokenNameRBRACE) || (token == TokenNamecase)
-					|| (token == TokenNamedefault) || (token == TokenNameelse)
-					|| (token == TokenNameelseif) || (token == TokenNameendif)
-					|| (token == TokenNameendfor)
-					|| (token == TokenNameendforeach)
-					|| (token == TokenNameendwhile)
-					|| (token == TokenNameendswitch) || (token == TokenNameEOF)
-					|| (token == TokenNameERROR)) {
-				return;
-			}
-		} while (true);
-	}
-	private void functionBody(MethodDeclaration methodDecl) {
-		// '{' [statement-list] '}'
-		if (token == TokenNameLBRACE) {
-			getNextToken();
-		} else {
-			throwSyntaxError("'{' expected in compound-statement.");
-		}
-		if (token != TokenNameRBRACE) {
-			statementList();
-		}
-		if (token == TokenNameRBRACE) {
-			methodDecl.declarationSourceEnd = scanner
-					.getCurrentTokenEndPosition();
-			getNextToken();
-		} else {
-			throwSyntaxError("'}' expected in compound-statement.");
-		}
-	}
-	private void statement(int previousToken) {
-		//   if (token > TokenNameKEYWORD && token != TokenNamelist && token !=
-		// TokenNamenew) {
-		//  char[] ident = scanner.getCurrentIdentifierSource();
-		//  String keyword = new String(ident);
-		//    if (token == TokenNameAT) {
-		//      getNextToken();
-		//      if (token != TokenNamerequire && token != TokenNamerequire_once
-		//          && token != TokenNameinclude && token != TokenNameinclude_once
-		//          && token != TokenNameIdentifier && token != TokenNameVariable
-		//          && token != TokenNameStringInterpolated) {
-		//        throwSyntaxError("identifier expected after '@'.");
-		//      }
-		//    }
-		//    if (token == TokenNameinclude || token == TokenNameinclude_once) {
-		//      getNextToken();
-		//      if (token == TokenNameLPAREN) {
-		//        expr();
-		//        if (token == TokenNameSEMICOLON) {
-		//          getNextToken();
-		//        } else {
-		//          if (previousToken != TokenNameAT && token != TokenNameStopPHP) {
-		//            throwSyntaxError("';' expected after 'include' or 'include_once'.");
-		//          }
-		//          // getNextToken();
-		//        }
-		//      } else {
-		//        concatenationExpression();
-		//      }
-		//      return;
-		//    } else if (token == TokenNamerequire || token ==
-		// TokenNamerequire_once)
-		// {
-		//      getNextToken();
-		//      //constant();
-		//      if (token == TokenNameLPAREN) {
-		//        expr();
-		//        if (token == TokenNameSEMICOLON) {
-		//          getNextToken();
-		//        } else {
-		//          if (previousToken != TokenNameAT && token != TokenNameStopPHP) {
-		//            throwSyntaxError("';' expected after 'require' or 'require_once'.");
-		//          }
-		//          // getNextToken();
-		//        }
-		//      } else {
-		//        concatenationExpression();
-		//      }
-		//      return;
-		//    } else
-		if (token == TokenNameif) {
-			getNextToken();
-			if (token == TokenNameLPAREN) {
-				getNextToken();
-			} else {
-				throwSyntaxError("'(' expected after 'if' keyword.");
-			}
-			expr();
-			if (token == TokenNameRPAREN) {
-				getNextToken();
-			} else {
-				throwSyntaxError("')' expected after 'if' condition.");
-			}
-			ifStatement();
-			return;
-		} else if (token == TokenNameswitch) {
-			getNextToken();
-			if (token == TokenNameLPAREN) {
-				getNextToken();
-			} else {
-				throwSyntaxError("'(' expected after 'switch' keyword.");
-			}
-			expr();
-			if (token == TokenNameRPAREN) {
-				getNextToken();
-			} else {
-				throwSyntaxError("')' expected after 'switch' condition.");
-			}
-			switchStatement();
-			return;
-		} else if (token == TokenNamefor) {
-			getNextToken();
-			if (token == TokenNameLPAREN) {
-				getNextToken();
-			} else {
-				throwSyntaxError("'(' expected after 'for' keyword.");
-			}
-			if (token == TokenNameSEMICOLON) {
-				getNextToken();
-			} else {
-				expressionList();
-				if (token == TokenNameSEMICOLON) {
-					getNextToken();
-				} else {
-					throwSyntaxError("';' expected after 'for'.");
-				}
-			}
-			if (token == TokenNameSEMICOLON) {
-				getNextToken();
-			} else {
-				expressionList();
-				if (token == TokenNameSEMICOLON) {
-					getNextToken();
-				} else {
-					throwSyntaxError("';' expected after 'for'.");
-				}
-			}
-			if (token == TokenNameRPAREN) {
-				getNextToken();
-			} else {
-				expressionList();
-				if (token == TokenNameRPAREN) {
-					getNextToken();
-				} else {
-					throwSyntaxError("')' expected after 'for'.");
-				}
-			}
-			forStatement();
-			return;
-		} else if (token == TokenNamewhile) {
-			getNextToken();
-			if (token == TokenNameLPAREN) {
-				getNextToken();
-			} else {
-				throwSyntaxError("'(' expected after 'while' keyword.");
-			}
-			expr();
-			if (token == TokenNameRPAREN) {
-				getNextToken();
-			} else {
-				throwSyntaxError("')' expected after 'while' condition.");
-			}
-			whileStatement();
-			return;
-		} else if (token == TokenNamedo) {
-			getNextToken();
-			if (token == TokenNameLBRACE) {
-				getNextToken();
-				if (token != TokenNameRBRACE) {
-					statementList();
-				}
-				if (token == TokenNameRBRACE) {
-					getNextToken();
-				} else {
-					throwSyntaxError("'}' expected after 'do' keyword.");
-				}
-			} else {
-				statement(TokenNameEOF);
-			}
-			if (token == TokenNamewhile) {
-				getNextToken();
-				if (token == TokenNameLPAREN) {
-					getNextToken();
-				} else {
-					throwSyntaxError("'(' expected after 'while' keyword.");
-				}
-				expr();
-				if (token == TokenNameRPAREN) {
-					getNextToken();
-				} else {
-					throwSyntaxError("')' expected after 'while' condition.");
-				}
-			} else {
-				throwSyntaxError("'while' expected after 'do' keyword.");
-			}
-			if (token == TokenNameSEMICOLON) {
-				getNextToken();
-			} else {
-				if (token != TokenNameINLINE_HTML) {
-					throwSyntaxError("';' expected after do-while statement.");
-				}
-				getNextToken();
-			}
-			return;
-		} else if (token == TokenNameforeach) {
-			getNextToken();
-			if (token == TokenNameLPAREN) {
-				getNextToken();
-			} else {
-				throwSyntaxError("'(' expected after 'foreach' keyword.");
-			}
-			expr();
-			if (token == TokenNameas) {
-				getNextToken();
-			} else {
-				throwSyntaxError("'as' expected after 'foreach' exxpression.");
-			}
-			//      variable();
-			foreach_variable();
-			foreach_optional_arg();
-			if (token == TokenNameEQUAL_GREATER) {
-				getNextToken();
-				variable();
-			}
-			if (token == TokenNameRPAREN) {
-				getNextToken();
-			} else {
-				throwSyntaxError("')' expected after 'foreach' expression.");
-			}
-			foreachStatement();
-			return;
-		} else if (token == TokenNamecontinue || token == TokenNamebreak
-				|| token == TokenNamereturn) {
-			getNextToken();
-			if (token != TokenNameSEMICOLON) {
-				expr();
-			}
-			if (token == TokenNameSEMICOLON) {
-				getNextToken();
-			} else {
-				if (token != TokenNameINLINE_HTML) {
-					throwSyntaxError("';' expected after 'continue', 'break' or 'return'.");
-				}
-				getNextToken();
-			}
-			return;
-		} else if (token == TokenNameecho) {
-			getNextToken();
-			expressionList();
-			if (token == TokenNameSEMICOLON) {
-				getNextToken();
-			} else {
-				if (token != TokenNameINLINE_HTML) {
-					throwSyntaxError("';' expected after 'echo' statement.");
-				}
-				getNextToken();
-			}
-			return;
-		} else if (token == TokenNameINLINE_HTML) {
-			getNextToken();
-			return;
-			//    } else if (token == TokenNameprint) {
-			//      getNextToken();
-			//      expression();
-			//      if (token == TokenNameSEMICOLON) {
-			//        getNextToken();
-			//      } else {
-			//        if (token != TokenNameStopPHP) {
-			//          throwSyntaxError("';' expected after 'print' statement.");
-			//        }
-			//        getNextToken();
-			//      }
-			//      return;
-		} else if (token == TokenNameglobal) {
-			getNextToken();
-			global_var_list();
-			if (token == TokenNameSEMICOLON) {
-				getNextToken();
-			} else {
-				if (token != TokenNameINLINE_HTML) {
-					throwSyntaxError("';' expected after 'global' statement.");
-				}
-				getNextToken();
-			}
-			return;
-		} else if (token == TokenNamestatic) {
-			getNextToken();
-			static_var_list();
-			if (token == TokenNameSEMICOLON) {
-				getNextToken();
-			} else {
-				if (token != TokenNameINLINE_HTML) {
-					throwSyntaxError("';' expected after 'static' statement.");
-				}
-				getNextToken();
-			}
-			return;
-		} else if (token == TokenNameunset) {
-			getNextToken();
-			if (token == TokenNameLPAREN) {
-				getNextToken();
-			} else {
-				throwSyntaxError("'(' expected after 'unset' statement.");
-			}
-			unset_variables();
-			if (token == TokenNameRPAREN) {
-				getNextToken();
-			} else {
-				throwSyntaxError("')' expected after 'unset' statement.");
-			}
-			if (token == TokenNameSEMICOLON) {
-				getNextToken();
-			} else {
-				if (token != TokenNameINLINE_HTML) {
-					throwSyntaxError("';' expected after 'unset' statement.");
-				}
-				getNextToken();
-			}
-			return;
-		} else if (token == TokenNamefunction) {
-			MethodDeclaration methodDecl = new MethodDeclaration(
-					this.compilationUnit.compilationResult);
-			methodDecl.declarationSourceStart = scanner
-					.getCurrentTokenStartPosition();
-			getNextToken();
-			functionDefinition(methodDecl);
-			return;
-		} else if (token == TokenNametry) {
-			getNextToken();
-			if (token != TokenNameLBRACE) {
-				throwSyntaxError("'{' expected in 'try' statement.");
-			}
-			getNextToken();
-			statementList();
-			if (token != TokenNameRBRACE) {
-				throwSyntaxError("'}' expected in 'try' statement.");
-			}
-			getNextToken();
-			return;
-		} else if (token == TokenNamecatch) {
-			getNextToken();
-			if (token != TokenNameLPAREN) {
-				throwSyntaxError("'(' expected in 'catch' statement.");
-			}
-			getNextToken();
-			fully_qualified_class_name();
-			if (token != TokenNameVariable) {
-				throwSyntaxError("Variable expected in 'catch' statement.");
-			}
-			getNextToken();
-			if (token != TokenNameRPAREN) {
-				throwSyntaxError("')' expected in 'catch' statement.");
-			}
-			getNextToken();
-			if (token != TokenNameLBRACE) {
-				throwSyntaxError("'{' expected in 'catch' statement.");
-			}
-			getNextToken();
-			if (token != TokenNameRBRACE) {
-				statementList();
-				if (token != TokenNameRBRACE) {
-					throwSyntaxError("'}' expected in 'catch' statement.");
-				}
-			}
-			getNextToken();
-			additional_catches();
-			return;
-		} else if (token == TokenNamethrow) {
-			getNextToken();
-			expr();
-			if (token == TokenNameSEMICOLON) {
-				getNextToken();
-			} else {
-				throwSyntaxError("';' expected after 'throw' exxpression.");
-			}
-			return;
-		} else if (token == TokenNamefinal || token == TokenNameabstract
-				|| token == TokenNameclass || token == TokenNameinterface) {
-			TypeDeclaration typeDecl = new TypeDeclaration(
-					this.compilationUnit.compilationResult);
-			typeDecl.declarationSourceStart = scanner
-					.getCurrentTokenStartPosition();
-			// default super class
-			typeDecl.superclass = new SingleTypeReference(TypeConstants.OBJECT,
-					0);
-			compilationUnit.types.add(typeDecl);
-			try {
-				pushOnAstStack(typeDecl);
-				unticked_class_declaration_statement(typeDecl);
-				//        classBody(typeDecl);
-			} finally {
-				astPtr--;
-				astLengthPtr--;
-			}
-			return;
-			//      } else {
-			//        throwSyntaxError("Unexpected keyword '" + keyword + "'");
-		} else if (token == TokenNameLBRACE) {
-			getNextToken();
-			if (token != TokenNameRBRACE) {
-				statementList();
-			}
-			if (token == TokenNameRBRACE) {
-				getNextToken();
-				return;
-			} else {
-				throwSyntaxError("'}' expected.");
-			}
-		} else {
-			if (token != TokenNameSEMICOLON) {
-				expr();
-			}
-			if (token == TokenNameSEMICOLON) {
-				getNextToken();
-				return;
-			} else {
-				if (token != TokenNameINLINE_HTML && token != TokenNameEOF) {
-					throwSyntaxError("';' expected after expression (Found token: "
-							+ scanner.toStringAction(token) + ")");
-				}
-				getNextToken();
-			}
-		}
-	}
-	private void additional_catches() {
-		while (token == TokenNamecatch) {
-			getNextToken();
-			if (token != TokenNameLPAREN) {
-				throwSyntaxError("'(' expected in 'catch' statement.");
-			}
-			getNextToken();
-			fully_qualified_class_name();
-			if (token != TokenNameVariable) {
-				throwSyntaxError("Variable expected in 'catch' statement.");
-			}
-			getNextToken();
-			if (token != TokenNameRPAREN) {
-				throwSyntaxError("')' expected in 'catch' statement.");
-			}
-			getNextToken();
-			if (token != TokenNameLBRACE) {
-				throwSyntaxError("'{' expected in 'catch' statement.");
-			}
-			getNextToken();
-			statementList();
-			if (token != TokenNameRBRACE) {
-				throwSyntaxError("'}' expected in 'catch' statement.");
-			}
-			getNextToken();
-		}
-	}
-	private void foreach_variable() {
-		//	w_variable
-		//| '&' w_variable
-		if (token == TokenNameAND) {
-			getNextToken();
-		}
-		w_variable();
-	}
-	private void foreach_optional_arg() {
-		//	/* empty */
-		//| T_DOUBLE_ARROW foreach_variable
-		if (token == TokenNameEQUAL_GREATER) {
-			getNextToken();
-			foreach_variable();
-		}
-	}
-	private void global_var_list() {
-		//  global_var_list:
-		//	global_var_list ',' global_var
-		//| global_var
-		while (true) {
-			global_var();
-			if (token != TokenNameCOMMA) {
-				break;
-			}
-			getNextToken();
-		}
-	}
-	private void global_var() {
-		//global_var:
-		//	T_VARIABLE
-		//| '$' r_variable
-		//| '$' '{' expr '}'
-		if (token == TokenNameVariable) {
-			getNextToken();
-		} else if (token == TokenNameDOLLAR) {
-			getNextToken();
-			if (token == TokenNameLPAREN) {
-				getNextToken();
-				expr();
-				if (token != TokenNameLPAREN) {
-					throwSyntaxError("')' expected in global variable.");
-				}
-				getNextToken();
-			} else {
-				r_variable();
-			}
-		}
-	}
-	private void static_var_list() {
-		//static_var_list:
-		//	static_var_list ',' T_VARIABLE
-		//| static_var_list ',' T_VARIABLE '=' static_scalar
-		//| T_VARIABLE
-		//| T_VARIABLE '=' static_scalar
-		while (true) {
-			if (token == TokenNameVariable) {
-				getNextToken();
-				if (token == TokenNameEQUAL) {
-					getNextToken();
-					static_scalar();
-				}
-				if (token != TokenNameCOMMA) {
-					break;
-				}
-				getNextToken();
-			} else {
-				break;
-			}
-		}
-	}
-	private void unset_variables() {
-		//    unset_variables:
-		//    		unset_variable
-		//    	| unset_variables ',' unset_variable
-		//    unset_variable:
-		//    		variable
-		while (true) {
-			variable();
-			if (token != TokenNameCOMMA) {
-				break;
-			}
-			getNextToken();
-		}
-	}
-	private final void initializeModifiers() {
-		this.modifiers = 0;
-		this.modifiersSourceStart = -1;
-	}
-	private final void checkAndSetModifiers(int flag) {
-		this.modifiers |= flag;
-		if (this.modifiersSourceStart < 0)
-			this.modifiersSourceStart = this.scanner.startPosition;
-	}
-	private void unticked_class_declaration_statement(TypeDeclaration typeDecl) {
-		initializeModifiers();
-		if (token == TokenNameinterface) {
-			//      interface_entry T_STRING
-			//		interface_extends_list
-			//		'{' class_statement_list '}'
-			checkAndSetModifiers(AccInterface);
-			getNextToken();
-			typeDecl.modifiers = this.modifiers;
-			if (token == TokenNameIdentifier || token > TokenNameKEYWORD) {
-				typeDecl.sourceStart = scanner.getCurrentTokenStartPosition();
-				typeDecl.sourceEnd = scanner.getCurrentTokenEndPosition();
-				typeDecl.name = scanner.getCurrentIdentifierSource();
-				if (token > TokenNameKEYWORD) {
-					throwSyntaxError(
-							"Don't use a keyword for interface declaration ["
-									+ scanner.toStringAction(token) + "].",
-							typeDecl.sourceStart, typeDecl.sourceEnd);
-				}
-				getNextToken();
-				interface_extends_list();
-			} else {
-				typeDecl.sourceStart = scanner.getCurrentTokenStartPosition();
-				typeDecl.sourceEnd = scanner.getCurrentTokenEndPosition();
-				typeDecl.name = new char[]{' '};
-				throwSyntaxError(
-						"Interface name expected after keyword 'interface'.",
-						typeDecl.sourceStart, typeDecl.sourceEnd);
-				return;
-			}
-		} else {
-			//      class_entry_type T_STRING extends_from
-			//		implements_list
-			//		'{' class_statement_list'}'
-			class_entry_type();
-			typeDecl.modifiers = this.modifiers;
-			//identifier
-			//identifier 'extends' identifier
-			if (token == TokenNameIdentifier || token > TokenNameKEYWORD) {
-				typeDecl.sourceStart = scanner.getCurrentTokenStartPosition();
-				typeDecl.sourceEnd = scanner.getCurrentTokenEndPosition();
-				typeDecl.name = scanner.getCurrentIdentifierSource();
-				if (token > TokenNameKEYWORD) {
-					throwSyntaxError(
-							"Don't use a keyword for class declaration ["
-									+ scanner.toStringAction(token) + "].",
-							typeDecl.sourceStart, typeDecl.sourceEnd);
-				}
-				getNextToken();
-				//    extends_from:
-				//		/* empty */
-				//	| T_EXTENDS fully_qualified_class_name
-				if (token == TokenNameextends) {
-					interface_extends_list();
-					//          getNextToken();
-					//          if (token != TokenNameIdentifier) {
-					//            throwSyntaxError("Class name expected after keyword
-					// 'extends'.",
-					//                scanner.getCurrentTokenStartPosition(), scanner
-					//                    .getCurrentTokenEndPosition());
-					//          }
-				}
-				implements_list();
-			} else {
-				typeDecl.sourceStart = scanner.getCurrentTokenStartPosition();
-				typeDecl.sourceEnd = scanner.getCurrentTokenEndPosition();
-				typeDecl.name = new char[]{' '};
-				throwSyntaxError("Class name expected after keyword 'class'.",
-						typeDecl.sourceStart, typeDecl.sourceEnd);
-				return;
-			}
-		}
-		//  '{' class_statement_list '}'
-		if (token == TokenNameLBRACE) {
-			getNextToken();
-			if (token != TokenNameRBRACE) {
-				ArrayList list = new ArrayList();
-				class_statement_list(list);
-				typeDecl.fields = new FieldDeclaration[list.size()];
-				for (int i = 0; i < list.size(); i++) {
-					typeDecl.fields[i] = (FieldDeclaration) list.get(i);
-				}
-			}
-			if (token == TokenNameRBRACE) {
-				typeDecl.declarationSourceEnd = scanner
-						.getCurrentTokenEndPosition();
-				getNextToken();
-			} else {
-				throwSyntaxError("'}' expected at end of class body.");
-			}
-		} else {
-			throwSyntaxError("'{' expected at start of class body.");
-		}
-	}
-	private void class_entry_type() {
-		//	T_CLASS
-		//	| T_ABSTRACT T_CLASS
-		//	| T_FINAL T_CLASS
-		if (token == TokenNameclass) {
-			getNextToken();
-		} else if (token == TokenNameabstract) {
-			checkAndSetModifiers(AccAbstract);
-			getNextToken();
-			if (token != TokenNameclass) {
-				throwSyntaxError("Keyword 'class' expected after keyword 'abstract'.");
-			}
-			getNextToken();
-		} else if (token == TokenNamefinal) {
-			checkAndSetModifiers(AccFinal);
-			getNextToken();
-			if (token != TokenNameclass) {
-				throwSyntaxError("Keyword 'class' expected after keyword 'final'.");
-			}
-			getNextToken();
-		} else {
-			throwSyntaxError("Keyword 'class' 'final' or 'abstract' expected");
-		}
-	}
-	private void interface_extends_list() {
-		//	/* empty */
-		//	| T_EXTENDS interface_list
-		if (token == TokenNameextends) {
-			getNextToken();
-			interface_list();
-		}
-	}
-	private void implements_list() {
-		//	/* empty */
-		//	| T_IMPLEMENTS interface_list
-		if (token == TokenNameimplements) {
-			getNextToken();
-			interface_list();
-		}
-	}
-	private void interface_list() {
-		//  interface_list:
-		//	fully_qualified_class_name
-		//| interface_list ',' fully_qualified_class_name
-		do {
-			if (token == TokenNameIdentifier) {
-				getNextToken();
-			} else {
-				throwSyntaxError("Interface name expected after keyword 'implements'.");
-			}
-			if (token != TokenNameCOMMA) {
-				return;
-			}
-			getNextToken();
-		} while (true);
-	}
-	//  private void classBody(TypeDeclaration typeDecl) {
-	//    //'{' [class-element-list] '}'
-	//    if (token == TokenNameLBRACE) {
-	//      getNextToken();
-	//      if (token != TokenNameRBRACE) {
-	//        class_statement_list();
-	//      }
-	//      if (token == TokenNameRBRACE) {
-	//        typeDecl.declarationSourceEnd = scanner.getCurrentTokenEndPosition();
-	//        getNextToken();
-	//      } else {
-	//        throwSyntaxError("'}' expected at end of class body.");
-	//      }
-	//    } else {
-	//      throwSyntaxError("'{' expected at start of class body.");
-	//    }
-	//  }
-	private void class_statement_list(ArrayList list) {
-		do {
-			class_statement(list);
-		} while (token == TokenNamepublic || token == TokenNameprotected
-				|| token == TokenNameprivate || token == TokenNamestatic
-				|| token == TokenNameabstract || token == TokenNamefinal
-				|| token == TokenNamefunction || token == TokenNamevar
-				|| token == TokenNameconst);
-	}
-	private void class_statement(ArrayList list) {
-		//    class_statement:
-		//		variable_modifiers class_variable_declaration ';'
-		//	| class_constant_declaration ';'
-		//	| method_modifiers T_FUNCTION is_reference T_STRING
-		//    '(' parameter_list ')' method_body
-		initializeModifiers();
-		int declarationSourceStart = scanner.getCurrentTokenStartPosition();
-		;
-		if (token == TokenNamevar) {
-			checkAndSetModifiers(AccPublic);
-			problemReporter.phpVarDeprecatedWarning(scanner
-					.getCurrentTokenStartPosition(), scanner
-					.getCurrentTokenEndPosition(), referenceContext,
-					compilationUnit.compilationResult);
-			getNextToken();
-			class_variable_declaration(declarationSourceStart, list);
-		} else if (token == TokenNameconst) {
-			class_constant_declaration();
-			if (token != TokenNameSEMICOLON) {
-				throwSyntaxError("';' expected after class const declaration.");
-			}
-			getNextToken();
-		} else {
-			boolean hasModifiers = member_modifiers();
-			if (token == TokenNamefunction) {
-				if (!hasModifiers) {
-					checkAndSetModifiers(AccPublic);
-				}
-				MethodDeclaration methodDecl = new MethodDeclaration(
-						this.compilationUnit.compilationResult);
-				methodDecl.declarationSourceStart = scanner
-						.getCurrentTokenStartPosition();
-				methodDecl.modifiers = this.modifiers;
-				getNextToken();
-				functionDefinition(methodDecl);
-			} else {
-				if (!hasModifiers) {
-					throwSyntaxError("'public' 'private' or 'protected' modifier expected for field declarations.");
-				}
-				class_variable_declaration(declarationSourceStart, list);
-			}
-		}
-		//    if (token == TokenNamefunction) {
-		//      MethodDeclaration methodDecl = new MethodDeclaration(
-		//          this.compilationUnit.compilationResult);
-		//      methodDecl.declarationSourceStart = scanner
-		//          .getCurrentTokenStartPosition();
-		//      getNextToken();
-		//      functionDefinition(methodDecl);
-		//    } else if (token == TokenNamevar) {
-		//      getNextToken();
-		//      classProperty();
-		//    } else {
-		//      throwSyntaxError("'function' or 'var' expected.");
-		//    }
-	}
-	private void class_constant_declaration() {
-		//	class_constant_declaration ',' T_STRING '=' static_scalar
-		//	| T_CONST T_STRING '=' static_scalar
-		if (token != TokenNameconst) {
-			throwSyntaxError("'const' keyword expected in class declaration.");
-		} else {
-			getNextToken();
-		}
-		while (true) {
-			if (token != TokenNameIdentifier) {
-				throwSyntaxError("Identifier expected in class const declaration.");
-			}
-			getNextToken();
-			if (token != TokenNameEQUAL) {
-				throwSyntaxError("'=' expected in class const declaration.");
-			}
-			getNextToken();
-			static_scalar();
-			if (token != TokenNameCOMMA) {
-				break; // while(true)-loop
-			}
-			getNextToken();
-		}
-	}
-	//  private void variable_modifiers() {
-	//    // variable_modifiers:
-	//    // non_empty_member_modifiers
-	//    //| T_VAR
-	//    initializeModifiers();
-	//    if (token == TokenNamevar) {
-	//      checkAndSetModifiers(AccPublic);
-	//      reportSyntaxError(
-	//          "Keyword 'var' is deprecated. Please use 'public' 'private' or
-	// 'protected'
-	// modifier for field declarations.",
-	//          scanner.getCurrentTokenStartPosition(), scanner
-	//              .getCurrentTokenEndPosition());
-	//      getNextToken();
-	//    } else {
-	//      if (!member_modifiers()) {
-	//        throwSyntaxError("'public' 'private' or 'protected' modifier expected for
-	// field declarations.");
-	//      }
-	//    }
-	//  }
-	//  private void method_modifiers() {
-	//    //method_modifiers:
-	//    // /* empty */
-	//    //| non_empty_member_modifiers
-	//    initializeModifiers();
-	//    if (!member_modifiers()) {
-	//      checkAndSetModifiers(AccPublic);
-	//    }
-	//  }
-	private boolean member_modifiers() {
-		//	T_PUBLIC
-		//| T_PROTECTED
-		//| T_PRIVATE
-		//| T_STATIC
-		//| T_ABSTRACT
-		//| T_FINAL
-		boolean foundToken = false;
-		while (true) {
-			if (token == TokenNamepublic) {
-				checkAndSetModifiers(AccPublic);
-				getNextToken();
-				foundToken = true;
-			} else if (token == TokenNameprotected) {
-				checkAndSetModifiers(AccProtected);
-				getNextToken();
-				foundToken = true;
-			} else if (token == TokenNameprivate) {
-				checkAndSetModifiers(AccPrivate);
-				getNextToken();
-				foundToken = true;
-			} else if (token == TokenNamestatic) {
-				checkAndSetModifiers(AccStatic);
-				getNextToken();
-				foundToken = true;
-			} else if (token == TokenNameabstract) {
-				checkAndSetModifiers(AccAbstract);
-				getNextToken();
-				foundToken = true;
-			} else if (token == TokenNamefinal) {
-				checkAndSetModifiers(AccFinal);
-				getNextToken();
-				foundToken = true;
-			} else {
-				break;
-			}
-		}
-		return foundToken;
-	}
-	private void class_variable_declaration(int declarationSourceStart,
-			ArrayList list) {
-		//    class_variable_declaration:
-		//		class_variable_declaration ',' T_VARIABLE
-		//	| class_variable_declaration ',' T_VARIABLE '=' static_scalar
-		//	| T_VARIABLE
-		//	| T_VARIABLE '=' static_scalar
-		do {
-			if (token == TokenNameVariable) {
-				FieldDeclaration fieldDeclaration = new FieldDeclaration(
-						scanner.getCurrentIdentifierSource(), scanner
-								.getCurrentTokenStartPosition(), scanner
-								.getCurrentTokenEndPosition());
-				fieldDeclaration.modifiers = this.modifiers;
-				fieldDeclaration.declarationSourceStart = declarationSourceStart;
-				fieldDeclaration.declarationSourceEnd = scanner.getCurrentTokenEndPosition();
-				fieldDeclaration.modifiersSourceStart = declarationSourceStart;
-				//        fieldDeclaration.type
-				list.add(fieldDeclaration);
-				getNextToken();
-				if (token == TokenNameEQUAL) {
-					getNextToken();
-					static_scalar();
-				}
-			} else {
-				//        if (token == TokenNamethis) {
-				//          throwSyntaxError("'$this' not allowed after keyword 'public'
-				// 'protected' 'private' 'var'.");
-				//        }
-				throwSyntaxError("Variable expected after keyword 'public' 'protected' 'private' 'var'.");
-			}
-			if (token != TokenNameCOMMA) {
-				break;
-			}
-			getNextToken();
-		} while (true);
-		if (token != TokenNameSEMICOLON) {
-			throwSyntaxError("';' expected after field declaration.");
-		}
-		getNextToken();
-	}
-	private void functionDefinition(MethodDeclaration methodDecl) {
-		boolean isAbstract = false;
-		if (astPtr == 0) {
-			compilationUnit.types.add(methodDecl);
-		} else {
-			AstNode node = astStack[astPtr];
-			if (node instanceof TypeDeclaration) {
-				TypeDeclaration typeDecl = ((TypeDeclaration) node);
-				if (typeDecl.methods == null) {
-					typeDecl.methods = new AbstractMethodDeclaration[]{methodDecl};
-				} else {
-					AbstractMethodDeclaration[] newMethods;
-					System
-							.arraycopy(
-									typeDecl.methods,
-									0,
-									newMethods = new AbstractMethodDeclaration[typeDecl.methods.length + 1],
-									1, typeDecl.methods.length);
-					newMethods[0] = methodDecl;
-					typeDecl.methods = newMethods;
-				}
-				if ((typeDecl.modifiers & AccAbstract) == AccAbstract) {
-					isAbstract = true;
-				} else if ((typeDecl.modifiers & AccInterface) == AccInterface) {
-					isAbstract = true;
-				}
-			}
-		}
-		functionDeclarator(methodDecl);
-		if (token == TokenNameSEMICOLON) {
-			if (!isAbstract) {
-				throwSyntaxError("Body declaration expected for method: "
-						+ new String(methodDecl.selector));
-			}
-			getNextToken();
-			return;
-		}
-		functionBody(methodDecl);
-	}
-	private void functionDeclarator(MethodDeclaration methodDecl) {
-		//identifier '(' [parameter-list] ')'
-		if (token == TokenNameAND) {
-			getNextToken();
-		}
-		if (token == TokenNameIdentifier) {
-			methodDecl.sourceStart = scanner.getCurrentTokenStartPosition();
-			methodDecl.sourceEnd = scanner.getCurrentTokenEndPosition();
-			methodDecl.selector = scanner.getCurrentIdentifierSource();
-			getNextToken();
-			if (token == TokenNameLPAREN) {
-				getNextToken();
-			} else {
-				throwSyntaxError("'(' expected in function declaration.");
-			}
-			if (token != TokenNameRPAREN) {
-				parameter_list();
-			}
-			if (token != TokenNameRPAREN) {
-				throwSyntaxError("')' expected in function declaration.");
-			} else {
-				methodDecl.bodyStart = scanner.getCurrentTokenEndPosition() + 1;
-				getNextToken();
-			}
-		} else {
-			if (token > TokenNameKEYWORD) {
-				throwSyntaxError("Don't use keyword for function declaration ["
-						+ token + "].");
-			}
-			throwSyntaxError("Function name expected after keyword 'function'.");
-		}
-	}
-	//
-	private void parameter_list() {
-		//	non_empty_parameter_list
-		//	| /* empty */
-		non_empty_parameter_list(true);
-	}
-	private void non_empty_parameter_list(boolean empty_allowed) {
-		//	optional_class_type T_VARIABLE
-		//	| optional_class_type '&' T_VARIABLE
-		//	| optional_class_type '&' T_VARIABLE '=' static_scalar
-		//	| optional_class_type T_VARIABLE '=' static_scalar
-		//	| non_empty_parameter_list ',' optional_class_type T_VARIABLE
-		//	| non_empty_parameter_list ',' optional_class_type '&' T_VARIABLE
-		//	| non_empty_parameter_list ',' optional_class_type '&' T_VARIABLE '='
-		// static_scalar
-		//	| non_empty_parameter_list ',' optional_class_type T_VARIABLE '='
-		// static_scalar
-		if (token == TokenNameIdentifier || token == TokenNameVariable
-				|| token == TokenNameAND) {
-			while (true) {
-				if (token == TokenNameIdentifier) {
-					getNextToken();
-				}
-				if (token == TokenNameAND) {
-					getNextToken();
-				}
-				if (token == TokenNameVariable) {
-					getNextToken();
-					if (token == TokenNameEQUAL) {
-						getNextToken();
-						static_scalar();
-					}
-				} else {
-					throwSyntaxError("Variable expected in parameter list.");
-				}
-				if (token != TokenNameCOMMA) {
-					break;
-				}
-				getNextToken();
-			}
-			return;
-		}
-		if (!empty_allowed) {
-			throwSyntaxError("Identifier expected in parameter list.");
-		}
-	}
-	private void optional_class_type() {
-		//	/* empty */
-		//| T_STRING
-	}
-	private void parameterDeclaration() {
-		//variable
-		//variable-reference
-		if (token == TokenNameAND) {
-			getNextToken();
-			if (isVariable()) {
-				getNextToken();
-			} else {
-				throwSyntaxError("Variable expected after reference operator '&'.");
-			}
-		}
-		//variable '=' constant
-		if (token == TokenNameVariable) {
-			getNextToken();
-			if (token == TokenNameEQUAL) {
-				getNextToken();
-				static_scalar();
-			}
-			return;
-		}
-		//    if (token == TokenNamethis) {
-		//      throwSyntaxError("Reserved word '$this' not allowed in parameter
-		// declaration.");
-		//    }
-	}
-	private void labeledStatementList() {
-		if (token != TokenNamecase && token != TokenNamedefault) {
-			throwSyntaxError("'case' or 'default' expected.");
-		}
-		do {
-			if (token == TokenNamecase) {
-				getNextToken();
-				expr(); //constant();
-				if (token == TokenNameCOLON || token == TokenNameSEMICOLON) {
-					getNextToken();
-					if (token == TokenNamecase || token == TokenNamedefault) {
-						// empty case statement ?
-						continue;
-					}
-					statementList();
-				}
-				//        else if (token == TokenNameSEMICOLON) {
-				//          setMarker(
-				//            "':' expected after 'case' keyword (Found token: " +
-				// scanner.toStringAction(token) + ")",
-				//            scanner.getCurrentTokenStartPosition(),
-				//            scanner.getCurrentTokenEndPosition(),
-				//            INFO);
-				//          getNextToken();
-				//          if (token == TokenNamecase) { // empty case statement ?
-				//            continue;
-				//          }
-				//          statementList();
-				//        }
-				else {
-					throwSyntaxError("':' character after 'case' constant expected (Found token: "
-							+ scanner.toStringAction(token) + ")");
-				}
-			} else { // TokenNamedefault
-				getNextToken();
-				if (token == TokenNameCOLON) {
-					getNextToken();
-					if (token == TokenNameRBRACE) {
-						// empty default case
-						break;
-					}
-					statementList();
-				} else {
-					throwSyntaxError("':' character after 'default' expected.");
-				}
-			}
-		} while (token == TokenNamecase || token == TokenNamedefault);
-	}
-	//  public void labeledStatement() {
-	//    if (token == TokenNamecase) {
-	//      getNextToken();
-	//      constant();
-	//      if (token == TokenNameDDOT) {
-	//        getNextToken();
-	//        statement();
-	//      } else {
-	//        throwSyntaxError("':' character after 'case' constant expected.");
-	//      }
-	//      return;
-	//    } else if (token == TokenNamedefault) {
-	//      getNextToken();
-	//      if (token == TokenNameDDOT) {
-	//        getNextToken();
-	//        statement();
-	//      } else {
-	//        throwSyntaxError("':' character after 'default' expected.");
-	//      }
-	//      return;
-	//    }
-	//  }
-	//  public void expressionStatement() {
-	//  }
-	//  private void inclusionStatement() {
-	//  }
-	//  public void compoundStatement() {
-	//  }
-	//  public void selectionStatement() {
-	//  }
-	//
-	//  public void iterationStatement() {
-	//  }
-	//
-	//  public void jumpStatement() {
-	//  }
-	//
-	//  public void outputStatement() {
-	//  }
-	//
-	//  public void scopeStatement() {
-	//  }
-	//
-	//  public void flowStatement() {
-	//  }
-	//
-	//  public void definitionStatement() {
-	//  }
-	private void ifStatement() {
-		// ':' statement-list [elseif-list] [else-colon-statement] 'endif' ';'
-		if (token == TokenNameCOLON) {
-			getNextToken();
-			if (token != TokenNameendif) {
-				statementList();
-				switch (token) {
-					case TokenNameelse :
-						getNextToken();
-						if (token == TokenNameCOLON) {
-							getNextToken();
-							if (token != TokenNameendif) {
-								statementList();
-							}
-						} else {
-							if (token == TokenNameif) { //'else if'
-								getNextToken();
-								elseifStatementList();
-							} else {
-								throwSyntaxError("':' expected after 'else'.");
-							}
-						}
-						break;
-					case TokenNameelseif :
-						getNextToken();
-						elseifStatementList();
-						break;
-				}
-			}
-			if (token != TokenNameendif) {
-				throwSyntaxError("'endif' expected.");
-			}
-			getNextToken();
-			if (token != TokenNameSEMICOLON) {
-				throwSyntaxError("';' expected after if-statement.");
-			}
-			getNextToken();
-		} else {
-			// statement [else-statement]
-			statement(TokenNameEOF);
-			if (token == TokenNameelseif) {
-				getNextToken();
-				if (token == TokenNameLPAREN) {
-					getNextToken();
-				} else {
-					throwSyntaxError("'(' expected after 'elseif' keyword.");
-				}
-				expr();
-				if (token == TokenNameRPAREN) {
-					getNextToken();
-				} else {
-					throwSyntaxError("')' expected after 'elseif' condition.");
-				}
-				ifStatement();
-			} else if (token == TokenNameelse) {
-				getNextToken();
-				statement(TokenNameEOF);
-			}
-		}
-	}
-	private void elseifStatementList() {
-		do {
-			elseifStatement();
-			switch (token) {
-				case TokenNameelse :
-					getNextToken();
-					if (token == TokenNameCOLON) {
-						getNextToken();
-						if (token != TokenNameendif) {
-							statementList();
-						}
-						return;
-					} else {
-						if (token == TokenNameif) { //'else if'
-							getNextToken();
-						} else {
-							throwSyntaxError("':' expected after 'else'.");
-						}
-					}
-					break;
-				case TokenNameelseif :
-					getNextToken();
-					break;
-				default :
-					return;
-			}
-		} while (true);
-	}
-	private void elseifStatement() {
-		if (token == TokenNameLPAREN) {
-			getNextToken();
-			expr();
-			if (token != TokenNameRPAREN) {
-				throwSyntaxError("')' expected in else-if-statement.");
-			}
-			getNextToken();
-			if (token != TokenNameCOLON) {
-				throwSyntaxError("':' expected in else-if-statement.");
-			}
-			getNextToken();
-			if (token != TokenNameendif) {
-				statementList();
-			}
-		}
-	}
-	private void switchStatement() {
-		if (token == TokenNameCOLON) {
-			// ':' [labeled-statement-list] 'endswitch' ';'
-			getNextToken();
-			labeledStatementList();
-			if (token != TokenNameendswitch) {
-				throwSyntaxError("'endswitch' expected.");
-			}
-			getNextToken();
-			if (token != TokenNameSEMICOLON) {
-				throwSyntaxError("';' expected after switch-statement.");
-			}
-			getNextToken();
-		} else {
-			// '{' [labeled-statement-list] '}'
-			if (token != TokenNameLBRACE) {
-				throwSyntaxError("'{' expected in switch statement.");
-			}
-			getNextToken();
-			if (token != TokenNameRBRACE) {
-				labeledStatementList();
-			}
-			if (token != TokenNameRBRACE) {
-				throwSyntaxError("'}' expected in switch statement.");
-			}
-			getNextToken();
-		}
-	}
-	private void forStatement() {
-		if (token == TokenNameCOLON) {
-			getNextToken();
-			statementList();
-			if (token != TokenNameendfor) {
-				throwSyntaxError("'endfor' expected.");
-			}
-			getNextToken();
-			if (token != TokenNameSEMICOLON) {
-				throwSyntaxError("';' expected after for-statement.");
-			}
-			getNextToken();
-		} else {
-			statement(TokenNameEOF);
-		}
-	}
-	private void whileStatement() {
-		// ':' statement-list 'endwhile' ';'
-		if (token == TokenNameCOLON) {
-			getNextToken();
-			statementList();
-			if (token != TokenNameendwhile) {
-				throwSyntaxError("'endwhile' expected.");
-			}
-			getNextToken();
-			if (token != TokenNameSEMICOLON) {
-				throwSyntaxError("';' expected after while-statement.");
-			}
-			getNextToken();
-		} else {
-			statement(TokenNameEOF);
-		}
-	}
-	private void foreachStatement() {
-		if (token == TokenNameCOLON) {
-			getNextToken();
-			statementList();
-			if (token != TokenNameendforeach) {
-				throwSyntaxError("'endforeach' expected.");
-			}
-			getNextToken();
-			if (token != TokenNameSEMICOLON) {
-				throwSyntaxError("';' expected after foreach-statement.");
-			}
-			getNextToken();
-		} else {
-			statement(TokenNameEOF);
-		}
-	}
-	//  private void exitStatus() {
-	//    if (token == TokenNameLPAREN) {
-	//      getNextToken();
-	//    } else {
-	//      throwSyntaxError("'(' expected in 'exit-status'.");
-	//    }
-	//    if (token != TokenNameRPAREN) {
-	//      expression();
-	//    }
-	//    if (token == TokenNameRPAREN) {
-	//      getNextToken();
-	//    } else {
-	//      throwSyntaxError("')' expected after 'exit-status'.");
-	//    }
-	//  }
-	private void expressionList() {
-		do {
-			expr();
-			if (token == TokenNameCOMMA) {
-				getNextToken();
-			} else {
-				break;
-			}
-		} while (true);
-	}
-	private void expr() {
-		//	r_variable
-		//	| expr_without_variable
-		//    if (token!=TokenNameEOF) {
-		if (Scanner.TRACE) {
-			System.out.println("TRACE: expr()");
-		}
-		expr_without_variable(true);
-		//    }
-	}
-	private void expr_without_variable(boolean only_variable) {
-		//	 	internal_functions_in_yacc
-		//	| T_CLONE expr
-		//	| T_PRINT expr
-		//	| '(' expr ')'
-		//	| '@' expr
-		//	| '+' expr
-		//	| '-' expr
-		//	| '!' expr
-		//	| '~' expr
-		//	| T_INC rw_variable
-		//	| T_DEC rw_variable
-		//	| T_INT_CAST expr
-		//	| T_DOUBLE_CAST expr
-		//	| T_STRING_CAST expr
-		//	| T_ARRAY_CAST expr
-		//	| T_OBJECT_CAST expr
-		//	| T_BOOL_CAST expr
-		//	| T_UNSET_CAST expr
-		//	| T_EXIT exit_expr
-		//	| scalar
-		//	| T_ARRAY '(' array_pair_list ')'
-		//	| '`' encaps_list '`'
-		//	| T_LIST '(' assignment_list ')' '=' expr
-		//	| T_NEW class_name_reference ctor_arguments
-		//	| variable '=' expr
-		//	| variable '=' '&' variable
-		//	| variable '=' '&' T_NEW class_name_reference ctor_arguments
-		//	| variable T_PLUS_EQUAL expr
-		//	| variable T_MINUS_EQUAL expr
-		//	| variable T_MUL_EQUAL expr
-		//	| variable T_DIV_EQUAL expr
-		//	| variable T_CONCAT_EQUAL expr
-		//	| variable T_MOD_EQUAL expr
-		//	| variable T_AND_EQUAL expr
-		//	| variable T_OR_EQUAL expr
-		//	| variable T_XOR_EQUAL expr
-		//	| variable T_SL_EQUAL expr
-		//	| variable T_SR_EQUAL expr
-		//	| rw_variable T_INC
-		//	| rw_variable T_DEC
-		//	| expr T_BOOLEAN_OR expr
-		//	| expr T_BOOLEAN_AND expr
-		//	| expr T_LOGICAL_OR expr
-		//	| expr T_LOGICAL_AND expr
-		//	| expr T_LOGICAL_XOR expr
-		//	| expr '|' expr
-		//	| expr '&' expr
-		//	| expr '^' expr
-		//	| expr '.' expr
-		//	| expr '+' expr
-		//	| expr '-' expr
-		//	| expr '*' expr
-		//	| expr '/' expr
-		//	| expr '%' expr
-		//	| expr T_SL expr
-		//	| expr T_SR expr
-		//	| expr T_IS_IDENTICAL expr
-		//	| expr T_IS_NOT_IDENTICAL expr
-		//	| expr T_IS_EQUAL expr
-		//	| expr T_IS_NOT_EQUAL expr
-		//	| expr '<' expr
-		//	| expr T_IS_SMALLER_OR_EQUAL expr
-		//	| expr '>' expr
-		//	| expr T_IS_GREATER_OR_EQUAL expr
-		//	| expr T_INSTANCEOF class_name_reference
-		//	| expr '?' expr ':' expr
-		if (Scanner.TRACE) {
-			System.out.println("TRACE: expr_without_variable() PART 1");
-		}
-		switch (token) {
-			case TokenNameisset :
-			case TokenNameempty :
-			case TokenNameeval :
-			case TokenNameinclude :
-			case TokenNameinclude_once :
-			case TokenNamerequire :
-			case TokenNamerequire_once :
-				internal_functions_in_yacc();
-				break;
-			//    	| '(' expr ')'
-			case TokenNameLPAREN :
-				getNextToken();
-				expr();
-				if (token == TokenNameRPAREN) {
-					getNextToken();
-				} else {
-					throwSyntaxError("')' expected in expression.");
-				}
-				break;
-			//    | T_CLONE expr
-			//    | T_PRINT expr
-			//    | '@' expr
-			//    | '+' expr
-			//    | '-' expr
-			//    | '!' expr
-			//    | '~' expr
-			//    | T_INT_CAST expr
-			//	| T_DOUBLE_CAST expr
-			//	| T_STRING_CAST expr
-			//	| T_ARRAY_CAST expr
-			//	| T_OBJECT_CAST expr
-			//	| T_BOOL_CAST expr
-			//	| T_UNSET_CAST expr
-			case TokenNameclone :
-			case TokenNameprint :
-			case TokenNameAT :
-			case TokenNamePLUS :
-			case TokenNameMINUS :
-			case TokenNameNOT :
-			case TokenNameTWIDDLE :
-			case TokenNameintCAST :
-			case TokenNamedoubleCAST :
-			case TokenNamestringCAST :
-			case TokenNamearrayCAST :
-			case TokenNameobjectCAST :
-			case TokenNameboolCAST :
-			case TokenNameunsetCAST :
-				getNextToken();
-				expr();
-				break;
-			case TokenNameexit :
-				getNextToken();
-				exit_expr();
-				break;
-			//  scalar:
-			//	T_STRING
-			//| T_STRING_VARNAME
-			//| class_constant
-			//| T_START_HEREDOC encaps_list T_END_HEREDOC
-			//    	| '`' encaps_list '`'
-			//  | common_scalar
-			//	| '`' encaps_list '`'
-			case TokenNameEncapsedString0 :
-				scanner.encapsedStringStack.push(new Character('`'));
-				getNextToken();
-				try {
-					if (token == TokenNameEncapsedString0) {
-					} else {
-						encaps_list();
-						if (token != TokenNameEncapsedString0) {
-							throwSyntaxError("\'`\' expected at end of string"
-									+ "(Found token: "
-									+ scanner.toStringAction(token) + " )");
-						}
-					}
-				} finally {
-					scanner.encapsedStringStack.pop();
-					getNextToken();
-				}
-				break;
-			//      | '\'' encaps_list '\''
-			case TokenNameEncapsedString1 :
-				scanner.encapsedStringStack.push(new Character('\''));
-				getNextToken();
-				try {
-					if (token == TokenNameEncapsedString1) {
-					} else {
-						encaps_list();
-						if (token != TokenNameEncapsedString1) {
-							throwSyntaxError("\'\'\' expected at end of string"
-									+ "(Found token: "
-									+ scanner.toStringAction(token) + " )");
-						}
-					}
-				} finally {
-					scanner.encapsedStringStack.pop();
-					getNextToken();
-				}
-				break;
-			//| '"' encaps_list '"'
-			case TokenNameEncapsedString2 :
-				scanner.encapsedStringStack.push(new Character('"'));
-				getNextToken();
-				try {
-					if (token == TokenNameEncapsedString2) {
-					} else {
-						encaps_list();
-						if (token != TokenNameEncapsedString2) {
-							throwSyntaxError("'\"' expected at end of string"
-									+ "(Found token: "
-									+ scanner.toStringAction(token) + " )");
-						}
-					}
-				} finally {
-					scanner.encapsedStringStack.pop();
-					getNextToken();
-				}
-				break;
-			case TokenNameIntegerLiteral :
-			case TokenNameDoubleLiteral :
-			case TokenNameStringLiteral :
-			case TokenNameStringConstant :
-			case TokenNameStringInterpolated :
-			case TokenNameFILE :
-			case TokenNameLINE :
-			case TokenNameCLASS_C :
-			case TokenNameMETHOD_C :
-			case TokenNameFUNC_C :
-				common_scalar();
-				break;
-			case TokenNameHEREDOC :
-				getNextToken();
-				break;
-			case TokenNamearray :
-				//    T_ARRAY '(' array_pair_list ')'
-				getNextToken();
-				if (token == TokenNameLPAREN) {
-					getNextToken();
-					if (token == TokenNameRPAREN) {
-						getNextToken();
-						break;
-					}
-					array_pair_list();
-					if (token != TokenNameRPAREN) {
-						throwSyntaxError("')' expected after keyword 'array'"
-								+ "(Found token: "
-								+ scanner.toStringAction(token) + ")");
-					}
-					getNextToken();
-				} else {
-					throwSyntaxError("'(' expected after keyword 'array'"
-							+ "(Found token: " + scanner.toStringAction(token)
-							+ ")");
-				}
-				break;
-			case TokenNamelist :
-				//    | T_LIST '(' assignment_list ')' '=' expr
-				getNextToken();
-				if (token == TokenNameLPAREN) {
-					getNextToken();
-					assignment_list();
-					if (token != TokenNameRPAREN) {
-						throwSyntaxError("')' expected after 'list' keyword.");
-					}
-					getNextToken();
-					if (token != TokenNameEQUAL) {
-						throwSyntaxError("'=' expected after 'list' keyword.");
-					}
-					getNextToken();
-					expr();
-				} else {
-					throwSyntaxError("'(' expected after 'list' keyword.");
-				}
-				break;
-			case TokenNamenew :
-				//	| T_NEW class_name_reference ctor_arguments
-				getNextToken();
-				class_name_reference();
-				ctor_arguments();
-				break;
-			//    	| T_INC rw_variable
-			//    	| T_DEC rw_variable
-			case TokenNamePLUS_PLUS :
-			case TokenNameMINUS_MINUS :
-				getNextToken();
-				rw_variable();
-				break;
-			//	| variable '=' expr
-			//	| variable '=' '&' variable
-			//	| variable '=' '&' T_NEW class_name_reference ctor_arguments
-			//	| variable T_PLUS_EQUAL expr
-			//	| variable T_MINUS_EQUAL expr
-			//	| variable T_MUL_EQUAL expr
-			//	| variable T_DIV_EQUAL expr
-			//	| variable T_CONCAT_EQUAL expr
-			//	| variable T_MOD_EQUAL expr
-			//	| variable T_AND_EQUAL expr
-			//	| variable T_OR_EQUAL expr
-			//	| variable T_XOR_EQUAL expr
-			//	| variable T_SL_EQUAL expr
-			//	| variable T_SR_EQUAL expr
-			//	| rw_variable T_INC
-			//	| rw_variable T_DEC
-			case TokenNameIdentifier :
-			case TokenNameVariable :
-			case TokenNameDOLLAR :
-				variable();
-				switch (token) {
-					case TokenNameEQUAL :
-						getNextToken();
-						if (token == TokenNameAND) {
-							getNextToken();
-							if (token == TokenNamenew) {
-								// | variable '=' '&' T_NEW class_name_reference
-								// ctor_arguments
-								getNextToken();
-								class_name_reference();
-								ctor_arguments();
-							} else {
-								variable();
-							}
-						} else {
-							expr();
-						}
-						break;
-					case TokenNamePLUS_EQUAL :
-					case TokenNameMINUS_EQUAL :
-					case TokenNameMULTIPLY_EQUAL :
-					case TokenNameDIVIDE_EQUAL :
-					case TokenNameDOT_EQUAL :
-					case TokenNameREMAINDER_EQUAL :
-					case TokenNameAND_EQUAL :
-					case TokenNameOR_EQUAL :
-					case TokenNameXOR_EQUAL :
-					case TokenNameRIGHT_SHIFT_EQUAL :
-					case TokenNameLEFT_SHIFT_EQUAL :
-						getNextToken();
-						expr();
-						break;
-					case TokenNamePLUS_PLUS :
-					case TokenNameMINUS_MINUS :
-						getNextToken();
-						break;
-					default :
-						if (!only_variable) {
-							throwSyntaxError("Variable expression not allowed (found token '"
-									+ scanner.toStringAction(token) + "').");
-						}
-				}
-				break;
-			default :
-				if (token != TokenNameINLINE_HTML) {
-					if (token > TokenNameKEYWORD) {
-						getNextToken();
-						break;
-					} else {
-						throwSyntaxError("Error in expression (found token '"
-								+ scanner.toStringAction(token) + "').");
-					}
-				}
-				return;
-		}
-		if (Scanner.TRACE) {
-			System.out.println("TRACE: expr_without_variable() PART 2");
-		}
-		//	| expr T_BOOLEAN_OR expr
-		//	| expr T_BOOLEAN_AND expr
-		//	| expr T_LOGICAL_OR expr
-		//	| expr T_LOGICAL_AND expr
-		//	| expr T_LOGICAL_XOR expr
-		//	| expr '|' expr
-		//	| expr '&' expr
-		//	| expr '^' expr
-		//	| expr '.' expr
-		//	| expr '+' expr
-		//	| expr '-' expr
-		//	| expr '*' expr
-		//	| expr '/' expr
-		//	| expr '%' expr
-		//	| expr T_SL expr
-		//	| expr T_SR expr
-		//	| expr T_IS_IDENTICAL expr
-		//	| expr T_IS_NOT_IDENTICAL expr
-		//	| expr T_IS_EQUAL expr
-		//	| expr T_IS_NOT_EQUAL expr
-		//	| expr '<' expr
-		//	| expr T_IS_SMALLER_OR_EQUAL expr
-		//	| expr '>' expr
-		//	| expr T_IS_GREATER_OR_EQUAL expr
-		while (true) {
-			switch (token) {
-				case TokenNameOR_OR :
-				case TokenNameAND_AND :
-				case TokenNameand :
-				case TokenNameor :
-				case TokenNamexor :
-				case TokenNameAND :
-				case TokenNameOR :
-				case TokenNameXOR :
-				case TokenNameDOT :
-				case TokenNamePLUS :
-				case TokenNameMINUS :
-				case TokenNameMULTIPLY :
-				case TokenNameDIVIDE :
-				case TokenNameREMAINDER :
-				case TokenNameLEFT_SHIFT :
-				case TokenNameRIGHT_SHIFT :
-				case TokenNameEQUAL_EQUAL_EQUAL :
-				case TokenNameNOT_EQUAL_EQUAL :
-				case TokenNameEQUAL_EQUAL :
-				case TokenNameNOT_EQUAL :
-				case TokenNameLESS :
-				case TokenNameLESS_EQUAL :
-				case TokenNameGREATER :
-				case TokenNameGREATER_EQUAL :
-					getNextToken();
-					expr();
-					break;
-				//  | expr T_INSTANCEOF class_name_reference
-				//	| expr '?' expr ':' expr
-				case TokenNameinstanceof :
-					getNextToken();
-					class_name_reference();
-					break;
-				case TokenNameQUESTION :
-					getNextToken();
-					expr();
-					if (token == TokenNameCOLON) {
-						getNextToken();
-						expr();
-					}
-					break;
-				default :
-					return;
-			}
-		}
-	}
-	private void class_name_reference() {
-		//  class_name_reference:
-		//	T_STRING
-		//| dynamic_class_name_reference
-		if (Scanner.TRACE) {
-			System.out.println("TRACE: class_name_reference()");
-		}
-		if (token == TokenNameIdentifier) {
-			getNextToken();
-		} else {
-			dynamic_class_name_reference();
-		}
-	}
-	private void dynamic_class_name_reference() {
-		//dynamic_class_name_reference:
-		//	base_variable T_OBJECT_OPERATOR object_property
-		// dynamic_class_name_variable_properties
-		//| base_variable
-		if (Scanner.TRACE) {
-			System.out.println("TRACE: dynamic_class_name_reference()");
-		}
-		base_variable();
-		if (token == TokenNameMINUS_GREATER) {
-			getNextToken();
-			object_property();
-			dynamic_class_name_variable_properties();
-		}
-	}
-	private void dynamic_class_name_variable_properties() {
-		//  dynamic_class_name_variable_properties:
-		//  		dynamic_class_name_variable_properties
-		// dynamic_class_name_variable_property
-		//  	| /* empty */
-		if (Scanner.TRACE) {
-			System.out
-					.println("TRACE: dynamic_class_name_variable_properties()");
-		}
-		while (token == TokenNameMINUS_GREATER) {
-			dynamic_class_name_variable_property();
-		}
-	}
-	private void dynamic_class_name_variable_property() {
-		//  dynamic_class_name_variable_property:
-		//	T_OBJECT_OPERATOR object_property
-		if (Scanner.TRACE) {
-			System.out.println("TRACE: dynamic_class_name_variable_property()");
-		}
-		if (token == TokenNameMINUS_GREATER) {
-			getNextToken();
-			object_property();
-		}
-	}
-	private void ctor_arguments() {
-		//  ctor_arguments:
-		//	/* empty */
-		//| '(' function_call_parameter_list ')'
-		if (token == TokenNameLPAREN) {
-			getNextToken();
-			if (token == TokenNameRPAREN) {
-				getNextToken();
-				return;
-			}
-			non_empty_function_call_parameter_list();
-			if (token != TokenNameRPAREN) {
-				throwSyntaxError("')' expected in ctor_arguments.");
-			}
-			getNextToken();
-		}
-	}
-	private void assignment_list() {
-		//  assignment_list:
-		//	assignment_list ',' assignment_list_element
-		//| assignment_list_element
-		while (true) {
-			assignment_list_element();
-			if (token != TokenNameCOMMA) {
-				break;
-			}
-			getNextToken();
-		}
-	}
-	private void assignment_list_element() {
-		//assignment_list_element:
-		//	variable
-		//| T_LIST '(' assignment_list ')'
-		//| /* empty */
-		if (token == TokenNameVariable || token == TokenNameDOLLAR) {
-			variable();
-		} else {
-			if (token == TokenNamelist) {
-				getNextToken();
-				if (token == TokenNameLPAREN) {
-					getNextToken();
-					assignment_list();
-					if (token != TokenNameRPAREN) {
-						throwSyntaxError("')' expected after 'list' keyword.");
-					}
-					getNextToken();
-				} else {
-					throwSyntaxError("'(' expected after 'list' keyword.");
-				}
-			}
-		}
-	}
-	private void array_pair_list() {
-		//  array_pair_list:
-		//	/* empty */
-		//| non_empty_array_pair_list possible_comma
-		non_empty_array_pair_list();
-		if (token == TokenNameCOMMA) {
-			getNextToken();
-		}
-	}
-	private void non_empty_array_pair_list() {
-		//non_empty_array_pair_list:
-		//	non_empty_array_pair_list ',' expr T_DOUBLE_ARROW expr
-		//| non_empty_array_pair_list ',' expr
-		//| expr T_DOUBLE_ARROW expr
-		//| expr
-		//| non_empty_array_pair_list ',' expr T_DOUBLE_ARROW '&' w_variable
-		//| non_empty_array_pair_list ',' '&' w_variable
-		//| expr T_DOUBLE_ARROW '&' w_variable
-		//| '&' w_variable
-		while (true) {
-			if (token == TokenNameAND) {
-				getNextToken();
-				variable();
-			} else {
-				expr();
-				if (token == TokenNameAND) {
-					getNextToken();
-					variable();
-				} else if (token == TokenNameEQUAL_GREATER) {
-					getNextToken();
-					if (token == TokenNameAND) {
-						getNextToken();
-						variable();
-					} else {
-						expr();
-					}
-				}
-			}
-			if (token != TokenNameCOMMA) {
-				return;
-			}
-			getNextToken();
-			if (token == TokenNameRPAREN) {
-				return;
-			}
-		}
-	}
-	//  private void variableList() {
-	//    do {
-	//      variable();
-	//      if (token == TokenNameCOMMA) {
-	//        getNextToken();
-	//      } else {
-	//        break;
-	//      }
-	//    } while (true);
-	//  }
-	private void variable_without_objects() {
-		//  variable_without_objects:
-		//  		reference_variable
-		//  	| simple_indirect_reference reference_variable
-		if (Scanner.TRACE) {
-			System.out.println("TRACE: variable_without_objects()");
-		}
-		while (token == TokenNameDOLLAR) {
-			getNextToken();
-		}
-		reference_variable();
-	}
-	private void function_call() {
-		//  function_call:
-		//	T_STRING '(' function_call_parameter_list ')'
-		//| class_constant '(' function_call_parameter_list ')'
-		//| static_member '(' function_call_parameter_list ')'
-		//| variable_without_objects '(' function_call_parameter_list ')'
-		if (Scanner.TRACE) {
-			System.out.println("TRACE: function_call()");
-		}
-		if (token == TokenNameIdentifier) {
-			getNextToken();
-			switch (token) {
-				case TokenNamePAAMAYIM_NEKUDOTAYIM :
-					// static member:
-					getNextToken();
-					if (token == TokenNameIdentifier) {
-						// class _constant
-						getNextToken();
-					} else {
-						//        static member:
-						variable_without_objects();
-					}
-					break;
-			}
-		} else {
-			variable_without_objects();
-		}
-		if (token != TokenNameLPAREN) {
-			// TODO is this ok ?
-			return;
-			//      throwSyntaxError("'(' expected in function call.");
-		}
-		getNextToken();
-		if (token == TokenNameRPAREN) {
-			getNextToken();
-			return;
-		}
-		non_empty_function_call_parameter_list();
-		if (token != TokenNameRPAREN) {
-			throwSyntaxError("')' expected in function call.");
-		}
-		getNextToken();
-	}
-	//  private void function_call_parameter_list() {
-	//    function_call_parameter_list:
-	//		non_empty_function_call_parameter_list { $$ = $1; }
-	//	| /* empty */
-	//  }
-	private void non_empty_function_call_parameter_list() {
-		//non_empty_function_call_parameter_list:
-		//		expr_without_variable
-		//	| variable
-		//	| '&' w_variable
-		//	| non_empty_function_call_parameter_list ',' expr_without_variable
-		//	| non_empty_function_call_parameter_list ',' variable
-		//	| non_empty_function_call_parameter_list ',' '&' w_variable
-		if (Scanner.TRACE) {
-			System.out
-					.println("TRACE: non_empty_function_call_parameter_list()");
-		}
-		while (true) {
-			if (token == TokenNameAND) {
-				getNextToken();
-				w_variable();
-			} else {
-				//        if (token == TokenNameIdentifier || token ==
-				// TokenNameVariable
-				//            || token == TokenNameDOLLAR) {
-				//          variable();
-				//        } else {
-				expr_without_variable(true);
-				//        }
-			}
-			if (token != TokenNameCOMMA) {
-				break;
-			}
-			getNextToken();
-		}
-	}
-	private void fully_qualified_class_name() {
-		if (token == TokenNameIdentifier) {
-			getNextToken();
-		} else {
-			throwSyntaxError("Class name expected.");
-		}
-	}
-	private void static_member() {
-		//  static_member:
-		//	fully_qualified_class_name T_PAAMAYIM_NEKUDOTAYIM
-		// variable_without_objects
-		if (Scanner.TRACE) {
-			System.out.println("TRACE: static_member()");
-		}
-		fully_qualified_class_name();
-		if (token != TokenNamePAAMAYIM_NEKUDOTAYIM) {
-			throwSyntaxError("'::' expected after class name (static_member).");
-		}
-		getNextToken();
-		variable_without_objects();
-	}
-	private void base_variable_with_function_calls() {
-		//  base_variable_with_function_calls:
-		//	base_variable
-		//| function_call
-		boolean functionCall = false;
-		if (Scanner.TRACE) {
-			System.out.println("TRACE: base_variable_with_function_calls()");
-		}
-		//    if (token == TokenNameIdentifier) {
-		//      functionCall = true;
-		//    } else if (token == TokenNameVariable) {
-		//      int tempToken = token;
-		//      int tempPosition = scanner.currentPosition;
-		//      getNextToken();
-		//      if (token == TokenNameLPAREN) {
-		//        functionCall = true;
-		//      }
-		//      token = tempToken;
-		//      scanner.currentPosition = tempPosition;
-		//      scanner.phpMode = true;
-		//    }
-		//    if (functionCall) {
-		function_call();
-		//    } else {
-		//      base_variable();
-		//    }
-	}
-	private void base_variable() {
-		//  base_variable:
-		//  		reference_variable
-		//  	| simple_indirect_reference reference_variable
-		//  	| static_member
-		if (Scanner.TRACE) {
-			System.out.println("TRACE: base_variable()");
-		}
-		if (token == TokenNameIdentifier) {
-			static_member();
-		} else {
-			while (token == TokenNameDOLLAR) {
-				getNextToken();
-			}
-			reference_variable();
-		}
-	}
-	//  private void simple_indirect_reference() {
-	//    // simple_indirect_reference:
-	//    // '$'
-	//    //| simple_indirect_reference '$'
-	//  }
-	private void reference_variable() {
-		//  reference_variable:
-		//  		reference_variable '[' dim_offset ']'
-		//  	| reference_variable '{' expr '}'
-		//  	| compound_variable
-		if (Scanner.TRACE) {
-			System.out.println("TRACE: reference_variable()");
-		}
-		compound_variable();
-		while (true) {
-			if (token == TokenNameLBRACE) {
-				getNextToken();
-				expr();
-				if (token != TokenNameRBRACE) {
-					throwSyntaxError("'}' expected in reference variable.");
-				}
-				getNextToken();
-			} else if (token == TokenNameLBRACKET) {
-				getNextToken();
-				if (token != TokenNameRBRACKET) {
-					expr();
-					//        dim_offset();
-					if (token != TokenNameRBRACKET) {
-						throwSyntaxError("']' expected in reference variable.");
-					}
-				}
-				getNextToken();
-			} else {
-				break;
-			}
-		}
-	}
-	private void compound_variable() {
-		//  compound_variable:
-		//  		T_VARIABLE
-		//  	| '$' '{' expr '}'
-		if (Scanner.TRACE) {
-			System.out.println("TRACE: compound_variable()");
-		}
-		if (token == TokenNameVariable) {
-			getNextToken();
-		} else {
-			// because of simple_indirect_reference
-			while (token == TokenNameDOLLAR) {
-				getNextToken();
-			}
-			if (token != TokenNameLBRACE) {
-				throwSyntaxError("'{' expected after compound variable token '$'.");
-			}
-			getNextToken();
-			expr();
-			if (token != TokenNameRBRACE) {
-				throwSyntaxError("'}' expected after compound variable token '$'.");
-			}
-			getNextToken();
-		}
-	}
-	//  private void dim_offset() {
-	//    // dim_offset:
-	//    // /* empty */
-	//    // | expr
-	//    expr();
-	//  }
-	private void object_property() {
-		//  object_property:
-		//	object_dim_list
-		//| variable_without_objects
-		if (Scanner.TRACE) {
-			System.out.println("TRACE: object_property()");
-		}
-		if (token == TokenNameVariable || token == TokenNameDOLLAR) {
-			variable_without_objects();
-		} else {
-			object_dim_list();
-		}
-	}
-	private void object_dim_list() {
-		//object_dim_list:
-		//	object_dim_list '[' dim_offset ']'
-		//| object_dim_list '{' expr '}'
-		//| variable_name
-		if (Scanner.TRACE) {
-			System.out.println("TRACE: object_dim_list()");
-		}
-		variable_name();
-		while (true) {
-			if (token == TokenNameLBRACE) {
-				getNextToken();
-				expr();
-				if (token != TokenNameRBRACE) {
-					throwSyntaxError("'}' expected in object_dim_list.");
-				}
-				getNextToken();
-			} else if (token == TokenNameLBRACKET) {
-				getNextToken();
-				if (token == TokenNameRBRACKET) {
-					getNextToken();
-					continue;
-				}
-				expr();
-				if (token != TokenNameRBRACKET) {
-					throwSyntaxError("']' expected in object_dim_list.");
-				}
-				getNextToken();
-			} else {
-				break;
-			}
-		}
-	}
-	private void variable_name() {
-		//variable_name:
-		//	T_STRING
-		//| '{' expr '}'
-		if (Scanner.TRACE) {
-			System.out.println("TRACE: variable_name()");
-		}
-		if (token == TokenNameIdentifier || token > TokenNameKEYWORD) {
-			if (token > TokenNameKEYWORD) {
-				// TODO show a warning "Keyword used as variable" ?
-			}
-			getNextToken();
-		} else {
-			if (token != TokenNameLBRACE) {
-				throwSyntaxError("'{' expected in variable name.");
-			}
-			getNextToken();
-			expr();
-			if (token != TokenNameRBRACE) {
-				throwSyntaxError("'}' expected in variable name.");
-			}
-			getNextToken();
-		}
-	}
-	private void r_variable() {
-		variable();
-	}
-	private void w_variable() {
-		variable();
-	}
-	private void rw_variable() {
-		variable();
-	}
-	private void variable() {
-		//    variable:
-		//		base_variable_with_function_calls T_OBJECT_OPERATOR
-		//			object_property method_or_not variable_properties
-		//	| base_variable_with_function_calls
-		base_variable_with_function_calls();
-		if (token == TokenNameMINUS_GREATER) {
-			getNextToken();
-			object_property();
-			method_or_not();
-			variable_properties();
-		}
-		//    if (token == TokenNameDOLLAR_LBRACE) {
-		//      getNextToken();
-		//      expr();
-		//      ;
-		//      if (token != TokenNameRBRACE) {
-		//        throwSyntaxError("'}' expected after indirect variable token '${'.");
-		//      }
-		//      getNextToken();
-		//    } else {
-		//      if (token == TokenNameVariable) {
-		//        getNextToken();
-		//        if (token == TokenNameLBRACKET) {
-		//          getNextToken();
-		//          expr();
-		//          if (token != TokenNameRBRACKET) {
-		//            throwSyntaxError("']' expected in variable-list.");
-		//          }
-		//          getNextToken();
-		//        } else if (token == TokenNameEQUAL) {
-		//          getNextToken();
-		//          static_scalar();
-		//        }
-		//      } else {
-		//        throwSyntaxError("$-variable expected in variable-list.");
-		//      }
-		//    }
-	}
-	private void variable_properties() {
-		//  variable_properties:
-		//  		variable_properties variable_property
-		//  	| /* empty */
-		while (token == TokenNameMINUS_GREATER) {
-			variable_property();
-		}
-	}
-	private void variable_property() {
-		//  variable_property:
-		//  		T_OBJECT_OPERATOR object_property method_or_not
-		if (Scanner.TRACE) {
-			System.out.println("TRACE: variable_property()");
-		}
-		if (token == TokenNameMINUS_GREATER) {
-			getNextToken();
-			object_property();
-			method_or_not();
-		} else {
-			throwSyntaxError("'->' expected in variable_property.");
-		}
-	}
-	private void method_or_not() {
-		//  method_or_not:
-		//  		'(' function_call_parameter_list ')'
-		//  	| /* empty */
-		if (Scanner.TRACE) {
-			System.out.println("TRACE: method_or_not()");
-		}
-		if (token == TokenNameLPAREN) {
-			getNextToken();
-			if (token == TokenNameRPAREN) {
-				getNextToken();
-				return;
-			}
-			non_empty_function_call_parameter_list();
-			if (token != TokenNameRPAREN) {
-				throwSyntaxError("')' expected in method_or_not.");
-			}
-			getNextToken();
-		}
-	}
-	private void exit_expr() {
-		//	/* empty */
-		//	| '(' ')'
-		//	| '(' expr ')'
-		if (token != TokenNameLPAREN) {
-			return;
-		}
-		getNextToken();
-		if (token == TokenNameRPAREN) {
-			getNextToken();
-			return;
-		}
-		expr();
-		if (token != TokenNameRPAREN) {
-			throwSyntaxError("')' expected after keyword 'exit'");
-		}
-		getNextToken();
-	}
-	private void encaps_list() {
-		//  		encaps_list encaps_var
-		//  	| encaps_list T_STRING
-		//  	| encaps_list T_NUM_STRING
-		//  	| encaps_list T_ENCAPSED_AND_WHITESPACE
-		//  	| encaps_list T_CHARACTER
-		//  	| encaps_list T_BAD_CHARACTER
-		//  	| encaps_list '['
-		//  	| encaps_list ']'
-		//  	| encaps_list '{'
-		//  	| encaps_list '}'
-		//  	| encaps_list T_OBJECT_OPERATOR
-		//  	| /* empty */
-		while (true) {
-			switch (token) {
-				case TokenNameSTRING :
-					getNextToken();
-					break;
-				case TokenNameLBRACE :
-					//          scanner.encapsedStringStack.pop();
-					getNextToken();
-					break;
-				case TokenNameRBRACE :
-					//          scanner.encapsedStringStack.pop();
-					getNextToken();
-					break;
-				case TokenNameLBRACKET :
-					//          scanner.encapsedStringStack.pop();
-					getNextToken();
-					break;
-				case TokenNameRBRACKET :
-					//          scanner.encapsedStringStack.pop();
-					getNextToken();
-					break;
-				case TokenNameMINUS_GREATER :
-					//          scanner.encapsedStringStack.pop();
-					getNextToken();
-					break;
-				case TokenNameVariable :
-				case TokenNameDOLLAR_LBRACE :
-				case TokenNameCURLY_OPEN :
-					encaps_var();
-					break;
-				//        case TokenNameDOLLAR :
-				//          getNextToken();
-				//          if (token == TokenNameLBRACE) {
-				//            token = TokenNameDOLLAR_LBRACE;
-				//            encaps_var();
-				//          }
-				//          break;
-				default :
-					char encapsedChar = ((Character) scanner.encapsedStringStack
-							.peek()).charValue();
-					if (encapsedChar == '$') {
-						scanner.encapsedStringStack.pop();
-						encapsedChar = ((Character) scanner.encapsedStringStack
-								.peek()).charValue();
-						switch (encapsedChar) {
-							case '`' :
-								if (token == TokenNameEncapsedString0) {
-									return;
-								}
-								token = TokenNameSTRING;
-								continue;
-							case '\'' :
-								if (token == TokenNameEncapsedString1) {
-									return;
-								}
-								token = TokenNameSTRING;
-								continue;
-							case '"' :
-								if (token == TokenNameEncapsedString2) {
-									return;
-								}
-								token = TokenNameSTRING;
-								continue;
-						}
-					}
-					return;
-			}
-		}
-	}
-	private void encaps_var() {
-		//  		T_VARIABLE
-		//  	| T_VARIABLE '[' encaps_var_offset ']'
-		//  	| T_VARIABLE T_OBJECT_OPERATOR T_STRING
-		//  	| T_DOLLAR_OPEN_CURLY_BRACES expr '}'
-		//  	| T_DOLLAR_OPEN_CURLY_BRACES T_STRING_VARNAME '[' expr ']' '}'
-		//  	| T_CURLY_OPEN variable '}'
-		switch (token) {
-			case TokenNameVariable :
-				getNextToken();
-				if (token == TokenNameLBRACKET) {
-					getNextToken();
-					//          if (token == TokenNameRBRACKET) {
-					//            getNextToken();
-					//          } else {
-					expr(); //encaps_var_offset();
-					if (token != TokenNameRBRACKET) {
-						throwSyntaxError("']' expected after variable.");
-					}
-					//          scanner.encapsedStringStack.pop();
-					getNextToken();
-					//          }
-				} else if (token == TokenNameMINUS_GREATER) {
-					getNextToken();
-					if (token != TokenNameIdentifier) {
-						throwSyntaxError("Identifier expected after '->'.");
-					}
-					//          scanner.encapsedStringStack.pop();
-					getNextToken();
-				}
-				//        else {
-				//          // scanner.encapsedStringStack.pop();
-				//          int tempToken = TokenNameSTRING;
-				//          if (!scanner.encapsedStringStack.isEmpty()
-				//              && (token == TokenNameEncapsedString0
-				//                  || token == TokenNameEncapsedString1
-				//                  || token == TokenNameEncapsedString2 || token ==
-				// TokenNameERROR)) {
-				//            char encapsedChar = ((Character)
-				// scanner.encapsedStringStack.peek())
-				//                .charValue();
-				//            switch (token) {
-				//              case TokenNameEncapsedString0 :
-				//                if (encapsedChar == '`') {
-				//                  tempToken = TokenNameEncapsedString0;
-				//                }
-				//                break;
-				//              case TokenNameEncapsedString1 :
-				//                if (encapsedChar == '\'') {
-				//                  tempToken = TokenNameEncapsedString1;
-				//                }
-				//                break;
-				//              case TokenNameEncapsedString2 :
-				//                if (encapsedChar == '"') {
-				//                  tempToken = TokenNameEncapsedString2;
-				//                }
-				//                break;
-				//              case TokenNameERROR :
-				//                if (scanner.source[scanner.currentPosition - 1] == '\\') {
-				//                  scanner.currentPosition--;
-				//                  getNextToken();
-				//                }
-				//                break;
-				//            }
-				//          }
-				//          token = tempToken;
-				//        }
-				break;
-			case TokenNameDOLLAR_LBRACE :
-				getNextToken();
-				if (token == TokenNameIdentifier) {
-					getNextToken();
-					if (token == TokenNameLBRACKET) {
-						getNextToken();
-						//            if (token == TokenNameRBRACKET) {
-						//              getNextToken();
-						//            } else {
-						expr();
-						if (token != TokenNameRBRACKET) {
-							throwSyntaxError("']' expected after '${'.");
-						}
-						getNextToken();
-						//            }
-					}
-					if (token != TokenNameRBRACE) {
-						throwSyntaxError("'}' expected after '${'.");
-					}
-					//          scanner.encapsedStringStack.pop();
-					getNextToken();
-				} else {
-					expr();
-					if (token != TokenNameRBRACE) {
-						throwSyntaxError("'}' expected.");
-					}
-					//          scanner.encapsedStringStack.pop();
-					getNextToken();
-				}
-				break;
-			case TokenNameCURLY_OPEN :
-				getNextToken();
-				if (token == TokenNameIdentifier || token > TokenNameKEYWORD) {
-					getNextToken();
-					if (token == TokenNameLBRACKET) {
-						getNextToken();
-						//            if (token == TokenNameRBRACKET) {
-						//              getNextToken();
-						//            } else {
-						expr();
-						if (token != TokenNameRBRACKET) {
-							throwSyntaxError("']' expected after '{$'.");
-						}
-						getNextToken();
-						//            }
-					} else if (token == TokenNameMINUS_GREATER) {
-						getNextToken();
-						if (token != TokenNameIdentifier) {
-							throwSyntaxError("String token expected.");
-						}
-						getNextToken();
-					}
-					//          if (token != TokenNameRBRACE) {
-					//            throwSyntaxError("'}' expected after '{$'.");
-					//          }
-					//          // scanner.encapsedStringStack.pop();
-					//          getNextToken();
-				} else {
-					expr();
-					if (token != TokenNameRBRACE) {
-						throwSyntaxError("'}' expected.");
-					}
-					//          scanner.encapsedStringStack.pop();
-					getNextToken();
-				}
-				break;
-		}
-	}
-	private void encaps_var_offset() {
-		//  		T_STRING
-		//  	| T_NUM_STRING
-		//  	| T_VARIABLE
-		switch (token) {
-			case TokenNameSTRING :
-				getNextToken();
-				break;
-			case TokenNameIntegerLiteral :
-				getNextToken();
-				break;
-			case TokenNameVariable :
-				getNextToken();
-				break;
-			case TokenNameIdentifier :
-				getNextToken();
-				break;
-			default :
-				throwSyntaxError("Variable or String token expected.");
-				break;
-		}
-	}
-	private void internal_functions_in_yacc() {
-		switch (token) {
-			case TokenNameisset :
-				//	T_ISSET '(' isset_variables ')'
-				getNextToken();
-				if (token != TokenNameLPAREN) {
-					throwSyntaxError("'(' expected after keyword 'isset'");
-				}
-				getNextToken();
-				isset_variables();
-				if (token != TokenNameRPAREN) {
-					throwSyntaxError("')' expected after keyword 'isset'");
-				}
-				getNextToken();
-				break;
-			case TokenNameempty :
-				//	T_EMPTY '(' variable ')'
-				getNextToken();
-				if (token != TokenNameLPAREN) {
-					throwSyntaxError("'(' expected after keyword 'empty'");
-				}
-				getNextToken();
-				variable();
-				if (token != TokenNameRPAREN) {
-					throwSyntaxError("')' expected after keyword 'empty'");
-				}
-				getNextToken();
-				break;
-			case TokenNameinclude :
-				//T_INCLUDE expr
-				getNextToken();
-				expr();
-				//        ImportReference impt = new ImportReference(tokens, positions,
-				// false, AccDefault);
-				//        impt.declarationSourceEnd = impt.sourceEnd;
-				//        impt.declarationEnd = impt.declarationSourceEnd;
-				//    	//endPosition is just before the ;
-				//    	impt.declarationSourceStart = this.intStack[this.intPtr--];
-				break;
-			case TokenNameinclude_once :
-				//	T_INCLUDE_ONCE expr
-				getNextToken();
-				expr();
-				break;
-			case TokenNameeval :
-				//	T_EVAL '(' expr ')'
-				getNextToken();
-				if (token != TokenNameLPAREN) {
-					throwSyntaxError("'(' expected after keyword 'eval'");
-				}
-				getNextToken();
-				expr();
-				if (token != TokenNameRPAREN) {
-					throwSyntaxError("')' expected after keyword 'eval'");
-				}
-				getNextToken();
-				break;
-			case TokenNamerequire :
-				//T_REQUIRE expr
-				getNextToken();
-				expr();
-				break;
-			case TokenNamerequire_once :
-				//	T_REQUIRE_ONCE expr
-				getNextToken();
-				expr();
-				break;
-		}
-	}
-	private void isset_variables() {
-		//	variable
-		//	| isset_variables ','
-		if (token == TokenNameRPAREN) {
-			throwSyntaxError("Variable expected after keyword 'isset'");
-		}
-		while (true) {
-			variable();
-			if (token == TokenNameCOMMA) {
-				getNextToken();
-			} else {
-				break;
-			}
-		}
-	}
-	private boolean common_scalar() {
-		//  common_scalar:
-		//	T_LNUMBER
-		//	| T_DNUMBER
-		//	| T_CONSTANT_ENCAPSED_STRING
-		//	| T_LINE
-		//	| T_FILE
-		//	| T_CLASS_C
-		//	| T_METHOD_C
-		//	| T_FUNC_C
-		switch (token) {
-			case TokenNameIntegerLiteral :
-				getNextToken();
-				return true;
-			case TokenNameDoubleLiteral :
-				getNextToken();
-				return true;
-			case TokenNameStringLiteral :
-				getNextToken();
-				return true;
-			case TokenNameStringConstant :
-				getNextToken();
-				return true;
-			case TokenNameStringInterpolated :
-				getNextToken();
-				return true;
-			case TokenNameFILE :
-				getNextToken();
-				return true;
-			case TokenNameLINE :
-				getNextToken();
-				return true;
-			case TokenNameCLASS_C :
-				getNextToken();
-				return true;
-			case TokenNameMETHOD_C :
-				getNextToken();
-				return true;
-			case TokenNameFUNC_C :
-				getNextToken();
-				return true;
-		}
-		return false;
-	}
-	private void scalar() {
-		//  scalar:
-		//	T_STRING
-		//| T_STRING_VARNAME
-		//| class_constant
-		//| common_scalar
-		//| '"' encaps_list '"'
-		//| '\'' encaps_list '\''
-		//| T_START_HEREDOC encaps_list T_END_HEREDOC
-		throwSyntaxError("Not yet implemented (scalar).");
-	}
-	private void static_scalar() {
-		//    static_scalar: /* compile-time evaluated scalars */
-		//		common_scalar
-		//	| T_STRING
-		//	| '+' static_scalar
-		//	| '-' static_scalar
-		//	| T_ARRAY '(' static_array_pair_list ')'
-		//	| static_class_constant
-		if (common_scalar()) {
-			return;
-		}
-		switch (token) {
-			case TokenNameIdentifier :
-				getNextToken();
-				//        static_class_constant:
-				//  		T_STRING T_PAAMAYIM_NEKUDOTAYIM T_STRING
-				if (token == TokenNamePAAMAYIM_NEKUDOTAYIM) {
-					getNextToken();
-					if (token == TokenNameIdentifier) {
-						getNextToken();
-					} else {
-						throwSyntaxError("Identifier expected after '::' operator.");
-					}
-				}
-				break;
-			case TokenNameEncapsedString0 :
-				try {
-					scanner.currentCharacter = scanner.source[scanner.currentPosition++];
-					while (scanner.currentCharacter != '`') {
-						if (scanner.currentCharacter == '\\') {
-							scanner.currentPosition++;
-						}
-						scanner.currentCharacter = scanner.source[scanner.currentPosition++];
-					}
-					getNextToken();
-				} catch (IndexOutOfBoundsException e) {
-					throwSyntaxError("'`' expected at end of static string.");
-				}
-				break;
-			case TokenNameEncapsedString1 :
-				try {
-					scanner.currentCharacter = scanner.source[scanner.currentPosition++];
-					while (scanner.currentCharacter != '\'') {
-						if (scanner.currentCharacter == '\\') {
-							scanner.currentPosition++;
-						}
-						scanner.currentCharacter = scanner.source[scanner.currentPosition++];
-					}
-					getNextToken();
-				} catch (IndexOutOfBoundsException e) {
-					throwSyntaxError("'\'' expected at end of static string.");
-				}
-				break;
-			case TokenNameEncapsedString2 :
-				try {
-					scanner.currentCharacter = scanner.source[scanner.currentPosition++];
-					while (scanner.currentCharacter != '"') {
-						if (scanner.currentCharacter == '\\') {
-							scanner.currentPosition++;
-						}
-						scanner.currentCharacter = scanner.source[scanner.currentPosition++];
-					}
-					getNextToken();
-				} catch (IndexOutOfBoundsException e) {
-					throwSyntaxError("'\"' expected at end of static string.");
-				}
-				break;
-			case TokenNamePLUS :
-				getNextToken();
-				static_scalar();
-				break;
-			case TokenNameMINUS :
-				getNextToken();
-				static_scalar();
-				break;
-			case TokenNamearray :
-				getNextToken();
-				if (token != TokenNameLPAREN) {
-					throwSyntaxError("'(' expected after keyword 'array'");
-				}
-				getNextToken();
-				if (token == TokenNameRPAREN) {
-					getNextToken();
-					break;
-				}
-				non_empty_static_array_pair_list();
-				if (token != TokenNameRPAREN) {
-					throwSyntaxError("')' expected after keyword 'array'");
-				}
-				getNextToken();
-				break;
-			//      case TokenNamenull :
-			//        getNextToken();
-			//        break;
-			//      case TokenNamefalse :
-			//        getNextToken();
-			//        break;
-			//      case TokenNametrue :
-			//        getNextToken();
-			//        break;
-			default :
-				throwSyntaxError("Static scalar/constant expected.");
-		}
-	}
-	private void non_empty_static_array_pair_list() {
-		//  non_empty_static_array_pair_list:
-		//	non_empty_static_array_pair_list ',' static_scalar T_DOUBLE_ARROW
-		// static_scalar
-		//| non_empty_static_array_pair_list ',' static_scalar
-		//| static_scalar T_DOUBLE_ARROW static_scalar
-		//| static_scalar
-		while (true) {
-			static_scalar();
-			if (token == TokenNameEQUAL_GREATER) {
-				getNextToken();
-				static_scalar();
-			}
-			if (token != TokenNameCOMMA) {
-				break;
-			}
-			getNextToken();
-			if (token == TokenNameRPAREN) {
-				break;
-			}
-		}
-	}
-	public void reportSyntaxError() { //int act, int currentKind, int
-		// stateStackTop) {
-		/* remember current scanner position */
-		int startPos = scanner.startPosition;
-		int currentPos = scanner.currentPosition;
-		//		String[] expectings;
-		//		String tokenName = name[symbol_index[currentKind]];
-		//fetch all "accurate" possible terminals that could recover the error
-		//		int start, end = start = asi(stack[stateStackTop]);
-		//		while (asr[end] != 0)
-		//			end++;
-		//		int length = end - start;
-		//		expectings = new String[length];
-		//		if (length != 0) {
-		//			char[] indexes = new char[length];
-		//			System.arraycopy(asr, start, indexes, 0, length);
-		//			for (int i = 0; i < length; i++) {
-		//				expectings[i] = name[symbol_index[indexes[i]]];
-		//			}
-		//		}
-		//if the pb is an EOF, try to tell the user that they are some
-		//		if (tokenName.equals(UNEXPECTED_EOF)) {
-		//			if (!this.checkAndReportBracketAnomalies(problemReporter())) {
-		//				char[] tokenSource;
-		//				try {
-		//					tokenSource = this.scanner.getCurrentTokenSource();
-		//				} catch (Exception e) {
-		//					tokenSource = new char[] {};
-		//				}
-		//				problemReporter().parseError(
-		//					this.scanner.startPosition,
-		//					this.scanner.currentPosition - 1,
-		//					tokenSource,
-		//					tokenName,
-		//					expectings);
-		//			}
-		//		} else { //the next test is HEAVILY grammar DEPENDENT.
-		//			if ((length == 14)
-		//				&& (expectings[0] == "=") //$NON-NLS-1$
-		//				&& (expectings[1] == "*=") //$NON-NLS-1$
-		//				&& (expressionPtr > -1)) {
-		//					switch(currentKind) {
-		//						case TokenNameSEMICOLON:
-		//						case TokenNamePLUS:
-		//						case TokenNameMINUS:
-		//						case TokenNameDIVIDE:
-		//						case TokenNameREMAINDER:
-		//						case TokenNameMULTIPLY:
-		//						case TokenNameLEFT_SHIFT:
-		//						case TokenNameRIGHT_SHIFT:
-		//// case TokenNameUNSIGNED_RIGHT_SHIFT:
-		//						case TokenNameLESS:
-		//						case TokenNameGREATER:
-		//						case TokenNameLESS_EQUAL:
-		//						case TokenNameGREATER_EQUAL:
-		//						case TokenNameEQUAL_EQUAL:
-		//						case TokenNameNOT_EQUAL:
-		//						case TokenNameXOR:
-		//						case TokenNameAND:
-		//						case TokenNameOR:
-		//						case TokenNameOR_OR:
-		//						case TokenNameAND_AND:
-		//							// the ; is not the expected token ==> it ends a statement when an
-		// expression is not ended
-		//							problemReporter().invalidExpressionAsStatement(expressionStack[expressionPtr]);
-		//							break;
-		//						case TokenNameRBRACE :
-		//							problemReporter().missingSemiColon(expressionStack[expressionPtr]);
-		//							break;
-		//						default:
-		//							char[] tokenSource;
-		//							try {
-		//								tokenSource = this.scanner.getCurrentTokenSource();
-		//							} catch (Exception e) {
-		//								tokenSource = new char[] {};
-		//							}
-		//							problemReporter().parseError(
-		//								this.scanner.startPosition,
-		//								this.scanner.currentPosition - 1,
-		//								tokenSource,
-		//								tokenName,
-		//								expectings);
-		//							this.checkAndReportBracketAnomalies(problemReporter());
-		//					}
-		//			} else {
-		char[] tokenSource;
-		try {
-			tokenSource = this.scanner.getCurrentTokenSource();
-		} catch (Exception e) {
-			tokenSource = new char[]{};
-		}
-		//				problemReporter().parseError(
-		//					this.scanner.startPosition,
-		//					this.scanner.currentPosition - 1,
-		//					tokenSource,
-		//					tokenName,
-		//					expectings);
-		this.checkAndReportBracketAnomalies(problemReporter());
-		//			}
-		//		}
-		/* reset scanner where it was */
-		scanner.startPosition = startPos;
-		scanner.currentPosition = currentPos;
-	}
-	public static final int RoundBracket = 0;
-	public static final int SquareBracket = 1;
-	public static final int CurlyBracket = 2;
-	public static final int BracketKinds = 3;
-	protected int[] nestedMethod; //the ptr is nestedType
-	protected int nestedType, dimensions;
-	//ast stack
-	final static int AstStackIncrement = 100;
-	protected int astPtr;
-	protected AstNode[] astStack = new AstNode[AstStackIncrement];
-	protected int astLengthPtr;
-	protected int[] astLengthStack;
-	AstNode[] noAstNodes = new AstNode[AstStackIncrement];
-	public CompilationUnitDeclaration compilationUnit; /*
-													    * the result from
-													    * parse()
-													    */
-	protected ReferenceContext referenceContext;
-	protected ProblemReporter problemReporter;
-	protected CompilerOptions options;
-	//  protected CompilationResult compilationResult;
-	/**
-	 * Returns this parser's problem reporter initialized with its reference
-	 * context. Also it is assumed that a problem is going to be reported, so
-	 * initializes the compilation result's line positions.
-	 */
-	public ProblemReporter problemReporter() {
-		if (scanner.recordLineSeparator) {
-			compilationUnit.compilationResult.lineSeparatorPositions = scanner
-					.getLineEnds();
-		}
-		problemReporter.referenceContext = referenceContext;
-		return problemReporter;
-	}
-	/*
-	 * Reconsider the entire source looking for inconsistencies in {} () []
-	 */
-	public boolean checkAndReportBracketAnomalies(
-			ProblemReporter problemReporter) {
-		scanner.wasAcr = false;
-		boolean anomaliesDetected = false;
-		try {
-			char[] source = scanner.source;
-			int[] leftCount = {0, 0, 0};
-			int[] rightCount = {0, 0, 0};
-			int[] depths = {0, 0, 0};
-			int[][] leftPositions = new int[][]{new int[10], new int[10],
-					new int[10]};
-			int[][] leftDepths = new int[][]{new int[10], new int[10],
-					new int[10]};
-			int[][] rightPositions = new int[][]{new int[10], new int[10],
-					new int[10]};
-			int[][] rightDepths = new int[][]{new int[10], new int[10],
-					new int[10]};
-			scanner.currentPosition = scanner.initialPosition; //starting
-			// point
-			// (first-zero-based
-			// char)
-			while (scanner.currentPosition < scanner.eofPosition) { //loop for
-				// jumping
-				// over
-				// comments
-				try {
-					// ---------Consume white space and handles
-					// startPosition---------
-					boolean isWhiteSpace;
-					do {
-						scanner.startPosition = scanner.currentPosition;
-						//						if (((scanner.currentCharacter =
-						// source[scanner.currentPosition++]) == '\\') &&
-						// (source[scanner.currentPosition] == 'u')) {
-						//							isWhiteSpace = scanner.jumpOverUnicodeWhiteSpace();
-						//						} else {
-						if (scanner.recordLineSeparator
-								&& ((scanner.currentCharacter == '\r') || (scanner.currentCharacter == '\n'))) {
-							if (scanner.lineEnds[scanner.linePtr] < scanner.startPosition) {
-								// only record line positions we have not
-								// recorded yet
-								scanner.pushLineSeparator();
-							}
-						}
-						isWhiteSpace = CharOperation
-								.isWhitespace(scanner.currentCharacter);
-						//						}
-					} while (isWhiteSpace
-							&& (scanner.currentPosition < scanner.eofPosition));
-					// -------consume token until } is found---------
-					switch (scanner.currentCharacter) {
-						case '{' : {
-							int index = leftCount[CurlyBracket]++;
-							if (index == leftPositions[CurlyBracket].length) {
-								System
-										.arraycopy(
-												leftPositions[CurlyBracket],
-												0,
-												(leftPositions[CurlyBracket] = new int[index * 2]),
-												0, index);
-								System
-										.arraycopy(
-												leftDepths[CurlyBracket],
-												0,
-												(leftDepths[CurlyBracket] = new int[index * 2]),
-												0, index);
-							}
-							leftPositions[CurlyBracket][index] = scanner.startPosition;
-							leftDepths[CurlyBracket][index] = depths[CurlyBracket]++;
-						}
-							break;
-						case '}' : {
-							int index = rightCount[CurlyBracket]++;
-							if (index == rightPositions[CurlyBracket].length) {
-								System
-										.arraycopy(
-												rightPositions[CurlyBracket],
-												0,
-												(rightPositions[CurlyBracket] = new int[index * 2]),
-												0, index);
-								System
-										.arraycopy(
-												rightDepths[CurlyBracket],
-												0,
-												(rightDepths[CurlyBracket] = new int[index * 2]),
-												0, index);
-							}
-							rightPositions[CurlyBracket][index] = scanner.startPosition;
-							rightDepths[CurlyBracket][index] = --depths[CurlyBracket];
-						}
-							break;
-						case '(' : {
-							int index = leftCount[RoundBracket]++;
-							if (index == leftPositions[RoundBracket].length) {
-								System
-										.arraycopy(
-												leftPositions[RoundBracket],
-												0,
-												(leftPositions[RoundBracket] = new int[index * 2]),
-												0, index);
-								System
-										.arraycopy(
-												leftDepths[RoundBracket],
-												0,
-												(leftDepths[RoundBracket] = new int[index * 2]),
-												0, index);
-							}
-							leftPositions[RoundBracket][index] = scanner.startPosition;
-							leftDepths[RoundBracket][index] = depths[RoundBracket]++;
-						}
-							break;
-						case ')' : {
-							int index = rightCount[RoundBracket]++;
-							if (index == rightPositions[RoundBracket].length) {
-								System
-										.arraycopy(
-												rightPositions[RoundBracket],
-												0,
-												(rightPositions[RoundBracket] = new int[index * 2]),
-												0, index);
-								System
-										.arraycopy(
-												rightDepths[RoundBracket],
-												0,
-												(rightDepths[RoundBracket] = new int[index * 2]),
-												0, index);
-							}
-							rightPositions[RoundBracket][index] = scanner.startPosition;
-							rightDepths[RoundBracket][index] = --depths[RoundBracket];
-						}
-							break;
-						case '[' : {
-							int index = leftCount[SquareBracket]++;
-							if (index == leftPositions[SquareBracket].length) {
-								System
-										.arraycopy(
-												leftPositions[SquareBracket],
-												0,
-												(leftPositions[SquareBracket] = new int[index * 2]),
-												0, index);
-								System
-										.arraycopy(
-												leftDepths[SquareBracket],
-												0,
-												(leftDepths[SquareBracket] = new int[index * 2]),
-												0, index);
-							}
-							leftPositions[SquareBracket][index] = scanner.startPosition;
-							leftDepths[SquareBracket][index] = depths[SquareBracket]++;
-						}
-							break;
-						case ']' : {
-							int index = rightCount[SquareBracket]++;
-							if (index == rightPositions[SquareBracket].length) {
-								System
-										.arraycopy(
-												rightPositions[SquareBracket],
-												0,
-												(rightPositions[SquareBracket] = new int[index * 2]),
-												0, index);
-								System
-										.arraycopy(
-												rightDepths[SquareBracket],
-												0,
-												(rightDepths[SquareBracket] = new int[index * 2]),
-												0, index);
-							}
-							rightPositions[SquareBracket][index] = scanner.startPosition;
-							rightDepths[SquareBracket][index] = --depths[SquareBracket];
-						}
-							break;
-						case '\'' : {
-							if (scanner.getNextChar('\\')) {
-								scanner.scanEscapeCharacter();
-							} else { // consume next character
-								scanner.unicodeAsBackSlash = false;
-								//									if (((scanner.currentCharacter =
-								// source[scanner.currentPosition++]) ==
-								// '\\') &&
-								// (source[scanner.currentPosition] ==
-								// 'u')) {
-								//										scanner.getNextUnicodeChar();
-								//									} else {
-								if (scanner.withoutUnicodePtr != 0) {
-									scanner.withoutUnicodeBuffer[++scanner.withoutUnicodePtr] = scanner.currentCharacter;
-								}
-								//									}
-							}
-							scanner.getNextChar('\'');
-							break;
-						}
-						case '"' :
-							// consume next character
-							scanner.unicodeAsBackSlash = false;
-							//							if (((scanner.currentCharacter =
-							// source[scanner.currentPosition++]) == '\\') &&
-							// (source[scanner.currentPosition] == 'u')) {
-							//								scanner.getNextUnicodeChar();
-							//							} else {
-							if (scanner.withoutUnicodePtr != 0) {
-								scanner.withoutUnicodeBuffer[++scanner.withoutUnicodePtr] = scanner.currentCharacter;
-							}
-							//							}
-							while (scanner.currentCharacter != '"') {
-								if (scanner.currentCharacter == '\r') {
-									if (source[scanner.currentPosition] == '\n')
-										scanner.currentPosition++;
-									break; // the string cannot go further that
-									// the line
-								}
-								if (scanner.currentCharacter == '\n') {
-									break; // the string cannot go further that
-									// the line
-								}
-								if (scanner.currentCharacter == '\\') {
-									scanner.scanEscapeCharacter();
-								}
-								// consume next character
-								scanner.unicodeAsBackSlash = false;
-								//								if (((scanner.currentCharacter =
-								// source[scanner.currentPosition++]) == '\\')
-								// && (source[scanner.currentPosition] == 'u'))
-								// {
-								//									scanner.getNextUnicodeChar();
-								//								} else {
-								if (scanner.withoutUnicodePtr != 0) {
-									scanner.withoutUnicodeBuffer[++scanner.withoutUnicodePtr] = scanner.currentCharacter;
-								}
-								//								}
-							}
-							break;
-						case '/' : {
-							int test;
-							if ((test = scanner.getNextChar('/', '*')) == 0) { //line
-								// comment
-								//get the next char
-								if (((scanner.currentCharacter = source[scanner.currentPosition++]) == '\\')
-										&& (source[scanner.currentPosition] == 'u')) {
-									//-------------unicode traitement
-									// ------------
-									int c1 = 0, c2 = 0, c3 = 0, c4 = 0;
-									scanner.currentPosition++;
-									while (source[scanner.currentPosition] == 'u') {
-										scanner.currentPosition++;
-									}
-									if ((c1 = Character
-											.getNumericValue(source[scanner.currentPosition++])) > 15
-											|| c1 < 0
-											|| (c2 = Character
-													.getNumericValue(source[scanner.currentPosition++])) > 15
-											|| c2 < 0
-											|| (c3 = Character
-													.getNumericValue(source[scanner.currentPosition++])) > 15
-											|| c3 < 0
-											|| (c4 = Character
-													.getNumericValue(source[scanner.currentPosition++])) > 15
-											|| c4 < 0) { //error don't
-										// care of the
-										// value
-										scanner.currentCharacter = 'A';
-									} //something different from \n and \r
-									else {
-										scanner.currentCharacter = (char) (((c1 * 16 + c2) * 16 + c3) * 16 + c4);
-									}
-								}
-								while (scanner.currentCharacter != '\r'
-										&& scanner.currentCharacter != '\n') {
-									//get the next char
-									scanner.startPosition = scanner.currentPosition;
-									if (((scanner.currentCharacter = source[scanner.currentPosition++]) == '\\')
-											&& (source[scanner.currentPosition] == 'u')) {
-										//-------------unicode traitement
-										// ------------
-										int c1 = 0, c2 = 0, c3 = 0, c4 = 0;
-										scanner.currentPosition++;
-										while (source[scanner.currentPosition] == 'u') {
-											scanner.currentPosition++;
-										}
-										if ((c1 = Character
-												.getNumericValue(source[scanner.currentPosition++])) > 15
-												|| c1 < 0
-												|| (c2 = Character
-														.getNumericValue(source[scanner.currentPosition++])) > 15
-												|| c2 < 0
-												|| (c3 = Character
-														.getNumericValue(source[scanner.currentPosition++])) > 15
-												|| c3 < 0
-												|| (c4 = Character
-														.getNumericValue(source[scanner.currentPosition++])) > 15
-												|| c4 < 0) { //error don't
-											// care of the
-											// value
-											scanner.currentCharacter = 'A';
-										} //something different from \n
-										// and \r
-										else {
-											scanner.currentCharacter = (char) (((c1 * 16 + c2) * 16 + c3) * 16 + c4);
-										}
-									}
-								}
-								if (scanner.recordLineSeparator
-										&& ((scanner.currentCharacter == '\r') || (scanner.currentCharacter == '\n'))) {
-									if (scanner.lineEnds[scanner.linePtr] < scanner.startPosition) {
-										// only record line positions we
-										// have not recorded yet
-										scanner.pushLineSeparator();
-										if (this.scanner.taskTags != null) {
-											this.scanner
-													.checkTaskTag(
-															this.scanner
-																	.getCurrentTokenStartPosition(),
-															this.scanner
-																	.getCurrentTokenEndPosition());
-										}
-									}
-								}
-								break;
-							}
-							if (test > 0) { //traditional and annotation
-								// comment
-								boolean star = false;
-								// consume next character
-								scanner.unicodeAsBackSlash = false;
-								//									if (((scanner.currentCharacter =
-								// source[scanner.currentPosition++]) ==
-								// '\\') &&
-								// (source[scanner.currentPosition] ==
-								// 'u')) {
-								//										scanner.getNextUnicodeChar();
-								//									} else {
-								if (scanner.withoutUnicodePtr != 0) {
-									scanner.withoutUnicodeBuffer[++scanner.withoutUnicodePtr] = scanner.currentCharacter;
-								}
-								//									}
-								if (scanner.currentCharacter == '*') {
-									star = true;
-								}
-								//get the next char
-								if (((scanner.currentCharacter = source[scanner.currentPosition++]) == '\\')
-										&& (source[scanner.currentPosition] == 'u')) {
-									//-------------unicode traitement
-									// ------------
-									int c1 = 0, c2 = 0, c3 = 0, c4 = 0;
-									scanner.currentPosition++;
-									while (source[scanner.currentPosition] == 'u') {
-										scanner.currentPosition++;
-									}
-									if ((c1 = Character
-											.getNumericValue(source[scanner.currentPosition++])) > 15
-											|| c1 < 0
-											|| (c2 = Character
-													.getNumericValue(source[scanner.currentPosition++])) > 15
-											|| c2 < 0
-											|| (c3 = Character
-													.getNumericValue(source[scanner.currentPosition++])) > 15
-											|| c3 < 0
-											|| (c4 = Character
-													.getNumericValue(source[scanner.currentPosition++])) > 15
-											|| c4 < 0) { //error don't
-										// care of the
-										// value
-										scanner.currentCharacter = 'A';
-									} //something different from * and /
-									else {
-										scanner.currentCharacter = (char) (((c1 * 16 + c2) * 16 + c3) * 16 + c4);
-									}
-								}
-								//loop until end of comment */
-								while ((scanner.currentCharacter != '/')
-										|| (!star)) {
-									star = scanner.currentCharacter == '*';
-									//get next char
-									if (((scanner.currentCharacter = source[scanner.currentPosition++]) == '\\')
-											&& (source[scanner.currentPosition] == 'u')) {
-										//-------------unicode traitement
-										// ------------
-										int c1 = 0, c2 = 0, c3 = 0, c4 = 0;
-										scanner.currentPosition++;
-										while (source[scanner.currentPosition] == 'u') {
-											scanner.currentPosition++;
-										}
-										if ((c1 = Character
-												.getNumericValue(source[scanner.currentPosition++])) > 15
-												|| c1 < 0
-												|| (c2 = Character
-														.getNumericValue(source[scanner.currentPosition++])) > 15
-												|| c2 < 0
-												|| (c3 = Character
-														.getNumericValue(source[scanner.currentPosition++])) > 15
-												|| c3 < 0
-												|| (c4 = Character
-														.getNumericValue(source[scanner.currentPosition++])) > 15
-												|| c4 < 0) { //error don't
-											// care of the
-											// value
-											scanner.currentCharacter = 'A';
-										} //something different from * and
-										// /
-										else {
-											scanner.currentCharacter = (char) (((c1 * 16 + c2) * 16 + c3) * 16 + c4);
-										}
-									}
-								}
-								if (this.scanner.taskTags != null) {
-									this.scanner
-											.checkTaskTag(
-													this.scanner
-															.getCurrentTokenStartPosition(),
-													this.scanner
-															.getCurrentTokenEndPosition());
-								}
-								break;
-							}
-							break;
-						}
-						default :
-							if (Scanner
-									.isPHPIdentifierStart(scanner.currentCharacter)) {
-								scanner.scanIdentifierOrKeyword(false);
-								break;
-							}
-							if (Character.isDigit(scanner.currentCharacter)) {
-								scanner.scanNumber(false);
-								break;
-							}
-					}
-					//-----------------end switch while
-					// try--------------------
-				} catch (IndexOutOfBoundsException e) {
-					break; // read until EOF
-				} catch (InvalidInputException e) {
-					return false; // no clue
-				}
-			}
-			if (scanner.recordLineSeparator) {
-				//				compilationUnit.compilationResult.lineSeparatorPositions =
-				// scanner.getLineEnds();
-			}
-			// check placement anomalies against other kinds of brackets
-			for (int kind = 0; kind < BracketKinds; kind++) {
-				for (int leftIndex = leftCount[kind] - 1; leftIndex >= 0; leftIndex--) {
-					int start = leftPositions[kind][leftIndex]; // deepest
-					// first
-					// find matching closing bracket
-					int depth = leftDepths[kind][leftIndex];
-					int end = -1;
-					for (int i = 0; i < rightCount[kind]; i++) {
-						int pos = rightPositions[kind][i];
-						// want matching bracket further in source with same
-						// depth
-						if ((pos > start) && (depth == rightDepths[kind][i])) {
-							end = pos;
-							break;
-						}
-					}
-					if (end < 0) { // did not find a good closing match
-						problemReporter.unmatchedBracket(start,
-								referenceContext,
-								compilationUnit.compilationResult);
-						return true;
-					}
-					// check if even number of opening/closing other brackets
-					// in between this pair of brackets
-					int balance = 0;
-					for (int otherKind = 0; (balance == 0)
-							&& (otherKind < BracketKinds); otherKind++) {
-						for (int i = 0; i < leftCount[otherKind]; i++) {
-							int pos = leftPositions[otherKind][i];
-							if ((pos > start) && (pos < end))
-								balance++;
-						}
-						for (int i = 0; i < rightCount[otherKind]; i++) {
-							int pos = rightPositions[otherKind][i];
-							if ((pos > start) && (pos < end))
-								balance--;
-						}
-						if (balance != 0) {
-							problemReporter.unmatchedBracket(start,
-									referenceContext,
-									compilationUnit.compilationResult); //bracket
-							// anomaly
-							return true;
-						}
-					}
-				}
-				// too many opening brackets ?
-				for (int i = rightCount[kind]; i < leftCount[kind]; i++) {
-					anomaliesDetected = true;
-					problemReporter
-							.unmatchedBracket(
-									leftPositions[kind][leftCount[kind] - i - 1],
-									referenceContext,
-									compilationUnit.compilationResult);
-				}
-				// too many closing brackets ?
-				for (int i = leftCount[kind]; i < rightCount[kind]; i++) {
-					anomaliesDetected = true;
-					problemReporter
-							.unmatchedBracket(rightPositions[kind][i],
-									referenceContext,
-									compilationUnit.compilationResult);
-				}
-				if (anomaliesDetected)
-					return true;
-			}
-			return anomaliesDetected;
-		} catch (ArrayStoreException e) { // jdk1.2.2 jit bug
-			return anomaliesDetected;
-		} catch (NullPointerException e) { // jdk1.2.2 jit bug
-			return anomaliesDetected;
-		}
-	}
-	protected void pushOnAstLengthStack(int pos) {
-		try {
-			astLengthStack[++astLengthPtr] = pos;
-		} catch (IndexOutOfBoundsException e) {
-			int oldStackLength = astLengthStack.length;
-			int[] oldPos = astLengthStack;
-			astLengthStack = new int[oldStackLength + StackIncrement];
-			System.arraycopy(oldPos, 0, astLengthStack, 0, oldStackLength);
-			astLengthStack[astLengthPtr] = pos;
-		}
-	}
-	protected void pushOnAstStack(AstNode node) {
-		/*
-		 * add a new obj on top of the ast stack
-		 */
-		try {
-			astStack[++astPtr] = node;
-		} catch (IndexOutOfBoundsException e) {
-			int oldStackLength = astStack.length;
-			AstNode[] oldStack = astStack;
-			astStack = new AstNode[oldStackLength + AstStackIncrement];
-			System.arraycopy(oldStack, 0, astStack, 0, oldStackLength);
-			astPtr = oldStackLength;
-			astStack[astPtr] = node;
-		}
-		try {
-			astLengthStack[++astLengthPtr] = 1;
-		} catch (IndexOutOfBoundsException e) {
-			int oldStackLength = astLengthStack.length;
-			int[] oldPos = astLengthStack;
-			astLengthStack = new int[oldStackLength + AstStackIncrement];
-			System.arraycopy(oldPos, 0, astLengthStack, 0, oldStackLength);
-			astLengthStack[astLengthPtr] = 1;
-		}
-	}
+    if (currentElement != null) {
+      currentElement.topElement().updateParseTree();
+      if (VERBOSE_RECOVERY) {
+        System.out.print(Util.bind("parser.syntaxRecovery")); //$NON-NLS-1$
+        System.out.println("--------------------------"); //$NON-NLS-1$
+        System.out.println(compilationUnit);
+        System.out.println("----------------------------------"); //$NON-NLS-1$
+      }
+    } else {
+      if (diet & VERBOSE_RECOVERY) {
+        System.out.print(Util.bind("parser.regularParse")); //$NON-NLS-1$
+        System.out.println("--------------------------"); //$NON-NLS-1$
+        System.out.println(compilationUnit);
+        System.out.println("----------------------------------"); //$NON-NLS-1$
+      }
+    }
+    if (scanner.recordLineSeparator) {
+      compilationUnit.compilationResult.lineSeparatorPositions = scanner.getLineEnds();
+    }
+    if (scanner.taskTags != null) {
+      for (int i = 0; i < scanner.foundTaskCount; i++) {
+        problemReporter().task(new String(scanner.foundTaskTags[i]), new String(scanner.foundTaskMessages[i]),
+            scanner.foundTaskPriorities[i] == null ? null : new String(scanner.foundTaskPriorities[i]),
+            scanner.foundTaskPositions[i][0], scanner.foundTaskPositions[i][1]);
+      }
+    }
+    compilationUnit.imports = new ImportReference[includesList.size()];
+    for (int i = 0; i < includesList.size(); i++) {
+      compilationUnit.imports[i] = (ImportReference) includesList.get(i);
+    }
+    return compilationUnit;
+  }
+  //  public PHPOutlineInfo parseInfo(Object parent, String s) {
+  //    PHPOutlineInfo outlineInfo = new PHPOutlineInfo(parent);
+  //    // Stack stack = new Stack();
+  //    // stack.push(outlineInfo.getDeclarations());
+  //    this.str = s;
+  //    this.token = TokenNameEOF;
+  //    // this.chIndx = 0;
+  //    // this.rowCount = 1;
+  //    // this.columnCount = 0;
+  //    this.phpEnd = false;
+  //    this.phpMode = false;
+  //    scanner.setSource(s.toCharArray());
+  //    scanner.setPHPMode(false);
+  //    
+  //    getNextToken();
+  //    parseDeclarations(outlineInfo, outlineInfo.getDeclarations(), false);
+  //    
+  //    return outlineInfo;
+  //  }
+  private boolean isVariable() {
+    return token == TokenNameVariable; //  || token == TokenNamethis;
+  }
+  //  private void parseDeclarations(PHPOutlineInfo outlineInfo,
+  //      OutlineableWithChildren current, boolean goBack) {
+  //    char[] ident;
+  //    // PHPClassDeclaration current = (PHPClassDeclaration) stack.peek();
+  //    PHPSegmentWithChildren temp;
+  //    int counter = 0;
+  //    IPreferenceStore store =
+  // PHPeclipsePlugin.getDefault().getPreferenceStore();
+  //    try {
+  //      while (token != TokenNameEOF && token != TokenNameERROR) {
+  //        if (token == TokenNameVariable) {
+  //          ident = scanner.getCurrentIdentifierSource();
+  //          outlineInfo.addVariable(new String(ident));
+  //          getNextToken();
+  //        } else if (token == TokenNamevar) {
+  //          getNextToken();
+  //          if (token == TokenNameVariable
+  //              && store.getBoolean(PHPeclipsePlugin.PHP_OUTLINE_VAR)) {
+  //            ident = scanner.getCurrentIdentifierSource();
+  //            //substring(1) added because PHPVarDeclaration doesn't
+  //            // need the $ anymore
+  //            String variableName = new String(ident).substring(1);
+  //            outlineInfo.addVariable(variableName);
+  //            getNextToken();
+  //            if (token != TokenNameSEMICOLON) {
+  //              getNextToken();
+  //              ident = scanner.getCurrentTokenSource();
+  //              if (token > TokenNameKEYWORD) {
+  //                current.add(new PHPVarDeclaration(current, variableName,
+  //                // chIndx - ident.length,
+  //                    scanner.getCurrentTokenStartPosition(), new String(ident)));
+  //              } else {
+  //                switch (token) {
+  //                  case TokenNameVariable :
+  //                  case TokenNamethis :
+  //                    current.add(new PHPVarDeclaration(current, variableName,
+  //                    // chIndx -
+  //                        // ident.length,
+  //                        scanner.getCurrentTokenStartPosition(), new String(
+  //                            ident)));
+  //                    break;
+  //                  case TokenNameIdentifier :
+  //                    current.add(new PHPVarDeclaration(current, variableName,
+  //                    // chIndx -
+  //                        // ident.length,
+  //                        scanner.getCurrentTokenStartPosition(), new String(
+  //                            ident)));
+  //                    break;
+  //                  case TokenNameDoubleLiteral :
+  //                    current.add(new PHPVarDeclaration(current, variableName
+  //                        + doubleNumber,
+  //                    // chIndx -
+  //                        // ident.length,
+  //                        scanner.getCurrentTokenStartPosition(), new String(
+  //                            ident)));
+  //                    break;
+  //                  case TokenNameIntegerLiteral :
+  //                    current.add(new PHPVarDeclaration(current, variableName,
+  //                    // chIndx -
+  //                        // ident.length,
+  //                        scanner.getCurrentTokenStartPosition(), new String(
+  //                            ident)));
+  //                    break;
+  //                  case TokenNameStringInterpolated :
+  //                  case TokenNameStringLiteral :
+  //                    current.add(new PHPVarDeclaration(current, variableName,
+  //                    // chIndx -
+  //                        // ident.length,
+  //                        scanner.getCurrentTokenStartPosition(), new String(
+  //                            ident)));
+  //                    break;
+  //                  case TokenNameStringConstant :
+  //                    current.add(new PHPVarDeclaration(current, variableName,
+  //                    // chIndx -
+  //                        // ident.length,
+  //                        scanner.getCurrentTokenStartPosition(), new String(
+  //                            ident)));
+  //                    break;
+  //                  default :
+  //                    current.add(new PHPVarDeclaration(current, variableName,
+  //                    // chIndx -
+  //                        // ident.length
+  //                        scanner.getCurrentTokenStartPosition()));
+  //                    break;
+  //                }
+  //              }
+  //            } else {
+  //              ident = scanner.getCurrentIdentifierSource();
+  //              current.add(new PHPVarDeclaration(current, variableName,
+  //              // chIndx - ident.length
+  //                  scanner.getCurrentTokenStartPosition()));
+  //            }
+  //          }
+  //        } else if (token == TokenNamefunction) {
+  //          getNextToken();
+  //          if (token == TokenNameAND) {
+  //            getNextToken();
+  //          }
+  //          if (token == TokenNameIdentifier
+  //              && store.getBoolean(PHPeclipsePlugin.PHP_OUTLINE_FUNC)) {
+  //            ident = scanner.getCurrentIdentifierSource();
+  //            outlineInfo.addVariable(new String(ident));
+  //            temp = new PHPFunctionDeclaration(current, new String(ident),
+  //            // chIndx - ident.length
+  //                scanner.getCurrentTokenStartPosition());
+  //            current.add(temp);
+  //            getNextToken();
+  //            parseDeclarations(outlineInfo, temp, true);
+  //          }
+  //        } else if (token == TokenNameclass) {
+  //          getNextToken();
+  //          if (token == TokenNameIdentifier
+  //              && store.getBoolean(PHPeclipsePlugin.PHP_OUTLINE_CLASS)) {
+  //            ident = scanner.getCurrentIdentifierSource();
+  //            outlineInfo.addVariable(new String(ident));
+  //            temp = new PHPClassDeclaration(current, new String(ident),
+  //            // chIndx - ident.len
+  //                scanner.getCurrentTokenStartPosition());
+  //            current.add(temp);
+  //            // stack.push(temp);
+  //            getNextToken();
+  //            //skip tokens for classname, extends and others until
+  //            // we have the opening '{'
+  //            while (token != TokenNameLBRACE && token != TokenNameEOF
+  //                && token != TokenNameERROR) {
+  //              getNextToken();
+  //            }
+  //            parseDeclarations(outlineInfo, temp, true);
+  //            // stack.pop();
+  //          }
+  //        } else if ((token == TokenNameLBRACE)
+  //            || (token == TokenNameDOLLAR_LBRACE)) {
+  //          getNextToken();
+  //          counter++;
+  //        } else if (token == TokenNameRBRACE) {
+  //          getNextToken();
+  //          --counter;
+  //          if (counter == 0 && goBack) {
+  //            return;
+  //          }
+  //        } else if (token == TokenNamerequire || token == TokenNamerequire_once
+  //            || token == TokenNameinclude || token == TokenNameinclude_once) {
+  //          ident = scanner.getCurrentTokenSource();
+  //          getNextToken();
+  //          int startPosition = scanner.getCurrentTokenStartPosition();
+  //          expr();
+  //          char[] expr = scanner.getCurrentTokenSource(startPosition);
+  //          outlineInfo.addVariable(new String(ident));
+  //          current.add(new PHPReqIncDeclaration(current, new String(ident),
+  //          // chIndx - ident.length,
+  //              startPosition, new String(expr)));
+  //          getNextToken();
+  //        } else {
+  //          getNextToken();
+  //        }
+  //      }
+  //    } catch (SyntaxError sytaxErr) {
+  //      // try {
+  //      // // setMarker(sytaxErr.getMessage(), sytaxErr.getLine(), ERROR);
+  //      // setMarker(sytaxErr.getMessage(),
+  //      // scanner.getCurrentTokenStartPosition(),
+  //      // scanner.getCurrentTokenEndPosition(), ERROR);
+  //      // } catch (CoreException e) {
+  //      // }
+  //    }
+  //  }
+  private void statementList() {
+    do {
+      statement(TokenNameEOF);
+      if ((token == TokenNameRBRACE) || (token == TokenNamecase) || (token == TokenNamedefault) || (token == TokenNameelse)
+          || (token == TokenNameelseif) || (token == TokenNameendif) || (token == TokenNameendfor)
+          || (token == TokenNameendforeach) || (token == TokenNameendwhile) || (token == TokenNameendswitch)
+          || (token == TokenNameEOF) || (token == TokenNameERROR)) {
+        return;
+      }
+    } while (true);
+  }
+  private void functionBody(MethodDeclaration methodDecl) {
+    // '{' [statement-list] '}'
+    if (token == TokenNameLBRACE) {
+      getNextToken();
+    } else {
+      throwSyntaxError("'{' expected in compound-statement.");
+    }
+    if (token != TokenNameRBRACE) {
+      statementList();
+    }
+    if (token == TokenNameRBRACE) {
+      methodDecl.declarationSourceEnd = scanner.getCurrentTokenEndPosition();
+      getNextToken();
+    } else {
+      throwSyntaxError("'}' expected in compound-statement.");
+    }
+  }
+  private void statement(int previousToken) {
+    //   if (token > TokenNameKEYWORD && token != TokenNamelist && token !=
+    // TokenNamenew) {
+    //  char[] ident = scanner.getCurrentIdentifierSource();
+    //  String keyword = new String(ident);
+    //    if (token == TokenNameAT) {
+    //      getNextToken();
+    //      if (token != TokenNamerequire && token != TokenNamerequire_once
+    //          && token != TokenNameinclude && token != TokenNameinclude_once
+    //          && token != TokenNameIdentifier && token != TokenNameVariable
+    //          && token != TokenNameStringInterpolated) {
+    //        throwSyntaxError("identifier expected after '@'.");
+    //      }
+    //    }
+    //    if (token == TokenNameinclude || token == TokenNameinclude_once) {
+    //      getNextToken();
+    //      if (token == TokenNameLPAREN) {
+    //        expr();
+    //        if (token == TokenNameSEMICOLON) {
+    //          getNextToken();
+    //        } else {
+    //          if (previousToken != TokenNameAT && token != TokenNameStopPHP) {
+    //            throwSyntaxError("';' expected after 'include' or 'include_once'.");
+    //          }
+    //          // getNextToken();
+    //        }
+    //      } else {
+    //        concatenationExpression();
+    //      }
+    //      return;
+    //    } else if (token == TokenNamerequire || token ==
+    // TokenNamerequire_once)
+    // {
+    //      getNextToken();
+    //      //constant();
+    //      if (token == TokenNameLPAREN) {
+    //        expr();
+    //        if (token == TokenNameSEMICOLON) {
+    //          getNextToken();
+    //        } else {
+    //          if (previousToken != TokenNameAT && token != TokenNameStopPHP) {
+    //            throwSyntaxError("';' expected after 'require' or 'require_once'.");
+    //          }
+    //          // getNextToken();
+    //        }
+    //      } else {
+    //        concatenationExpression();
+    //      }
+    //      return;
+    //    } else
+    if (token == TokenNameif) {
+      getNextToken();
+      if (token == TokenNameLPAREN) {
+        getNextToken();
+      } else {
+        throwSyntaxError("'(' expected after 'if' keyword.");
+      }
+      expr();
+      if (token == TokenNameRPAREN) {
+        getNextToken();
+      } else {
+        throwSyntaxError("')' expected after 'if' condition.");
+      }
+      ifStatement();
+      return;
+    } else if (token == TokenNameswitch) {
+      getNextToken();
+      if (token == TokenNameLPAREN) {
+        getNextToken();
+      } else {
+        throwSyntaxError("'(' expected after 'switch' keyword.");
+      }
+      expr();
+      if (token == TokenNameRPAREN) {
+        getNextToken();
+      } else {
+        throwSyntaxError("')' expected after 'switch' condition.");
+      }
+      switchStatement();
+      return;
+    } else if (token == TokenNamefor) {
+      getNextToken();
+      if (token == TokenNameLPAREN) {
+        getNextToken();
+      } else {
+        throwSyntaxError("'(' expected after 'for' keyword.");
+      }
+      if (token == TokenNameSEMICOLON) {
+        getNextToken();
+      } else {
+        expressionList();
+        if (token == TokenNameSEMICOLON) {
+          getNextToken();
+        } else {
+          throwSyntaxError("';' expected after 'for'.");
+        }
+      }
+      if (token == TokenNameSEMICOLON) {
+        getNextToken();
+      } else {
+        expressionList();
+        if (token == TokenNameSEMICOLON) {
+          getNextToken();
+        } else {
+          throwSyntaxError("';' expected after 'for'.");
+        }
+      }
+      if (token == TokenNameRPAREN) {
+        getNextToken();
+      } else {
+        expressionList();
+        if (token == TokenNameRPAREN) {
+          getNextToken();
+        } else {
+          throwSyntaxError("')' expected after 'for'.");
+        }
+      }
+      forStatement();
+      return;
+    } else if (token == TokenNamewhile) {
+      getNextToken();
+      if (token == TokenNameLPAREN) {
+        getNextToken();
+      } else {
+        throwSyntaxError("'(' expected after 'while' keyword.");
+      }
+      expr();
+      if (token == TokenNameRPAREN) {
+        getNextToken();
+      } else {
+        throwSyntaxError("')' expected after 'while' condition.");
+      }
+      whileStatement();
+      return;
+    } else if (token == TokenNamedo) {
+      getNextToken();
+      if (token == TokenNameLBRACE) {
+        getNextToken();
+        if (token != TokenNameRBRACE) {
+          statementList();
+        }
+        if (token == TokenNameRBRACE) {
+          getNextToken();
+        } else {
+          throwSyntaxError("'}' expected after 'do' keyword.");
+        }
+      } else {
+        statement(TokenNameEOF);
+      }
+      if (token == TokenNamewhile) {
+        getNextToken();
+        if (token == TokenNameLPAREN) {
+          getNextToken();
+        } else {
+          throwSyntaxError("'(' expected after 'while' keyword.");
+        }
+        expr();
+        if (token == TokenNameRPAREN) {
+          getNextToken();
+        } else {
+          throwSyntaxError("')' expected after 'while' condition.");
+        }
+      } else {
+        throwSyntaxError("'while' expected after 'do' keyword.");
+      }
+      if (token == TokenNameSEMICOLON) {
+        getNextToken();
+      } else {
+        if (token != TokenNameINLINE_HTML) {
+          throwSyntaxError("';' expected after do-while statement.");
+        }
+        getNextToken();
+      }
+      return;
+    } else if (token == TokenNameforeach) {
+      getNextToken();
+      if (token == TokenNameLPAREN) {
+        getNextToken();
+      } else {
+        throwSyntaxError("'(' expected after 'foreach' keyword.");
+      }
+      expr();
+      if (token == TokenNameas) {
+        getNextToken();
+      } else {
+        throwSyntaxError("'as' expected after 'foreach' exxpression.");
+      }
+      //      variable();
+      foreach_variable();
+      foreach_optional_arg();
+      if (token == TokenNameEQUAL_GREATER) {
+        getNextToken();
+        variable();
+      }
+      if (token == TokenNameRPAREN) {
+        getNextToken();
+      } else {
+        throwSyntaxError("')' expected after 'foreach' expression.");
+      }
+      foreachStatement();
+      return;
+    } else if (token == TokenNamecontinue || token == TokenNamebreak || token == TokenNamereturn) {
+      getNextToken();
+      if (token != TokenNameSEMICOLON) {
+        expr();
+      }
+      if (token == TokenNameSEMICOLON) {
+        getNextToken();
+      } else {
+        if (token != TokenNameINLINE_HTML) {
+          throwSyntaxError("';' expected after 'continue', 'break' or 'return'.");
+        }
+        getNextToken();
+      }
+      return;
+    } else if (token == TokenNameecho) {
+      getNextToken();
+      expressionList();
+      if (token == TokenNameSEMICOLON) {
+        getNextToken();
+      } else {
+        if (token != TokenNameINLINE_HTML) {
+          throwSyntaxError("';' expected after 'echo' statement.");
+        }
+        getNextToken();
+      }
+      return;
+    } else if (token == TokenNameINLINE_HTML) {
+      getNextToken();
+      return;
+      //    } else if (token == TokenNameprint) {
+      //      getNextToken();
+      //      expression();
+      //      if (token == TokenNameSEMICOLON) {
+      //        getNextToken();
+      //      } else {
+      //        if (token != TokenNameStopPHP) {
+      //          throwSyntaxError("';' expected after 'print' statement.");
+      //        }
+      //        getNextToken();
+      //      }
+      //      return;
+    } else if (token == TokenNameglobal) {
+      getNextToken();
+      global_var_list();
+      if (token == TokenNameSEMICOLON) {
+        getNextToken();
+      } else {
+        if (token != TokenNameINLINE_HTML) {
+          throwSyntaxError("';' expected after 'global' statement.");
+        }
+        getNextToken();
+      }
+      return;
+    } else if (token == TokenNamestatic) {
+      getNextToken();
+      static_var_list();
+      if (token == TokenNameSEMICOLON) {
+        getNextToken();
+      } else {
+        if (token != TokenNameINLINE_HTML) {
+          throwSyntaxError("';' expected after 'static' statement.");
+        }
+        getNextToken();
+      }
+      return;
+    } else if (token == TokenNameunset) {
+      getNextToken();
+      if (token == TokenNameLPAREN) {
+        getNextToken();
+      } else {
+        throwSyntaxError("'(' expected after 'unset' statement.");
+      }
+      unset_variables();
+      if (token == TokenNameRPAREN) {
+        getNextToken();
+      } else {
+        throwSyntaxError("')' expected after 'unset' statement.");
+      }
+      if (token == TokenNameSEMICOLON) {
+        getNextToken();
+      } else {
+        if (token != TokenNameINLINE_HTML) {
+          throwSyntaxError("';' expected after 'unset' statement.");
+        }
+        getNextToken();
+      }
+      return;
+    } else if (token == TokenNamefunction) {
+      MethodDeclaration methodDecl = new MethodDeclaration(this.compilationUnit.compilationResult);
+      methodDecl.declarationSourceStart = scanner.getCurrentTokenStartPosition();
+      getNextToken();
+      functionDefinition(methodDecl);
+      return;
+    } else if (token == TokenNametry) {
+      getNextToken();
+      if (token != TokenNameLBRACE) {
+        throwSyntaxError("'{' expected in 'try' statement.");
+      }
+      getNextToken();
+      statementList();
+      if (token != TokenNameRBRACE) {
+        throwSyntaxError("'}' expected in 'try' statement.");
+      }
+      getNextToken();
+      return;
+    } else if (token == TokenNamecatch) {
+      getNextToken();
+      if (token != TokenNameLPAREN) {
+        throwSyntaxError("'(' expected in 'catch' statement.");
+      }
+      getNextToken();
+      fully_qualified_class_name();
+      if (token != TokenNameVariable) {
+        throwSyntaxError("Variable expected in 'catch' statement.");
+      }
+      getNextToken();
+      if (token != TokenNameRPAREN) {
+        throwSyntaxError("')' expected in 'catch' statement.");
+      }
+      getNextToken();
+      if (token != TokenNameLBRACE) {
+        throwSyntaxError("'{' expected in 'catch' statement.");
+      }
+      getNextToken();
+      if (token != TokenNameRBRACE) {
+        statementList();
+        if (token != TokenNameRBRACE) {
+          throwSyntaxError("'}' expected in 'catch' statement.");
+        }
+      }
+      getNextToken();
+      additional_catches();
+      return;
+    } else if (token == TokenNamethrow) {
+      getNextToken();
+      expr();
+      if (token == TokenNameSEMICOLON) {
+        getNextToken();
+      } else {
+        throwSyntaxError("';' expected after 'throw' exxpression.");
+      }
+      return;
+    } else if (token == TokenNamefinal || token == TokenNameabstract || token == TokenNameclass || token == TokenNameinterface) {
+      TypeDeclaration typeDecl = new TypeDeclaration(this.compilationUnit.compilationResult);
+      typeDecl.declarationSourceStart = scanner.getCurrentTokenStartPosition();
+      // default super class
+      typeDecl.superclass = new SingleTypeReference(TypeConstants.OBJECT, 0);
+      compilationUnit.types.add(typeDecl);
+      try {
+        pushOnAstStack(typeDecl);
+        unticked_class_declaration_statement(typeDecl);
+        //        classBody(typeDecl);
+      } finally {
+        astPtr--;
+        astLengthPtr--;
+      }
+      return;
+      //      } else {
+      //        throwSyntaxError("Unexpected keyword '" + keyword + "'");
+    } else if (token == TokenNameLBRACE) {
+      getNextToken();
+      if (token != TokenNameRBRACE) {
+        statementList();
+      }
+      if (token == TokenNameRBRACE) {
+        getNextToken();
+        return;
+      } else {
+        throwSyntaxError("'}' expected.");
+      }
+    } else {
+      if (token != TokenNameSEMICOLON) {
+        expr();
+      }
+      if (token == TokenNameSEMICOLON) {
+        getNextToken();
+        return;
+      } else {
+        if (token != TokenNameINLINE_HTML && token != TokenNameEOF) {
+          throwSyntaxError("';' expected after expression (Found token: " + scanner.toStringAction(token) + ")");
+        }
+        getNextToken();
+      }
+    }
+  }
+  private void additional_catches() {
+    while (token == TokenNamecatch) {
+      getNextToken();
+      if (token != TokenNameLPAREN) {
+        throwSyntaxError("'(' expected in 'catch' statement.");
+      }
+      getNextToken();
+      fully_qualified_class_name();
+      if (token != TokenNameVariable) {
+        throwSyntaxError("Variable expected in 'catch' statement.");
+      }
+      getNextToken();
+      if (token != TokenNameRPAREN) {
+        throwSyntaxError("')' expected in 'catch' statement.");
+      }
+      getNextToken();
+      if (token != TokenNameLBRACE) {
+        throwSyntaxError("'{' expected in 'catch' statement.");
+      }
+      getNextToken();
+      statementList();
+      if (token != TokenNameRBRACE) {
+        throwSyntaxError("'}' expected in 'catch' statement.");
+      }
+      getNextToken();
+    }
+  }
+  private void foreach_variable() {
+    //	w_variable
+    //| '&' w_variable
+    if (token == TokenNameAND) {
+      getNextToken();
+    }
+    w_variable();
+  }
+  private void foreach_optional_arg() {
+    //	/* empty */
+    //| T_DOUBLE_ARROW foreach_variable
+    if (token == TokenNameEQUAL_GREATER) {
+      getNextToken();
+      foreach_variable();
+    }
+  }
+  private void global_var_list() {
+    //  global_var_list:
+    //	global_var_list ',' global_var
+    //| global_var
+    while (true) {
+      global_var();
+      if (token != TokenNameCOMMA) {
+        break;
+      }
+      getNextToken();
+    }
+  }
+  private void global_var() {
+    //global_var:
+    //	T_VARIABLE
+    //| '$' r_variable
+    //| '$' '{' expr '}'
+    if (token == TokenNameVariable) {
+      getNextToken();
+    } else if (token == TokenNameDOLLAR) {
+      getNextToken();
+      if (token == TokenNameLPAREN) {
+        getNextToken();
+        expr();
+        if (token != TokenNameLPAREN) {
+          throwSyntaxError("')' expected in global variable.");
+        }
+        getNextToken();
+      } else {
+        r_variable();
+      }
+    }
+  }
+  private void static_var_list() {
+    //static_var_list:
+    //	static_var_list ',' T_VARIABLE
+    //| static_var_list ',' T_VARIABLE '=' static_scalar
+    //| T_VARIABLE
+    //| T_VARIABLE '=' static_scalar
+    while (true) {
+      if (token == TokenNameVariable) {
+        getNextToken();
+        if (token == TokenNameEQUAL) {
+          getNextToken();
+          static_scalar();
+        }
+        if (token != TokenNameCOMMA) {
+          break;
+        }
+        getNextToken();
+      } else {
+        break;
+      }
+    }
+  }
+  private void unset_variables() {
+    //    unset_variables:
+    //    		unset_variable
+    //    	| unset_variables ',' unset_variable
+    //    unset_variable:
+    //    		variable
+    while (true) {
+      variable();
+      if (token != TokenNameCOMMA) {
+        break;
+      }
+      getNextToken();
+    }
+  }
+  private final void initializeModifiers() {
+    this.modifiers = 0;
+    this.modifiersSourceStart = -1;
+  }
+  private final void checkAndSetModifiers(int flag) {
+    this.modifiers |= flag;
+    if (this.modifiersSourceStart < 0)
+      this.modifiersSourceStart = this.scanner.startPosition;
+  }
+  private void unticked_class_declaration_statement(TypeDeclaration typeDecl) {
+    initializeModifiers();
+    if (token == TokenNameinterface) {
+      //      interface_entry T_STRING
+      //		interface_extends_list
+      //		'{' class_statement_list '}'
+      checkAndSetModifiers(AccInterface);
+      getNextToken();
+      typeDecl.modifiers = this.modifiers;
+      if (token == TokenNameIdentifier || token > TokenNameKEYWORD) {
+        typeDecl.sourceStart = scanner.getCurrentTokenStartPosition();
+        typeDecl.sourceEnd = scanner.getCurrentTokenEndPosition();
+        typeDecl.name = scanner.getCurrentIdentifierSource();
+        if (token > TokenNameKEYWORD) {
+          throwSyntaxError("Don't use a keyword for interface declaration [" + scanner.toStringAction(token) + "].",
+              typeDecl.sourceStart, typeDecl.sourceEnd);
+        }
+        getNextToken();
+        interface_extends_list();
+      } else {
+        typeDecl.sourceStart = scanner.getCurrentTokenStartPosition();
+        typeDecl.sourceEnd = scanner.getCurrentTokenEndPosition();
+        typeDecl.name = new char[]{' '};
+        throwSyntaxError("Interface name expected after keyword 'interface'.", typeDecl.sourceStart, typeDecl.sourceEnd);
+        return;
+      }
+    } else {
+      //      class_entry_type T_STRING extends_from
+      //		implements_list
+      //		'{' class_statement_list'}'
+      class_entry_type();
+      typeDecl.modifiers = this.modifiers;
+      //identifier
+      //identifier 'extends' identifier
+      if (token == TokenNameIdentifier || token > TokenNameKEYWORD) {
+        typeDecl.sourceStart = scanner.getCurrentTokenStartPosition();
+        typeDecl.sourceEnd = scanner.getCurrentTokenEndPosition();
+        typeDecl.name = scanner.getCurrentIdentifierSource();
+        if (token > TokenNameKEYWORD) {
+          throwSyntaxError("Don't use a keyword for class declaration [" + scanner.toStringAction(token) + "].",
+              typeDecl.sourceStart, typeDecl.sourceEnd);
+        }
+        getNextToken();
+        //    extends_from:
+        //		/* empty */
+        //	| T_EXTENDS fully_qualified_class_name
+        if (token == TokenNameextends) {
+          interface_extends_list();
+          //          getNextToken();
+          //          if (token != TokenNameIdentifier) {
+          //            throwSyntaxError("Class name expected after keyword
+          // 'extends'.",
+          //                scanner.getCurrentTokenStartPosition(), scanner
+          //                    .getCurrentTokenEndPosition());
+          //          }
+        }
+        implements_list();
+      } else {
+        typeDecl.sourceStart = scanner.getCurrentTokenStartPosition();
+        typeDecl.sourceEnd = scanner.getCurrentTokenEndPosition();
+        typeDecl.name = new char[]{' '};
+        throwSyntaxError("Class name expected after keyword 'class'.", typeDecl.sourceStart, typeDecl.sourceEnd);
+        return;
+      }
+    }
+    //  '{' class_statement_list '}'
+    if (token == TokenNameLBRACE) {
+      getNextToken();
+      if (token != TokenNameRBRACE) {
+        ArrayList list = new ArrayList();
+        class_statement_list(list);
+        typeDecl.fields = new FieldDeclaration[list.size()];
+        for (int i = 0; i < list.size(); i++) {
+          typeDecl.fields[i] = (FieldDeclaration) list.get(i);
+        }
+      }
+      if (token == TokenNameRBRACE) {
+        typeDecl.declarationSourceEnd = scanner.getCurrentTokenEndPosition();
+        getNextToken();
+      } else {
+        throwSyntaxError("'}' expected at end of class body.");
+      }
+    } else {
+      throwSyntaxError("'{' expected at start of class body.");
+    }
+  }
+  private void class_entry_type() {
+    //	T_CLASS
+    //	| T_ABSTRACT T_CLASS
+    //	| T_FINAL T_CLASS
+    if (token == TokenNameclass) {
+      getNextToken();
+    } else if (token == TokenNameabstract) {
+      checkAndSetModifiers(AccAbstract);
+      getNextToken();
+      if (token != TokenNameclass) {
+        throwSyntaxError("Keyword 'class' expected after keyword 'abstract'.");
+      }
+      getNextToken();
+    } else if (token == TokenNamefinal) {
+      checkAndSetModifiers(AccFinal);
+      getNextToken();
+      if (token != TokenNameclass) {
+        throwSyntaxError("Keyword 'class' expected after keyword 'final'.");
+      }
+      getNextToken();
+    } else {
+      throwSyntaxError("Keyword 'class' 'final' or 'abstract' expected");
+    }
+  }
+  private void interface_extends_list() {
+    //	/* empty */
+    //	| T_EXTENDS interface_list
+    if (token == TokenNameextends) {
+      getNextToken();
+      interface_list();
+    }
+  }
+  private void implements_list() {
+    //	/* empty */
+    //	| T_IMPLEMENTS interface_list
+    if (token == TokenNameimplements) {
+      getNextToken();
+      interface_list();
+    }
+  }
+  private void interface_list() {
+    //  interface_list:
+    //	fully_qualified_class_name
+    //| interface_list ',' fully_qualified_class_name
+    do {
+      if (token == TokenNameIdentifier) {
+        getNextToken();
+      } else {
+        throwSyntaxError("Interface name expected after keyword 'implements'.");
+      }
+      if (token != TokenNameCOMMA) {
+        return;
+      }
+      getNextToken();
+    } while (true);
+  }
+  //  private void classBody(TypeDeclaration typeDecl) {
+  //    //'{' [class-element-list] '}'
+  //    if (token == TokenNameLBRACE) {
+  //      getNextToken();
+  //      if (token != TokenNameRBRACE) {
+  //        class_statement_list();
+  //      }
+  //      if (token == TokenNameRBRACE) {
+  //        typeDecl.declarationSourceEnd = scanner.getCurrentTokenEndPosition();
+  //        getNextToken();
+  //      } else {
+  //        throwSyntaxError("'}' expected at end of class body.");
+  //      }
+  //    } else {
+  //      throwSyntaxError("'{' expected at start of class body.");
+  //    }
+  //  }
+  private void class_statement_list(ArrayList list) {
+    do {
+      class_statement(list);
+    } while (token == TokenNamepublic || token == TokenNameprotected || token == TokenNameprivate || token == TokenNamestatic
+        || token == TokenNameabstract || token == TokenNamefinal || token == TokenNamefunction || token == TokenNamevar
+        || token == TokenNameconst);
+  }
+  private void class_statement(ArrayList list) {
+    //    class_statement:
+    //		variable_modifiers class_variable_declaration ';'
+    //	| class_constant_declaration ';'
+    //	| method_modifiers T_FUNCTION is_reference T_STRING
+    //    '(' parameter_list ')' method_body
+    initializeModifiers();
+    int declarationSourceStart = scanner.getCurrentTokenStartPosition();
+    ;
+    if (token == TokenNamevar) {
+      checkAndSetModifiers(AccPublic);
+      problemReporter.phpVarDeprecatedWarning(scanner.getCurrentTokenStartPosition(), scanner.getCurrentTokenEndPosition(),
+          referenceContext, compilationUnit.compilationResult);
+      getNextToken();
+      class_variable_declaration(declarationSourceStart, list);
+    } else if (token == TokenNameconst) {
+      class_constant_declaration();
+      if (token != TokenNameSEMICOLON) {
+        throwSyntaxError("';' expected after class const declaration.");
+      }
+      getNextToken();
+    } else {
+      boolean hasModifiers = member_modifiers();
+      if (token == TokenNamefunction) {
+        if (!hasModifiers) {
+          checkAndSetModifiers(AccPublic);
+        }
+        MethodDeclaration methodDecl = new MethodDeclaration(this.compilationUnit.compilationResult);
+        methodDecl.declarationSourceStart = scanner.getCurrentTokenStartPosition();
+        methodDecl.modifiers = this.modifiers;
+        getNextToken();
+        functionDefinition(methodDecl);
+      } else {
+        if (!hasModifiers) {
+          throwSyntaxError("'public' 'private' or 'protected' modifier expected for field declarations.");
+        }
+        class_variable_declaration(declarationSourceStart, list);
+      }
+    }
+    //    if (token == TokenNamefunction) {
+    //      MethodDeclaration methodDecl = new MethodDeclaration(
+    //          this.compilationUnit.compilationResult);
+    //      methodDecl.declarationSourceStart = scanner
+    //          .getCurrentTokenStartPosition();
+    //      getNextToken();
+    //      functionDefinition(methodDecl);
+    //    } else if (token == TokenNamevar) {
+    //      getNextToken();
+    //      classProperty();
+    //    } else {
+    //      throwSyntaxError("'function' or 'var' expected.");
+    //    }
+  }
+  private void class_constant_declaration() {
+    //	class_constant_declaration ',' T_STRING '=' static_scalar
+    //	| T_CONST T_STRING '=' static_scalar
+    if (token != TokenNameconst) {
+      throwSyntaxError("'const' keyword expected in class declaration.");
+    } else {
+      getNextToken();
+    }
+    while (true) {
+      if (token != TokenNameIdentifier) {
+        throwSyntaxError("Identifier expected in class const declaration.");
+      }
+      getNextToken();
+      if (token != TokenNameEQUAL) {
+        throwSyntaxError("'=' expected in class const declaration.");
+      }
+      getNextToken();
+      static_scalar();
+      if (token != TokenNameCOMMA) {
+        break; // while(true)-loop
+      }
+      getNextToken();
+    }
+  }
+  //  private void variable_modifiers() {
+  //    // variable_modifiers:
+  //    // non_empty_member_modifiers
+  //    //| T_VAR
+  //    initializeModifiers();
+  //    if (token == TokenNamevar) {
+  //      checkAndSetModifiers(AccPublic);
+  //      reportSyntaxError(
+  //          "Keyword 'var' is deprecated. Please use 'public' 'private' or
+  // 'protected'
+  // modifier for field declarations.",
+  //          scanner.getCurrentTokenStartPosition(), scanner
+  //              .getCurrentTokenEndPosition());
+  //      getNextToken();
+  //    } else {
+  //      if (!member_modifiers()) {
+  //        throwSyntaxError("'public' 'private' or 'protected' modifier expected for
+  // field declarations.");
+  //      }
+  //    }
+  //  }
+  //  private void method_modifiers() {
+  //    //method_modifiers:
+  //    // /* empty */
+  //    //| non_empty_member_modifiers
+  //    initializeModifiers();
+  //    if (!member_modifiers()) {
+  //      checkAndSetModifiers(AccPublic);
+  //    }
+  //  }
+  private boolean member_modifiers() {
+    //	T_PUBLIC
+    //| T_PROTECTED
+    //| T_PRIVATE
+    //| T_STATIC
+    //| T_ABSTRACT
+    //| T_FINAL
+    boolean foundToken = false;
+    while (true) {
+      if (token == TokenNamepublic) {
+        checkAndSetModifiers(AccPublic);
+        getNextToken();
+        foundToken = true;
+      } else if (token == TokenNameprotected) {
+        checkAndSetModifiers(AccProtected);
+        getNextToken();
+        foundToken = true;
+      } else if (token == TokenNameprivate) {
+        checkAndSetModifiers(AccPrivate);
+        getNextToken();
+        foundToken = true;
+      } else if (token == TokenNamestatic) {
+        checkAndSetModifiers(AccStatic);
+        getNextToken();
+        foundToken = true;
+      } else if (token == TokenNameabstract) {
+        checkAndSetModifiers(AccAbstract);
+        getNextToken();
+        foundToken = true;
+      } else if (token == TokenNamefinal) {
+        checkAndSetModifiers(AccFinal);
+        getNextToken();
+        foundToken = true;
+      } else {
+        break;
+      }
+    }
+    return foundToken;
+  }
+  private void class_variable_declaration(int declarationSourceStart, ArrayList list) {
+    //    class_variable_declaration:
+    //		class_variable_declaration ',' T_VARIABLE
+    //	| class_variable_declaration ',' T_VARIABLE '=' static_scalar
+    //	| T_VARIABLE
+    //	| T_VARIABLE '=' static_scalar
+    do {
+      if (token == TokenNameVariable) {
+        FieldDeclaration fieldDeclaration = new FieldDeclaration(scanner.getCurrentIdentifierSource(), scanner
+            .getCurrentTokenStartPosition(), scanner.getCurrentTokenEndPosition());
+        fieldDeclaration.modifiers = this.modifiers;
+        fieldDeclaration.declarationSourceStart = declarationSourceStart;
+        fieldDeclaration.declarationSourceEnd = scanner.getCurrentTokenEndPosition();
+        fieldDeclaration.modifiersSourceStart = declarationSourceStart;
+        //        fieldDeclaration.type
+        list.add(fieldDeclaration);
+        getNextToken();
+        if (token == TokenNameEQUAL) {
+          getNextToken();
+          static_scalar();
+        }
+      } else {
+        //        if (token == TokenNamethis) {
+        //          throwSyntaxError("'$this' not allowed after keyword 'public'
+        // 'protected' 'private' 'var'.");
+        //        }
+        throwSyntaxError("Variable expected after keyword 'public' 'protected' 'private' 'var'.");
+      }
+      if (token != TokenNameCOMMA) {
+        break;
+      }
+      getNextToken();
+    } while (true);
+    if (token != TokenNameSEMICOLON) {
+      throwSyntaxError("';' expected after field declaration.");
+    }
+    getNextToken();
+  }
+  private void functionDefinition(MethodDeclaration methodDecl) {
+    boolean isAbstract = false;
+    if (astPtr == 0) {
+      compilationUnit.types.add(methodDecl);
+    } else {
+      AstNode node = astStack[astPtr];
+      if (node instanceof TypeDeclaration) {
+        TypeDeclaration typeDecl = ((TypeDeclaration) node);
+        if (typeDecl.methods == null) {
+          typeDecl.methods = new AbstractMethodDeclaration[]{methodDecl};
+        } else {
+          AbstractMethodDeclaration[] newMethods;
+          System.arraycopy(typeDecl.methods, 0, newMethods = new AbstractMethodDeclaration[typeDecl.methods.length + 1], 1,
+              typeDecl.methods.length);
+          newMethods[0] = methodDecl;
+          typeDecl.methods = newMethods;
+        }
+        if ((typeDecl.modifiers & AccAbstract) == AccAbstract) {
+          isAbstract = true;
+        } else if ((typeDecl.modifiers & AccInterface) == AccInterface) {
+          isAbstract = true;
+        }
+      }
+    }
+    functionDeclarator(methodDecl);
+    if (token == TokenNameSEMICOLON) {
+      if (!isAbstract) {
+        throwSyntaxError("Body declaration expected for method: " + new String(methodDecl.selector));
+      }
+      getNextToken();
+      return;
+    }
+    functionBody(methodDecl);
+  }
+  private void functionDeclarator(MethodDeclaration methodDecl) {
+    //identifier '(' [parameter-list] ')'
+    if (token == TokenNameAND) {
+      getNextToken();
+    }
+    if (token == TokenNameIdentifier) {
+      methodDecl.sourceStart = scanner.getCurrentTokenStartPosition();
+      methodDecl.sourceEnd = scanner.getCurrentTokenEndPosition();
+      methodDecl.selector = scanner.getCurrentIdentifierSource();
+      getNextToken();
+      if (token == TokenNameLPAREN) {
+        getNextToken();
+      } else {
+        throwSyntaxError("'(' expected in function declaration.");
+      }
+      if (token != TokenNameRPAREN) {
+        parameter_list();
+      }
+      if (token != TokenNameRPAREN) {
+        throwSyntaxError("')' expected in function declaration.");
+      } else {
+        methodDecl.bodyStart = scanner.getCurrentTokenEndPosition() + 1;
+        getNextToken();
+      }
+    } else {
+      if (token > TokenNameKEYWORD) {
+        throwSyntaxError("Don't use keyword for function declaration [" + token + "].");
+      }
+      throwSyntaxError("Function name expected after keyword 'function'.");
+    }
+  }
+  //
+  private void parameter_list() {
+    //	non_empty_parameter_list
+    //	| /* empty */
+    non_empty_parameter_list(true);
+  }
+  private void non_empty_parameter_list(boolean empty_allowed) {
+    //	optional_class_type T_VARIABLE
+    //	| optional_class_type '&' T_VARIABLE
+    //	| optional_class_type '&' T_VARIABLE '=' static_scalar
+    //	| optional_class_type T_VARIABLE '=' static_scalar
+    //	| non_empty_parameter_list ',' optional_class_type T_VARIABLE
+    //	| non_empty_parameter_list ',' optional_class_type '&' T_VARIABLE
+    //	| non_empty_parameter_list ',' optional_class_type '&' T_VARIABLE '='
+    // static_scalar
+    //	| non_empty_parameter_list ',' optional_class_type T_VARIABLE '='
+    // static_scalar
+    if (token == TokenNameIdentifier || token == TokenNameVariable || token == TokenNameAND) {
+      while (true) {
+        if (token == TokenNameIdentifier) {
+          getNextToken();
+        }
+        if (token == TokenNameAND) {
+          getNextToken();
+        }
+        if (token == TokenNameVariable) {
+          getNextToken();
+          if (token == TokenNameEQUAL) {
+            getNextToken();
+            static_scalar();
+          }
+        } else {
+          throwSyntaxError("Variable expected in parameter list.");
+        }
+        if (token != TokenNameCOMMA) {
+          break;
+        }
+        getNextToken();
+      }
+      return;
+    }
+    if (!empty_allowed) {
+      throwSyntaxError("Identifier expected in parameter list.");
+    }
+  }
+  private void optional_class_type() {
+    //	/* empty */
+    //| T_STRING
+  }
+  private void parameterDeclaration() {
+    //variable
+    //variable-reference
+    if (token == TokenNameAND) {
+      getNextToken();
+      if (isVariable()) {
+        getNextToken();
+      } else {
+        throwSyntaxError("Variable expected after reference operator '&'.");
+      }
+    }
+    //variable '=' constant
+    if (token == TokenNameVariable) {
+      getNextToken();
+      if (token == TokenNameEQUAL) {
+        getNextToken();
+        static_scalar();
+      }
+      return;
+    }
+    //    if (token == TokenNamethis) {
+    //      throwSyntaxError("Reserved word '$this' not allowed in parameter
+    // declaration.");
+    //    }
+  }
+  private void labeledStatementList() {
+    if (token != TokenNamecase && token != TokenNamedefault) {
+      throwSyntaxError("'case' or 'default' expected.");
+    }
+    do {
+      if (token == TokenNamecase) {
+        getNextToken();
+        expr(); //constant();
+        if (token == TokenNameCOLON || token == TokenNameSEMICOLON) {
+          getNextToken();
+          if (token == TokenNamecase || token == TokenNamedefault) {
+            // empty case statement ?
+            continue;
+          }
+          statementList();
+        }
+        //        else if (token == TokenNameSEMICOLON) {
+        //          setMarker(
+        //            "':' expected after 'case' keyword (Found token: " +
+        // scanner.toStringAction(token) + ")",
+        //            scanner.getCurrentTokenStartPosition(),
+        //            scanner.getCurrentTokenEndPosition(),
+        //            INFO);
+        //          getNextToken();
+        //          if (token == TokenNamecase) { // empty case statement ?
+        //            continue;
+        //          }
+        //          statementList();
+        //        }
+        else {
+          throwSyntaxError("':' character after 'case' constant expected (Found token: " + scanner.toStringAction(token) + ")");
+        }
+      } else { // TokenNamedefault
+        getNextToken();
+        if (token == TokenNameCOLON) {
+          getNextToken();
+          if (token == TokenNameRBRACE) {
+            // empty default case
+            break;
+          }
+          statementList();
+        } else {
+          throwSyntaxError("':' character after 'default' expected.");
+        }
+      }
+    } while (token == TokenNamecase || token == TokenNamedefault);
+  }
+  //  public void labeledStatement() {
+  //    if (token == TokenNamecase) {
+  //      getNextToken();
+  //      constant();
+  //      if (token == TokenNameDDOT) {
+  //        getNextToken();
+  //        statement();
+  //      } else {
+  //        throwSyntaxError("':' character after 'case' constant expected.");
+  //      }
+  //      return;
+  //    } else if (token == TokenNamedefault) {
+  //      getNextToken();
+  //      if (token == TokenNameDDOT) {
+  //        getNextToken();
+  //        statement();
+  //      } else {
+  //        throwSyntaxError("':' character after 'default' expected.");
+  //      }
+  //      return;
+  //    }
+  //  }
+  //  public void expressionStatement() {
+  //  }
+  //  private void inclusionStatement() {
+  //  }
+  //  public void compoundStatement() {
+  //  }
+  //  public void selectionStatement() {
+  //  }
+  //
+  //  public void iterationStatement() {
+  //  }
+  //
+  //  public void jumpStatement() {
+  //  }
+  //
+  //  public void outputStatement() {
+  //  }
+  //
+  //  public void scopeStatement() {
+  //  }
+  //
+  //  public void flowStatement() {
+  //  }
+  //
+  //  public void definitionStatement() {
+  //  }
+  private void ifStatement() {
+    // ':' statement-list [elseif-list] [else-colon-statement] 'endif' ';'
+    if (token == TokenNameCOLON) {
+      getNextToken();
+      if (token != TokenNameendif) {
+        statementList();
+        switch (token) {
+          case TokenNameelse :
+            getNextToken();
+            if (token == TokenNameCOLON) {
+              getNextToken();
+              if (token != TokenNameendif) {
+                statementList();
+              }
+            } else {
+              if (token == TokenNameif) { //'else if'
+                getNextToken();
+                elseifStatementList();
+              } else {
+                throwSyntaxError("':' expected after 'else'.");
+              }
+            }
+            break;
+          case TokenNameelseif :
+            getNextToken();
+            elseifStatementList();
+            break;
+        }
+      }
+      if (token != TokenNameendif) {
+        throwSyntaxError("'endif' expected.");
+      }
+      getNextToken();
+      if (token != TokenNameSEMICOLON) {
+        throwSyntaxError("';' expected after if-statement.");
+      }
+      getNextToken();
+    } else {
+      // statement [else-statement]
+      statement(TokenNameEOF);
+      if (token == TokenNameelseif) {
+        getNextToken();
+        if (token == TokenNameLPAREN) {
+          getNextToken();
+        } else {
+          throwSyntaxError("'(' expected after 'elseif' keyword.");
+        }
+        expr();
+        if (token == TokenNameRPAREN) {
+          getNextToken();
+        } else {
+          throwSyntaxError("')' expected after 'elseif' condition.");
+        }
+        ifStatement();
+      } else if (token == TokenNameelse) {
+        getNextToken();
+        statement(TokenNameEOF);
+      }
+    }
+  }
+  private void elseifStatementList() {
+    do {
+      elseifStatement();
+      switch (token) {
+        case TokenNameelse :
+          getNextToken();
+          if (token == TokenNameCOLON) {
+            getNextToken();
+            if (token != TokenNameendif) {
+              statementList();
+            }
+            return;
+          } else {
+            if (token == TokenNameif) { //'else if'
+              getNextToken();
+            } else {
+              throwSyntaxError("':' expected after 'else'.");
+            }
+          }
+          break;
+        case TokenNameelseif :
+          getNextToken();
+          break;
+        default :
+          return;
+      }
+    } while (true);
+  }
+  private void elseifStatement() {
+    if (token == TokenNameLPAREN) {
+      getNextToken();
+      expr();
+      if (token != TokenNameRPAREN) {
+        throwSyntaxError("')' expected in else-if-statement.");
+      }
+      getNextToken();
+      if (token != TokenNameCOLON) {
+        throwSyntaxError("':' expected in else-if-statement.");
+      }
+      getNextToken();
+      if (token != TokenNameendif) {
+        statementList();
+      }
+    }
+  }
+  private void switchStatement() {
+    if (token == TokenNameCOLON) {
+      // ':' [labeled-statement-list] 'endswitch' ';'
+      getNextToken();
+      labeledStatementList();
+      if (token != TokenNameendswitch) {
+        throwSyntaxError("'endswitch' expected.");
+      }
+      getNextToken();
+      if (token != TokenNameSEMICOLON) {
+        throwSyntaxError("';' expected after switch-statement.");
+      }
+      getNextToken();
+    } else {
+      // '{' [labeled-statement-list] '}'
+      if (token != TokenNameLBRACE) {
+        throwSyntaxError("'{' expected in switch statement.");
+      }
+      getNextToken();
+      if (token != TokenNameRBRACE) {
+        labeledStatementList();
+      }
+      if (token != TokenNameRBRACE) {
+        throwSyntaxError("'}' expected in switch statement.");
+      }
+      getNextToken();
+    }
+  }
+  private void forStatement() {
+    if (token == TokenNameCOLON) {
+      getNextToken();
+      statementList();
+      if (token != TokenNameendfor) {
+        throwSyntaxError("'endfor' expected.");
+      }
+      getNextToken();
+      if (token != TokenNameSEMICOLON) {
+        throwSyntaxError("';' expected after for-statement.");
+      }
+      getNextToken();
+    } else {
+      statement(TokenNameEOF);
+    }
+  }
+  private void whileStatement() {
+    // ':' statement-list 'endwhile' ';'
+    if (token == TokenNameCOLON) {
+      getNextToken();
+      statementList();
+      if (token != TokenNameendwhile) {
+        throwSyntaxError("'endwhile' expected.");
+      }
+      getNextToken();
+      if (token != TokenNameSEMICOLON) {
+        throwSyntaxError("';' expected after while-statement.");
+      }
+      getNextToken();
+    } else {
+      statement(TokenNameEOF);
+    }
+  }
+  private void foreachStatement() {
+    if (token == TokenNameCOLON) {
+      getNextToken();
+      statementList();
+      if (token != TokenNameendforeach) {
+        throwSyntaxError("'endforeach' expected.");
+      }
+      getNextToken();
+      if (token != TokenNameSEMICOLON) {
+        throwSyntaxError("';' expected after foreach-statement.");
+      }
+      getNextToken();
+    } else {
+      statement(TokenNameEOF);
+    }
+  }
+  //  private void exitStatus() {
+  //    if (token == TokenNameLPAREN) {
+  //      getNextToken();
+  //    } else {
+  //      throwSyntaxError("'(' expected in 'exit-status'.");
+  //    }
+  //    if (token != TokenNameRPAREN) {
+  //      expression();
+  //    }
+  //    if (token == TokenNameRPAREN) {
+  //      getNextToken();
+  //    } else {
+  //      throwSyntaxError("')' expected after 'exit-status'.");
+  //    }
+  //  }
+  private void expressionList() {
+    do {
+      expr();
+      if (token == TokenNameCOMMA) {
+        getNextToken();
+      } else {
+        break;
+      }
+    } while (true);
+  }
+  private void expr() {
+    //	r_variable
+    //	| expr_without_variable
+    //    if (token!=TokenNameEOF) {
+    if (Scanner.TRACE) {
+      System.out.println("TRACE: expr()");
+    }
+    expr_without_variable(true);
+    //    }
+  }
+  private void expr_without_variable(boolean only_variable) {
+    //	 	internal_functions_in_yacc
+    //	| T_CLONE expr
+    //	| T_PRINT expr
+    //	| '(' expr ')'
+    //	| '@' expr
+    //	| '+' expr
+    //	| '-' expr
+    //	| '!' expr
+    //	| '~' expr
+    //	| T_INC rw_variable
+    //	| T_DEC rw_variable
+    //	| T_INT_CAST expr
+    //	| T_DOUBLE_CAST expr
+    //	| T_STRING_CAST expr
+    //	| T_ARRAY_CAST expr
+    //	| T_OBJECT_CAST expr
+    //	| T_BOOL_CAST expr
+    //	| T_UNSET_CAST expr
+    //	| T_EXIT exit_expr
+    //	| scalar
+    //	| T_ARRAY '(' array_pair_list ')'
+    //	| '`' encaps_list '`'
+    //	| T_LIST '(' assignment_list ')' '=' expr
+    //	| T_NEW class_name_reference ctor_arguments
+    //	| variable '=' expr
+    //	| variable '=' '&' variable
+    //	| variable '=' '&' T_NEW class_name_reference ctor_arguments
+    //	| variable T_PLUS_EQUAL expr
+    //	| variable T_MINUS_EQUAL expr
+    //	| variable T_MUL_EQUAL expr
+    //	| variable T_DIV_EQUAL expr
+    //	| variable T_CONCAT_EQUAL expr
+    //	| variable T_MOD_EQUAL expr
+    //	| variable T_AND_EQUAL expr
+    //	| variable T_OR_EQUAL expr
+    //	| variable T_XOR_EQUAL expr
+    //	| variable T_SL_EQUAL expr
+    //	| variable T_SR_EQUAL expr
+    //	| rw_variable T_INC
+    //	| rw_variable T_DEC
+    //	| expr T_BOOLEAN_OR expr
+    //	| expr T_BOOLEAN_AND expr
+    //	| expr T_LOGICAL_OR expr
+    //	| expr T_LOGICAL_AND expr
+    //	| expr T_LOGICAL_XOR expr
+    //	| expr '|' expr
+    //	| expr '&' expr
+    //	| expr '^' expr
+    //	| expr '.' expr
+    //	| expr '+' expr
+    //	| expr '-' expr
+    //	| expr '*' expr
+    //	| expr '/' expr
+    //	| expr '%' expr
+    //	| expr T_SL expr
+    //	| expr T_SR expr
+    //	| expr T_IS_IDENTICAL expr
+    //	| expr T_IS_NOT_IDENTICAL expr
+    //	| expr T_IS_EQUAL expr
+    //	| expr T_IS_NOT_EQUAL expr
+    //	| expr '<' expr
+    //	| expr T_IS_SMALLER_OR_EQUAL expr
+    //	| expr '>' expr
+    //	| expr T_IS_GREATER_OR_EQUAL expr
+    //	| expr T_INSTANCEOF class_name_reference
+    //	| expr '?' expr ':' expr
+    if (Scanner.TRACE) {
+      System.out.println("TRACE: expr_without_variable() PART 1");
+    }
+    switch (token) {
+      case TokenNameisset :
+      case TokenNameempty :
+      case TokenNameeval :
+      case TokenNameinclude :
+      case TokenNameinclude_once :
+      case TokenNamerequire :
+      case TokenNamerequire_once :
+        internal_functions_in_yacc();
+        break;
+      //    	| '(' expr ')'
+      case TokenNameLPAREN :
+        getNextToken();
+        expr();
+        if (token == TokenNameRPAREN) {
+          getNextToken();
+        } else {
+          throwSyntaxError("')' expected in expression.");
+        }
+        break;
+      //    | T_CLONE expr
+      //    | T_PRINT expr
+      //    | '@' expr
+      //    | '+' expr
+      //    | '-' expr
+      //    | '!' expr
+      //    | '~' expr
+      //    | T_INT_CAST expr
+      //	| T_DOUBLE_CAST expr
+      //	| T_STRING_CAST expr
+      //	| T_ARRAY_CAST expr
+      //	| T_OBJECT_CAST expr
+      //	| T_BOOL_CAST expr
+      //	| T_UNSET_CAST expr
+      case TokenNameclone :
+      case TokenNameprint :
+      case TokenNameAT :
+      case TokenNamePLUS :
+      case TokenNameMINUS :
+      case TokenNameNOT :
+      case TokenNameTWIDDLE :
+      case TokenNameintCAST :
+      case TokenNamedoubleCAST :
+      case TokenNamestringCAST :
+      case TokenNamearrayCAST :
+      case TokenNameobjectCAST :
+      case TokenNameboolCAST :
+      case TokenNameunsetCAST :
+        getNextToken();
+        expr();
+        break;
+      case TokenNameexit :
+        getNextToken();
+        exit_expr();
+        break;
+      //  scalar:
+      //	T_STRING
+      //| T_STRING_VARNAME
+      //| class_constant
+      //| T_START_HEREDOC encaps_list T_END_HEREDOC
+      //    	| '`' encaps_list '`'
+      //  | common_scalar
+      //	| '`' encaps_list '`'
+      case TokenNameEncapsedString0 :
+        scanner.encapsedStringStack.push(new Character('`'));
+        getNextToken();
+        try {
+          if (token == TokenNameEncapsedString0) {
+          } else {
+            encaps_list();
+            if (token != TokenNameEncapsedString0) {
+              throwSyntaxError("\'`\' expected at end of string" + "(Found token: " + scanner.toStringAction(token) + " )");
+            }
+          }
+        } finally {
+          scanner.encapsedStringStack.pop();
+          getNextToken();
+        }
+        break;
+      //      | '\'' encaps_list '\''
+      case TokenNameEncapsedString1 :
+        scanner.encapsedStringStack.push(new Character('\''));
+        getNextToken();
+        try {
+          if (token == TokenNameEncapsedString1) {
+          } else {
+            encaps_list();
+            if (token != TokenNameEncapsedString1) {
+              throwSyntaxError("\'\'\' expected at end of string" + "(Found token: " + scanner.toStringAction(token) + " )");
+            }
+          }
+        } finally {
+          scanner.encapsedStringStack.pop();
+          getNextToken();
+        }
+        break;
+      //| '"' encaps_list '"'
+      case TokenNameEncapsedString2 :
+        scanner.encapsedStringStack.push(new Character('"'));
+        getNextToken();
+        try {
+          if (token == TokenNameEncapsedString2) {
+          } else {
+            encaps_list();
+            if (token != TokenNameEncapsedString2) {
+              throwSyntaxError("'\"' expected at end of string" + "(Found token: " + scanner.toStringAction(token) + " )");
+            }
+          }
+        } finally {
+          scanner.encapsedStringStack.pop();
+          getNextToken();
+        }
+        break;
+      case TokenNameIntegerLiteral :
+      case TokenNameDoubleLiteral :
+      case TokenNameStringLiteral :
+      case TokenNameStringConstant :
+      case TokenNameStringInterpolated :
+      case TokenNameFILE :
+      case TokenNameLINE :
+      case TokenNameCLASS_C :
+      case TokenNameMETHOD_C :
+      case TokenNameFUNC_C :
+        common_scalar();
+        break;
+      case TokenNameHEREDOC :
+        getNextToken();
+        break;
+      case TokenNamearray :
+        //    T_ARRAY '(' array_pair_list ')'
+        getNextToken();
+        if (token == TokenNameLPAREN) {
+          getNextToken();
+          if (token == TokenNameRPAREN) {
+            getNextToken();
+            break;
+          }
+          array_pair_list();
+          if (token != TokenNameRPAREN) {
+            throwSyntaxError("')' expected after keyword 'array'" + "(Found token: " + scanner.toStringAction(token) + ")");
+          }
+          getNextToken();
+        } else {
+          throwSyntaxError("'(' expected after keyword 'array'" + "(Found token: " + scanner.toStringAction(token) + ")");
+        }
+        break;
+      case TokenNamelist :
+        //    | T_LIST '(' assignment_list ')' '=' expr
+        getNextToken();
+        if (token == TokenNameLPAREN) {
+          getNextToken();
+          assignment_list();
+          if (token != TokenNameRPAREN) {
+            throwSyntaxError("')' expected after 'list' keyword.");
+          }
+          getNextToken();
+          if (token != TokenNameEQUAL) {
+            throwSyntaxError("'=' expected after 'list' keyword.");
+          }
+          getNextToken();
+          expr();
+        } else {
+          throwSyntaxError("'(' expected after 'list' keyword.");
+        }
+        break;
+      case TokenNamenew :
+        //	| T_NEW class_name_reference ctor_arguments
+        getNextToken();
+        class_name_reference();
+        ctor_arguments();
+        break;
+      //    	| T_INC rw_variable
+      //    	| T_DEC rw_variable
+      case TokenNamePLUS_PLUS :
+      case TokenNameMINUS_MINUS :
+        getNextToken();
+        rw_variable();
+        break;
+      //	| variable '=' expr
+      //	| variable '=' '&' variable
+      //	| variable '=' '&' T_NEW class_name_reference ctor_arguments
+      //	| variable T_PLUS_EQUAL expr
+      //	| variable T_MINUS_EQUAL expr
+      //	| variable T_MUL_EQUAL expr
+      //	| variable T_DIV_EQUAL expr
+      //	| variable T_CONCAT_EQUAL expr
+      //	| variable T_MOD_EQUAL expr
+      //	| variable T_AND_EQUAL expr
+      //	| variable T_OR_EQUAL expr
+      //	| variable T_XOR_EQUAL expr
+      //	| variable T_SL_EQUAL expr
+      //	| variable T_SR_EQUAL expr
+      //	| rw_variable T_INC
+      //	| rw_variable T_DEC
+      case TokenNameIdentifier :
+      case TokenNameVariable :
+      case TokenNameDOLLAR :
+        variable();
+        switch (token) {
+          case TokenNameEQUAL :
+            getNextToken();
+            if (token == TokenNameAND) {
+              getNextToken();
+              if (token == TokenNamenew) {
+                // | variable '=' '&' T_NEW class_name_reference
+                // ctor_arguments
+                getNextToken();
+                class_name_reference();
+                ctor_arguments();
+              } else {
+                variable();
+              }
+            } else {
+              expr();
+            }
+            break;
+          case TokenNamePLUS_EQUAL :
+          case TokenNameMINUS_EQUAL :
+          case TokenNameMULTIPLY_EQUAL :
+          case TokenNameDIVIDE_EQUAL :
+          case TokenNameDOT_EQUAL :
+          case TokenNameREMAINDER_EQUAL :
+          case TokenNameAND_EQUAL :
+          case TokenNameOR_EQUAL :
+          case TokenNameXOR_EQUAL :
+          case TokenNameRIGHT_SHIFT_EQUAL :
+          case TokenNameLEFT_SHIFT_EQUAL :
+            getNextToken();
+            expr();
+            break;
+          case TokenNamePLUS_PLUS :
+          case TokenNameMINUS_MINUS :
+            getNextToken();
+            break;
+          default :
+            if (!only_variable) {
+              throwSyntaxError("Variable expression not allowed (found token '" + scanner.toStringAction(token) + "').");
+            }
+        }
+        break;
+      default :
+        if (token != TokenNameINLINE_HTML) {
+          if (token > TokenNameKEYWORD) {
+            getNextToken();
+            break;
+          } else {
+            throwSyntaxError("Error in expression (found token '" + scanner.toStringAction(token) + "').");
+          }
+        }
+        return;
+    }
+    if (Scanner.TRACE) {
+      System.out.println("TRACE: expr_without_variable() PART 2");
+    }
+    //	| expr T_BOOLEAN_OR expr
+    //	| expr T_BOOLEAN_AND expr
+    //	| expr T_LOGICAL_OR expr
+    //	| expr T_LOGICAL_AND expr
+    //	| expr T_LOGICAL_XOR expr
+    //	| expr '|' expr
+    //	| expr '&' expr
+    //	| expr '^' expr
+    //	| expr '.' expr
+    //	| expr '+' expr
+    //	| expr '-' expr
+    //	| expr '*' expr
+    //	| expr '/' expr
+    //	| expr '%' expr
+    //	| expr T_SL expr
+    //	| expr T_SR expr
+    //	| expr T_IS_IDENTICAL expr
+    //	| expr T_IS_NOT_IDENTICAL expr
+    //	| expr T_IS_EQUAL expr
+    //	| expr T_IS_NOT_EQUAL expr
+    //	| expr '<' expr
+    //	| expr T_IS_SMALLER_OR_EQUAL expr
+    //	| expr '>' expr
+    //	| expr T_IS_GREATER_OR_EQUAL expr
+    while (true) {
+      switch (token) {
+        case TokenNameOR_OR :
+        case TokenNameAND_AND :
+        case TokenNameand :
+        case TokenNameor :
+        case TokenNamexor :
+        case TokenNameAND :
+        case TokenNameOR :
+        case TokenNameXOR :
+        case TokenNameDOT :
+        case TokenNamePLUS :
+        case TokenNameMINUS :
+        case TokenNameMULTIPLY :
+        case TokenNameDIVIDE :
+        case TokenNameREMAINDER :
+        case TokenNameLEFT_SHIFT :
+        case TokenNameRIGHT_SHIFT :
+        case TokenNameEQUAL_EQUAL_EQUAL :
+        case TokenNameNOT_EQUAL_EQUAL :
+        case TokenNameEQUAL_EQUAL :
+        case TokenNameNOT_EQUAL :
+        case TokenNameLESS :
+        case TokenNameLESS_EQUAL :
+        case TokenNameGREATER :
+        case TokenNameGREATER_EQUAL :
+          getNextToken();
+          expr();
+          break;
+        //  | expr T_INSTANCEOF class_name_reference
+        //	| expr '?' expr ':' expr
+        case TokenNameinstanceof :
+          getNextToken();
+          class_name_reference();
+          break;
+        case TokenNameQUESTION :
+          getNextToken();
+          expr();
+          if (token == TokenNameCOLON) {
+            getNextToken();
+            expr();
+          }
+          break;
+        default :
+          return;
+      }
+    }
+  }
+  private void class_name_reference() {
+    //  class_name_reference:
+    //	T_STRING
+    //| dynamic_class_name_reference
+    if (Scanner.TRACE) {
+      System.out.println("TRACE: class_name_reference()");
+    }
+    if (token == TokenNameIdentifier) {
+      getNextToken();
+    } else {
+      dynamic_class_name_reference();
+    }
+  }
+  private void dynamic_class_name_reference() {
+    //dynamic_class_name_reference:
+    //	base_variable T_OBJECT_OPERATOR object_property
+    // dynamic_class_name_variable_properties
+    //| base_variable
+    if (Scanner.TRACE) {
+      System.out.println("TRACE: dynamic_class_name_reference()");
+    }
+    base_variable();
+    if (token == TokenNameMINUS_GREATER) {
+      getNextToken();
+      object_property();
+      dynamic_class_name_variable_properties();
+    }
+  }
+  private void dynamic_class_name_variable_properties() {
+    //  dynamic_class_name_variable_properties:
+    //  		dynamic_class_name_variable_properties
+    // dynamic_class_name_variable_property
+    //  	| /* empty */
+    if (Scanner.TRACE) {
+      System.out.println("TRACE: dynamic_class_name_variable_properties()");
+    }
+    while (token == TokenNameMINUS_GREATER) {
+      dynamic_class_name_variable_property();
+    }
+  }
+  private void dynamic_class_name_variable_property() {
+    //  dynamic_class_name_variable_property:
+    //	T_OBJECT_OPERATOR object_property
+    if (Scanner.TRACE) {
+      System.out.println("TRACE: dynamic_class_name_variable_property()");
+    }
+    if (token == TokenNameMINUS_GREATER) {
+      getNextToken();
+      object_property();
+    }
+  }
+  private void ctor_arguments() {
+    //  ctor_arguments:
+    //	/* empty */
+    //| '(' function_call_parameter_list ')'
+    if (token == TokenNameLPAREN) {
+      getNextToken();
+      if (token == TokenNameRPAREN) {
+        getNextToken();
+        return;
+      }
+      non_empty_function_call_parameter_list();
+      if (token != TokenNameRPAREN) {
+        throwSyntaxError("')' expected in ctor_arguments.");
+      }
+      getNextToken();
+    }
+  }
+  private void assignment_list() {
+    //  assignment_list:
+    //	assignment_list ',' assignment_list_element
+    //| assignment_list_element
+    while (true) {
+      assignment_list_element();
+      if (token != TokenNameCOMMA) {
+        break;
+      }
+      getNextToken();
+    }
+  }
+  private void assignment_list_element() {
+    //assignment_list_element:
+    //	variable
+    //| T_LIST '(' assignment_list ')'
+    //| /* empty */
+    if (token == TokenNameVariable || token == TokenNameDOLLAR) {
+      variable();
+    } else {
+      if (token == TokenNamelist) {
+        getNextToken();
+        if (token == TokenNameLPAREN) {
+          getNextToken();
+          assignment_list();
+          if (token != TokenNameRPAREN) {
+            throwSyntaxError("')' expected after 'list' keyword.");
+          }
+          getNextToken();
+        } else {
+          throwSyntaxError("'(' expected after 'list' keyword.");
+        }
+      }
+    }
+  }
+  private void array_pair_list() {
+    //  array_pair_list:
+    //	/* empty */
+    //| non_empty_array_pair_list possible_comma
+    non_empty_array_pair_list();
+    if (token == TokenNameCOMMA) {
+      getNextToken();
+    }
+  }
+  private void non_empty_array_pair_list() {
+    //non_empty_array_pair_list:
+    //	non_empty_array_pair_list ',' expr T_DOUBLE_ARROW expr
+    //| non_empty_array_pair_list ',' expr
+    //| expr T_DOUBLE_ARROW expr
+    //| expr
+    //| non_empty_array_pair_list ',' expr T_DOUBLE_ARROW '&' w_variable
+    //| non_empty_array_pair_list ',' '&' w_variable
+    //| expr T_DOUBLE_ARROW '&' w_variable
+    //| '&' w_variable
+    while (true) {
+      if (token == TokenNameAND) {
+        getNextToken();
+        variable();
+      } else {
+        expr();
+        if (token == TokenNameAND) {
+          getNextToken();
+          variable();
+        } else if (token == TokenNameEQUAL_GREATER) {
+          getNextToken();
+          if (token == TokenNameAND) {
+            getNextToken();
+            variable();
+          } else {
+            expr();
+          }
+        }
+      }
+      if (token != TokenNameCOMMA) {
+        return;
+      }
+      getNextToken();
+      if (token == TokenNameRPAREN) {
+        return;
+      }
+    }
+  }
+  //  private void variableList() {
+  //    do {
+  //      variable();
+  //      if (token == TokenNameCOMMA) {
+  //        getNextToken();
+  //      } else {
+  //        break;
+  //      }
+  //    } while (true);
+  //  }
+  private void variable_without_objects() {
+    //  variable_without_objects:
+    //  		reference_variable
+    //  	| simple_indirect_reference reference_variable
+    if (Scanner.TRACE) {
+      System.out.println("TRACE: variable_without_objects()");
+    }
+    while (token == TokenNameDOLLAR) {
+      getNextToken();
+    }
+    reference_variable();
+  }
+  private void function_call() {
+    //  function_call:
+    //	T_STRING '(' function_call_parameter_list ')'
+    //| class_constant '(' function_call_parameter_list ')'
+    //| static_member '(' function_call_parameter_list ')'
+    //| variable_without_objects '(' function_call_parameter_list ')'
+    if (Scanner.TRACE) {
+      System.out.println("TRACE: function_call()");
+    }
+    if (token == TokenNameIdentifier) {
+      getNextToken();
+      switch (token) {
+        case TokenNamePAAMAYIM_NEKUDOTAYIM :
+          // static member:
+          getNextToken();
+          if (token == TokenNameIdentifier) {
+            // class _constant
+            getNextToken();
+          } else {
+            //        static member:
+            variable_without_objects();
+          }
+          break;
+      }
+    } else {
+      variable_without_objects();
+    }
+    if (token != TokenNameLPAREN) {
+      // TODO is this ok ?
+      return;
+      //      throwSyntaxError("'(' expected in function call.");
+    }
+    getNextToken();
+    if (token == TokenNameRPAREN) {
+      getNextToken();
+      return;
+    }
+    non_empty_function_call_parameter_list();
+    if (token != TokenNameRPAREN) {
+      throwSyntaxError("')' expected in function call.");
+    }
+    getNextToken();
+  }
+  //  private void function_call_parameter_list() {
+  //    function_call_parameter_list:
+  //		non_empty_function_call_parameter_list { $$ = $1; }
+  //	| /* empty */
+  //  }
+  private void non_empty_function_call_parameter_list() {
+    //non_empty_function_call_parameter_list:
+    //		expr_without_variable
+    //	| variable
+    //	| '&' w_variable
+    //	| non_empty_function_call_parameter_list ',' expr_without_variable
+    //	| non_empty_function_call_parameter_list ',' variable
+    //	| non_empty_function_call_parameter_list ',' '&' w_variable
+    if (Scanner.TRACE) {
+      System.out.println("TRACE: non_empty_function_call_parameter_list()");
+    }
+    while (true) {
+      if (token == TokenNameAND) {
+        getNextToken();
+        w_variable();
+      } else {
+        //        if (token == TokenNameIdentifier || token ==
+        // TokenNameVariable
+        //            || token == TokenNameDOLLAR) {
+        //          variable();
+        //        } else {
+        expr_without_variable(true);
+        //        }
+      }
+      if (token != TokenNameCOMMA) {
+        break;
+      }
+      getNextToken();
+    }
+  }
+  private void fully_qualified_class_name() {
+    if (token == TokenNameIdentifier) {
+      getNextToken();
+    } else {
+      throwSyntaxError("Class name expected.");
+    }
+  }
+  private void static_member() {
+    //  static_member:
+    //	fully_qualified_class_name T_PAAMAYIM_NEKUDOTAYIM
+    // variable_without_objects
+    if (Scanner.TRACE) {
+      System.out.println("TRACE: static_member()");
+    }
+    fully_qualified_class_name();
+    if (token != TokenNamePAAMAYIM_NEKUDOTAYIM) {
+      throwSyntaxError("'::' expected after class name (static_member).");
+    }
+    getNextToken();
+    variable_without_objects();
+  }
+  private void base_variable_with_function_calls() {
+    //  base_variable_with_function_calls:
+    //	base_variable
+    //| function_call
+    boolean functionCall = false;
+    if (Scanner.TRACE) {
+      System.out.println("TRACE: base_variable_with_function_calls()");
+    }
+    //    if (token == TokenNameIdentifier) {
+    //      functionCall = true;
+    //    } else if (token == TokenNameVariable) {
+    //      int tempToken = token;
+    //      int tempPosition = scanner.currentPosition;
+    //      getNextToken();
+    //      if (token == TokenNameLPAREN) {
+    //        functionCall = true;
+    //      }
+    //      token = tempToken;
+    //      scanner.currentPosition = tempPosition;
+    //      scanner.phpMode = true;
+    //    }
+    //    if (functionCall) {
+    function_call();
+    //    } else {
+    //      base_variable();
+    //    }
+  }
+  private void base_variable() {
+    //  base_variable:
+    //  		reference_variable
+    //  	| simple_indirect_reference reference_variable
+    //  	| static_member
+    if (Scanner.TRACE) {
+      System.out.println("TRACE: base_variable()");
+    }
+    if (token == TokenNameIdentifier) {
+      static_member();
+    } else {
+      while (token == TokenNameDOLLAR) {
+        getNextToken();
+      }
+      reference_variable();
+    }
+  }
+  //  private void simple_indirect_reference() {
+  //    // simple_indirect_reference:
+  //    // '$'
+  //    //| simple_indirect_reference '$'
+  //  }
+  private void reference_variable() {
+    //  reference_variable:
+    //  		reference_variable '[' dim_offset ']'
+    //  	| reference_variable '{' expr '}'
+    //  	| compound_variable
+    if (Scanner.TRACE) {
+      System.out.println("TRACE: reference_variable()");
+    }
+    compound_variable();
+    while (true) {
+      if (token == TokenNameLBRACE) {
+        getNextToken();
+        expr();
+        if (token != TokenNameRBRACE) {
+          throwSyntaxError("'}' expected in reference variable.");
+        }
+        getNextToken();
+      } else if (token == TokenNameLBRACKET) {
+        getNextToken();
+        if (token != TokenNameRBRACKET) {
+          expr();
+          //        dim_offset();
+          if (token != TokenNameRBRACKET) {
+            throwSyntaxError("']' expected in reference variable.");
+          }
+        }
+        getNextToken();
+      } else {
+        break;
+      }
+    }
+  }
+  private void compound_variable() {
+    //  compound_variable:
+    //  		T_VARIABLE
+    //  	| '$' '{' expr '}'
+    if (Scanner.TRACE) {
+      System.out.println("TRACE: compound_variable()");
+    }
+    if (token == TokenNameVariable) {
+      getNextToken();
+    } else {
+      // because of simple_indirect_reference
+      while (token == TokenNameDOLLAR) {
+        getNextToken();
+      }
+      if (token != TokenNameLBRACE) {
+        throwSyntaxError("'{' expected after compound variable token '$'.");
+      }
+      getNextToken();
+      expr();
+      if (token != TokenNameRBRACE) {
+        throwSyntaxError("'}' expected after compound variable token '$'.");
+      }
+      getNextToken();
+    }
+  }
+  //  private void dim_offset() {
+  //    // dim_offset:
+  //    // /* empty */
+  //    // | expr
+  //    expr();
+  //  }
+  private void object_property() {
+    //  object_property:
+    //	object_dim_list
+    //| variable_without_objects
+    if (Scanner.TRACE) {
+      System.out.println("TRACE: object_property()");
+    }
+    if (token == TokenNameVariable || token == TokenNameDOLLAR) {
+      variable_without_objects();
+    } else {
+      object_dim_list();
+    }
+  }
+  private void object_dim_list() {
+    //object_dim_list:
+    //	object_dim_list '[' dim_offset ']'
+    //| object_dim_list '{' expr '}'
+    //| variable_name
+    if (Scanner.TRACE) {
+      System.out.println("TRACE: object_dim_list()");
+    }
+    variable_name();
+    while (true) {
+      if (token == TokenNameLBRACE) {
+        getNextToken();
+        expr();
+        if (token != TokenNameRBRACE) {
+          throwSyntaxError("'}' expected in object_dim_list.");
+        }
+        getNextToken();
+      } else if (token == TokenNameLBRACKET) {
+        getNextToken();
+        if (token == TokenNameRBRACKET) {
+          getNextToken();
+          continue;
+        }
+        expr();
+        if (token != TokenNameRBRACKET) {
+          throwSyntaxError("']' expected in object_dim_list.");
+        }
+        getNextToken();
+      } else {
+        break;
+      }
+    }
+  }
+  private void variable_name() {
+    //variable_name:
+    //	T_STRING
+    //| '{' expr '}'
+    if (Scanner.TRACE) {
+      System.out.println("TRACE: variable_name()");
+    }
+    if (token == TokenNameIdentifier || token > TokenNameKEYWORD) {
+      if (token > TokenNameKEYWORD) {
+        // TODO show a warning "Keyword used as variable" ?
+      }
+      getNextToken();
+    } else {
+      if (token != TokenNameLBRACE) {
+        throwSyntaxError("'{' expected in variable name.");
+      }
+      getNextToken();
+      expr();
+      if (token != TokenNameRBRACE) {
+        throwSyntaxError("'}' expected in variable name.");
+      }
+      getNextToken();
+    }
+  }
+  private void r_variable() {
+    variable();
+  }
+  private void w_variable() {
+    variable();
+  }
+  private void rw_variable() {
+    variable();
+  }
+  private void variable() {
+    //    variable:
+    //		base_variable_with_function_calls T_OBJECT_OPERATOR
+    //			object_property method_or_not variable_properties
+    //	| base_variable_with_function_calls
+    base_variable_with_function_calls();
+    if (token == TokenNameMINUS_GREATER) {
+      getNextToken();
+      object_property();
+      method_or_not();
+      variable_properties();
+    }
+    //    if (token == TokenNameDOLLAR_LBRACE) {
+    //      getNextToken();
+    //      expr();
+    //      ;
+    //      if (token != TokenNameRBRACE) {
+    //        throwSyntaxError("'}' expected after indirect variable token '${'.");
+    //      }
+    //      getNextToken();
+    //    } else {
+    //      if (token == TokenNameVariable) {
+    //        getNextToken();
+    //        if (token == TokenNameLBRACKET) {
+    //          getNextToken();
+    //          expr();
+    //          if (token != TokenNameRBRACKET) {
+    //            throwSyntaxError("']' expected in variable-list.");
+    //          }
+    //          getNextToken();
+    //        } else if (token == TokenNameEQUAL) {
+    //          getNextToken();
+    //          static_scalar();
+    //        }
+    //      } else {
+    //        throwSyntaxError("$-variable expected in variable-list.");
+    //      }
+    //    }
+  }
+  private void variable_properties() {
+    //  variable_properties:
+    //  		variable_properties variable_property
+    //  	| /* empty */
+    while (token == TokenNameMINUS_GREATER) {
+      variable_property();
+    }
+  }
+  private void variable_property() {
+    //  variable_property:
+    //  		T_OBJECT_OPERATOR object_property method_or_not
+    if (Scanner.TRACE) {
+      System.out.println("TRACE: variable_property()");
+    }
+    if (token == TokenNameMINUS_GREATER) {
+      getNextToken();
+      object_property();
+      method_or_not();
+    } else {
+      throwSyntaxError("'->' expected in variable_property.");
+    }
+  }
+  private void method_or_not() {
+    //  method_or_not:
+    //  		'(' function_call_parameter_list ')'
+    //  	| /* empty */
+    if (Scanner.TRACE) {
+      System.out.println("TRACE: method_or_not()");
+    }
+    if (token == TokenNameLPAREN) {
+      getNextToken();
+      if (token == TokenNameRPAREN) {
+        getNextToken();
+        return;
+      }
+      non_empty_function_call_parameter_list();
+      if (token != TokenNameRPAREN) {
+        throwSyntaxError("')' expected in method_or_not.");
+      }
+      getNextToken();
+    }
+  }
+  private void exit_expr() {
+    //	/* empty */
+    //	| '(' ')'
+    //	| '(' expr ')'
+    if (token != TokenNameLPAREN) {
+      return;
+    }
+    getNextToken();
+    if (token == TokenNameRPAREN) {
+      getNextToken();
+      return;
+    }
+    expr();
+    if (token != TokenNameRPAREN) {
+      throwSyntaxError("')' expected after keyword 'exit'");
+    }
+    getNextToken();
+  }
+  private void encaps_list() {
+    //  		encaps_list encaps_var
+    //  	| encaps_list T_STRING
+    //  	| encaps_list T_NUM_STRING
+    //  	| encaps_list T_ENCAPSED_AND_WHITESPACE
+    //  	| encaps_list T_CHARACTER
+    //  	| encaps_list T_BAD_CHARACTER
+    //  	| encaps_list '['
+    //  	| encaps_list ']'
+    //  	| encaps_list '{'
+    //  	| encaps_list '}'
+    //  	| encaps_list T_OBJECT_OPERATOR
+    //  	| /* empty */
+    while (true) {
+      switch (token) {
+        case TokenNameSTRING :
+          getNextToken();
+          break;
+        case TokenNameLBRACE :
+          //          scanner.encapsedStringStack.pop();
+          getNextToken();
+          break;
+        case TokenNameRBRACE :
+          //          scanner.encapsedStringStack.pop();
+          getNextToken();
+          break;
+        case TokenNameLBRACKET :
+          //          scanner.encapsedStringStack.pop();
+          getNextToken();
+          break;
+        case TokenNameRBRACKET :
+          //          scanner.encapsedStringStack.pop();
+          getNextToken();
+          break;
+        case TokenNameMINUS_GREATER :
+          //          scanner.encapsedStringStack.pop();
+          getNextToken();
+          break;
+        case TokenNameVariable :
+        case TokenNameDOLLAR_LBRACE :
+        case TokenNameCURLY_OPEN :
+          encaps_var();
+          break;
+        //        case TokenNameDOLLAR :
+        //          getNextToken();
+        //          if (token == TokenNameLBRACE) {
+        //            token = TokenNameDOLLAR_LBRACE;
+        //            encaps_var();
+        //          }
+        //          break;
+        default :
+          char encapsedChar = ((Character) scanner.encapsedStringStack.peek()).charValue();
+          if (encapsedChar == '$') {
+            scanner.encapsedStringStack.pop();
+            encapsedChar = ((Character) scanner.encapsedStringStack.peek()).charValue();
+            switch (encapsedChar) {
+              case '`' :
+                if (token == TokenNameEncapsedString0) {
+                  return;
+                }
+                token = TokenNameSTRING;
+                continue;
+              case '\'' :
+                if (token == TokenNameEncapsedString1) {
+                  return;
+                }
+                token = TokenNameSTRING;
+                continue;
+              case '"' :
+                if (token == TokenNameEncapsedString2) {
+                  return;
+                }
+                token = TokenNameSTRING;
+                continue;
+            }
+          }
+          return;
+      }
+    }
+  }
+  private void encaps_var() {
+    //  		T_VARIABLE
+    //  	| T_VARIABLE '[' encaps_var_offset ']'
+    //  	| T_VARIABLE T_OBJECT_OPERATOR T_STRING
+    //  	| T_DOLLAR_OPEN_CURLY_BRACES expr '}'
+    //  	| T_DOLLAR_OPEN_CURLY_BRACES T_STRING_VARNAME '[' expr ']' '}'
+    //  	| T_CURLY_OPEN variable '}'
+    switch (token) {
+      case TokenNameVariable :
+        getNextToken();
+        if (token == TokenNameLBRACKET) {
+          getNextToken();
+          //          if (token == TokenNameRBRACKET) {
+          //            getNextToken();
+          //          } else {
+          expr(); //encaps_var_offset();
+          if (token != TokenNameRBRACKET) {
+            throwSyntaxError("']' expected after variable.");
+          }
+          //          scanner.encapsedStringStack.pop();
+          getNextToken();
+          //          }
+        } else if (token == TokenNameMINUS_GREATER) {
+          getNextToken();
+          if (token != TokenNameIdentifier) {
+            throwSyntaxError("Identifier expected after '->'.");
+          }
+          //          scanner.encapsedStringStack.pop();
+          getNextToken();
+        }
+        //        else {
+        //          // scanner.encapsedStringStack.pop();
+        //          int tempToken = TokenNameSTRING;
+        //          if (!scanner.encapsedStringStack.isEmpty()
+        //              && (token == TokenNameEncapsedString0
+        //                  || token == TokenNameEncapsedString1
+        //                  || token == TokenNameEncapsedString2 || token ==
+        // TokenNameERROR)) {
+        //            char encapsedChar = ((Character)
+        // scanner.encapsedStringStack.peek())
+        //                .charValue();
+        //            switch (token) {
+        //              case TokenNameEncapsedString0 :
+        //                if (encapsedChar == '`') {
+        //                  tempToken = TokenNameEncapsedString0;
+        //                }
+        //                break;
+        //              case TokenNameEncapsedString1 :
+        //                if (encapsedChar == '\'') {
+        //                  tempToken = TokenNameEncapsedString1;
+        //                }
+        //                break;
+        //              case TokenNameEncapsedString2 :
+        //                if (encapsedChar == '"') {
+        //                  tempToken = TokenNameEncapsedString2;
+        //                }
+        //                break;
+        //              case TokenNameERROR :
+        //                if (scanner.source[scanner.currentPosition - 1] == '\\') {
+        //                  scanner.currentPosition--;
+        //                  getNextToken();
+        //                }
+        //                break;
+        //            }
+        //          }
+        //          token = tempToken;
+        //        }
+        break;
+      case TokenNameDOLLAR_LBRACE :
+        getNextToken();
+        if (token == TokenNameIdentifier) {
+          getNextToken();
+          if (token == TokenNameLBRACKET) {
+            getNextToken();
+            //            if (token == TokenNameRBRACKET) {
+            //              getNextToken();
+            //            } else {
+            expr();
+            if (token != TokenNameRBRACKET) {
+              throwSyntaxError("']' expected after '${'.");
+            }
+            getNextToken();
+            //            }
+          }
+          if (token != TokenNameRBRACE) {
+            throwSyntaxError("'}' expected after '${'.");
+          }
+          //          scanner.encapsedStringStack.pop();
+          getNextToken();
+        } else {
+          expr();
+          if (token != TokenNameRBRACE) {
+            throwSyntaxError("'}' expected.");
+          }
+          //          scanner.encapsedStringStack.pop();
+          getNextToken();
+        }
+        break;
+      case TokenNameCURLY_OPEN :
+        getNextToken();
+        if (token == TokenNameIdentifier || token > TokenNameKEYWORD) {
+          getNextToken();
+          if (token == TokenNameLBRACKET) {
+            getNextToken();
+            //            if (token == TokenNameRBRACKET) {
+            //              getNextToken();
+            //            } else {
+            expr();
+            if (token != TokenNameRBRACKET) {
+              throwSyntaxError("']' expected after '{$'.");
+            }
+            getNextToken();
+            //            }
+          } else if (token == TokenNameMINUS_GREATER) {
+            getNextToken();
+            if (token != TokenNameIdentifier) {
+              throwSyntaxError("String token expected.");
+            }
+            getNextToken();
+          }
+          //          if (token != TokenNameRBRACE) {
+          //            throwSyntaxError("'}' expected after '{$'.");
+          //          }
+          //          // scanner.encapsedStringStack.pop();
+          //          getNextToken();
+        } else {
+          expr();
+          if (token != TokenNameRBRACE) {
+            throwSyntaxError("'}' expected.");
+          }
+          //          scanner.encapsedStringStack.pop();
+          getNextToken();
+        }
+        break;
+    }
+  }
+  private void encaps_var_offset() {
+    //  		T_STRING
+    //  	| T_NUM_STRING
+    //  	| T_VARIABLE
+    switch (token) {
+      case TokenNameSTRING :
+        getNextToken();
+        break;
+      case TokenNameIntegerLiteral :
+        getNextToken();
+        break;
+      case TokenNameVariable :
+        getNextToken();
+        break;
+      case TokenNameIdentifier :
+        getNextToken();
+        break;
+      default :
+        throwSyntaxError("Variable or String token expected.");
+        break;
+    }
+  }
+  private void internal_functions_in_yacc() {
+    int start = 0;
+    ImportReference impt = null;
+    switch (token) {
+      case TokenNameisset :
+        //	T_ISSET '(' isset_variables ')'
+        getNextToken();
+        if (token != TokenNameLPAREN) {
+          throwSyntaxError("'(' expected after keyword 'isset'");
+        }
+        getNextToken();
+        isset_variables();
+        if (token != TokenNameRPAREN) {
+          throwSyntaxError("')' expected after keyword 'isset'");
+        }
+        getNextToken();
+        break;
+      case TokenNameempty :
+        //	T_EMPTY '(' variable ')'
+        getNextToken();
+        if (token != TokenNameLPAREN) {
+          throwSyntaxError("'(' expected after keyword 'empty'");
+        }
+        getNextToken();
+        variable();
+        if (token != TokenNameRPAREN) {
+          throwSyntaxError("')' expected after keyword 'empty'");
+        }
+        getNextToken();
+        break;
+      case TokenNameinclude :
+        //T_INCLUDE expr
+        start = scanner.getCurrentTokenStartPosition();
+        getNextToken();
+        expr();
 
-	protected void resetModifiers() {
-		this.modifiers = AccDefault;
-		this.modifiersSourceStart = -1; // <-- see comment into
-										// modifiersFlag(int)
-		this.scanner.commentPtr = -1;
-	}
+        impt = new ImportReference(scanner.getCurrentTokenSource(start), start, scanner.getCurrentTokenEndPosition(), false);
+        impt.declarationSourceEnd = impt.sourceEnd;
+        impt.declarationEnd = impt.declarationSourceEnd;
+        //endPosition is just before the ;
+        impt.declarationSourceStart = start;
+        includesList.add(impt);
+        break;
+      case TokenNameinclude_once :
+        //	T_INCLUDE_ONCE expr
+        start = scanner.getCurrentTokenStartPosition();
+        getNextToken();
+        expr();
+        impt = new ImportReference(scanner.getCurrentTokenSource(start), start, scanner.getCurrentTokenEndPosition(), false);
+        impt.declarationSourceEnd = impt.sourceEnd;
+        impt.declarationEnd = impt.declarationSourceEnd;
+        //endPosition is just before the ;
+        impt.declarationSourceStart = start;
+        includesList.add(impt);
+        break;
+      case TokenNameeval :
+        //	T_EVAL '(' expr ')'
+        getNextToken();
+        if (token != TokenNameLPAREN) {
+          throwSyntaxError("'(' expected after keyword 'eval'");
+        }
+        getNextToken();
+        expr();
+        if (token != TokenNameRPAREN) {
+          throwSyntaxError("')' expected after keyword 'eval'");
+        }
+        getNextToken();
+        break;
+      case TokenNamerequire :
+        //T_REQUIRE expr
+        start = scanner.getCurrentTokenStartPosition();
+        getNextToken();
+        expr();
+        impt = new ImportReference(scanner.getCurrentTokenSource(start), start, scanner.getCurrentTokenEndPosition(), false);
+        impt.declarationSourceEnd = impt.sourceEnd;
+        impt.declarationEnd = impt.declarationSourceEnd;
+        //endPosition is just before the ;
+        impt.declarationSourceStart = start;
+        includesList.add(impt);
+        break;
+      case TokenNamerequire_once :
+        //	T_REQUIRE_ONCE expr
+        start = scanner.getCurrentTokenStartPosition();
+        getNextToken();
+        expr();
+        impt = new ImportReference(scanner.getCurrentTokenSource(start), start, scanner.getCurrentTokenEndPosition(), false);
+        impt.declarationSourceEnd = impt.sourceEnd;
+        impt.declarationEnd = impt.declarationSourceEnd;
+        //endPosition is just before the ;
+        impt.declarationSourceStart = start;
+        includesList.add(impt);
+        break;
+    }
+  }
+  private void isset_variables() {
+    //	variable
+    //	| isset_variables ','
+    if (token == TokenNameRPAREN) {
+      throwSyntaxError("Variable expected after keyword 'isset'");
+    }
+    while (true) {
+      variable();
+      if (token == TokenNameCOMMA) {
+        getNextToken();
+      } else {
+        break;
+      }
+    }
+  }
+  private boolean common_scalar() {
+    //  common_scalar:
+    //	T_LNUMBER
+    //	| T_DNUMBER
+    //	| T_CONSTANT_ENCAPSED_STRING
+    //	| T_LINE
+    //	| T_FILE
+    //	| T_CLASS_C
+    //	| T_METHOD_C
+    //	| T_FUNC_C
+    switch (token) {
+      case TokenNameIntegerLiteral :
+        getNextToken();
+        return true;
+      case TokenNameDoubleLiteral :
+        getNextToken();
+        return true;
+      case TokenNameStringLiteral :
+        getNextToken();
+        return true;
+      case TokenNameStringConstant :
+        getNextToken();
+        return true;
+      case TokenNameStringInterpolated :
+        getNextToken();
+        return true;
+      case TokenNameFILE :
+        getNextToken();
+        return true;
+      case TokenNameLINE :
+        getNextToken();
+        return true;
+      case TokenNameCLASS_C :
+        getNextToken();
+        return true;
+      case TokenNameMETHOD_C :
+        getNextToken();
+        return true;
+      case TokenNameFUNC_C :
+        getNextToken();
+        return true;
+    }
+    return false;
+  }
+  private void scalar() {
+    //  scalar:
+    //	T_STRING
+    //| T_STRING_VARNAME
+    //| class_constant
+    //| common_scalar
+    //| '"' encaps_list '"'
+    //| '\'' encaps_list '\''
+    //| T_START_HEREDOC encaps_list T_END_HEREDOC
+    throwSyntaxError("Not yet implemented (scalar).");
+  }
+  private void static_scalar() {
+    //    static_scalar: /* compile-time evaluated scalars */
+    //		common_scalar
+    //	| T_STRING
+    //	| '+' static_scalar
+    //	| '-' static_scalar
+    //	| T_ARRAY '(' static_array_pair_list ')'
+    //	| static_class_constant
+    if (common_scalar()) {
+      return;
+    }
+    switch (token) {
+      case TokenNameIdentifier :
+        getNextToken();
+        //        static_class_constant:
+        //  		T_STRING T_PAAMAYIM_NEKUDOTAYIM T_STRING
+        if (token == TokenNamePAAMAYIM_NEKUDOTAYIM) {
+          getNextToken();
+          if (token == TokenNameIdentifier) {
+            getNextToken();
+          } else {
+            throwSyntaxError("Identifier expected after '::' operator.");
+          }
+        }
+        break;
+      case TokenNameEncapsedString0 :
+        try {
+          scanner.currentCharacter = scanner.source[scanner.currentPosition++];
+          while (scanner.currentCharacter != '`') {
+            if (scanner.currentCharacter == '\\') {
+              scanner.currentPosition++;
+            }
+            scanner.currentCharacter = scanner.source[scanner.currentPosition++];
+          }
+          getNextToken();
+        } catch (IndexOutOfBoundsException e) {
+          throwSyntaxError("'`' expected at end of static string.");
+        }
+        break;
+      case TokenNameEncapsedString1 :
+        try {
+          scanner.currentCharacter = scanner.source[scanner.currentPosition++];
+          while (scanner.currentCharacter != '\'') {
+            if (scanner.currentCharacter == '\\') {
+              scanner.currentPosition++;
+            }
+            scanner.currentCharacter = scanner.source[scanner.currentPosition++];
+          }
+          getNextToken();
+        } catch (IndexOutOfBoundsException e) {
+          throwSyntaxError("'\'' expected at end of static string.");
+        }
+        break;
+      case TokenNameEncapsedString2 :
+        try {
+          scanner.currentCharacter = scanner.source[scanner.currentPosition++];
+          while (scanner.currentCharacter != '"') {
+            if (scanner.currentCharacter == '\\') {
+              scanner.currentPosition++;
+            }
+            scanner.currentCharacter = scanner.source[scanner.currentPosition++];
+          }
+          getNextToken();
+        } catch (IndexOutOfBoundsException e) {
+          throwSyntaxError("'\"' expected at end of static string.");
+        }
+        break;
+      case TokenNamePLUS :
+        getNextToken();
+        static_scalar();
+        break;
+      case TokenNameMINUS :
+        getNextToken();
+        static_scalar();
+        break;
+      case TokenNamearray :
+        getNextToken();
+        if (token != TokenNameLPAREN) {
+          throwSyntaxError("'(' expected after keyword 'array'");
+        }
+        getNextToken();
+        if (token == TokenNameRPAREN) {
+          getNextToken();
+          break;
+        }
+        non_empty_static_array_pair_list();
+        if (token != TokenNameRPAREN) {
+          throwSyntaxError("')' expected after keyword 'array'");
+        }
+        getNextToken();
+        break;
+      //      case TokenNamenull :
+      //        getNextToken();
+      //        break;
+      //      case TokenNamefalse :
+      //        getNextToken();
+      //        break;
+      //      case TokenNametrue :
+      //        getNextToken();
+      //        break;
+      default :
+        throwSyntaxError("Static scalar/constant expected.");
+    }
+  }
+  private void non_empty_static_array_pair_list() {
+    //  non_empty_static_array_pair_list:
+    //	non_empty_static_array_pair_list ',' static_scalar T_DOUBLE_ARROW
+    // static_scalar
+    //| non_empty_static_array_pair_list ',' static_scalar
+    //| static_scalar T_DOUBLE_ARROW static_scalar
+    //| static_scalar
+    while (true) {
+      static_scalar();
+      if (token == TokenNameEQUAL_GREATER) {
+        getNextToken();
+        static_scalar();
+      }
+      if (token != TokenNameCOMMA) {
+        break;
+      }
+      getNextToken();
+      if (token == TokenNameRPAREN) {
+        break;
+      }
+    }
+  }
+  public void reportSyntaxError() { //int act, int currentKind, int
+    // stateStackTop) {
+    /* remember current scanner position */
+    int startPos = scanner.startPosition;
+    int currentPos = scanner.currentPosition;
+    //		String[] expectings;
+    //		String tokenName = name[symbol_index[currentKind]];
+    //fetch all "accurate" possible terminals that could recover the error
+    //		int start, end = start = asi(stack[stateStackTop]);
+    //		while (asr[end] != 0)
+    //			end++;
+    //		int length = end - start;
+    //		expectings = new String[length];
+    //		if (length != 0) {
+    //			char[] indexes = new char[length];
+    //			System.arraycopy(asr, start, indexes, 0, length);
+    //			for (int i = 0; i < length; i++) {
+    //				expectings[i] = name[symbol_index[indexes[i]]];
+    //			}
+    //		}
+    //if the pb is an EOF, try to tell the user that they are some
+    //		if (tokenName.equals(UNEXPECTED_EOF)) {
+    //			if (!this.checkAndReportBracketAnomalies(problemReporter())) {
+    //				char[] tokenSource;
+    //				try {
+    //					tokenSource = this.scanner.getCurrentTokenSource();
+    //				} catch (Exception e) {
+    //					tokenSource = new char[] {};
+    //				}
+    //				problemReporter().parseError(
+    //					this.scanner.startPosition,
+    //					this.scanner.currentPosition - 1,
+    //					tokenSource,
+    //					tokenName,
+    //					expectings);
+    //			}
+    //		} else { //the next test is HEAVILY grammar DEPENDENT.
+    //			if ((length == 14)
+    //				&& (expectings[0] == "=") //$NON-NLS-1$
+    //				&& (expectings[1] == "*=") //$NON-NLS-1$
+    //				&& (expressionPtr > -1)) {
+    //					switch(currentKind) {
+    //						case TokenNameSEMICOLON:
+    //						case TokenNamePLUS:
+    //						case TokenNameMINUS:
+    //						case TokenNameDIVIDE:
+    //						case TokenNameREMAINDER:
+    //						case TokenNameMULTIPLY:
+    //						case TokenNameLEFT_SHIFT:
+    //						case TokenNameRIGHT_SHIFT:
+    //// case TokenNameUNSIGNED_RIGHT_SHIFT:
+    //						case TokenNameLESS:
+    //						case TokenNameGREATER:
+    //						case TokenNameLESS_EQUAL:
+    //						case TokenNameGREATER_EQUAL:
+    //						case TokenNameEQUAL_EQUAL:
+    //						case TokenNameNOT_EQUAL:
+    //						case TokenNameXOR:
+    //						case TokenNameAND:
+    //						case TokenNameOR:
+    //						case TokenNameOR_OR:
+    //						case TokenNameAND_AND:
+    //							// the ; is not the expected token ==> it ends a statement when an
+    // expression is not ended
+    //							problemReporter().invalidExpressionAsStatement(expressionStack[expressionPtr]);
+    //							break;
+    //						case TokenNameRBRACE :
+    //							problemReporter().missingSemiColon(expressionStack[expressionPtr]);
+    //							break;
+    //						default:
+    //							char[] tokenSource;
+    //							try {
+    //								tokenSource = this.scanner.getCurrentTokenSource();
+    //							} catch (Exception e) {
+    //								tokenSource = new char[] {};
+    //							}
+    //							problemReporter().parseError(
+    //								this.scanner.startPosition,
+    //								this.scanner.currentPosition - 1,
+    //								tokenSource,
+    //								tokenName,
+    //								expectings);
+    //							this.checkAndReportBracketAnomalies(problemReporter());
+    //					}
+    //			} else {
+    char[] tokenSource;
+    try {
+      tokenSource = this.scanner.getCurrentTokenSource();
+    } catch (Exception e) {
+      tokenSource = new char[]{};
+    }
+    //				problemReporter().parseError(
+    //					this.scanner.startPosition,
+    //					this.scanner.currentPosition - 1,
+    //					tokenSource,
+    //					tokenName,
+    //					expectings);
+    this.checkAndReportBracketAnomalies(problemReporter());
+    //			}
+    //		}
+    /* reset scanner where it was */
+    scanner.startPosition = startPos;
+    scanner.currentPosition = currentPos;
+  }
+  public static final int RoundBracket = 0;
+  public static final int SquareBracket = 1;
+  public static final int CurlyBracket = 2;
+  public static final int BracketKinds = 3;
+  protected int[] nestedMethod; //the ptr is nestedType
+  protected int nestedType, dimensions;
+  //ast stack
+  final static int AstStackIncrement = 100;
+  protected int astPtr;
+  protected AstNode[] astStack = new AstNode[AstStackIncrement];
+  protected int astLengthPtr;
+  protected int[] astLengthStack;
+  AstNode[] noAstNodes = new AstNode[AstStackIncrement];
+  public CompilationUnitDeclaration compilationUnit; /*
+                                                      * the result from parse()
+                                                      */
+  protected ReferenceContext referenceContext;
+  protected ProblemReporter problemReporter;
+  protected CompilerOptions options;
+  private ArrayList includesList;
+  //  protected CompilationResult compilationResult;
+  /**
+   * Returns this parser's problem reporter initialized with its reference
+   * context. Also it is assumed that a problem is going to be reported, so
+   * initializes the compilation result's line positions.
+   */
+  public ProblemReporter problemReporter() {
+    if (scanner.recordLineSeparator) {
+      compilationUnit.compilationResult.lineSeparatorPositions = scanner.getLineEnds();
+    }
+    problemReporter.referenceContext = referenceContext;
+    return problemReporter;
+  }
+  /*
+   * Reconsider the entire source looking for inconsistencies in {} () []
+   */
+  public boolean checkAndReportBracketAnomalies(ProblemReporter problemReporter) {
+    scanner.wasAcr = false;
+    boolean anomaliesDetected = false;
+    try {
+      char[] source = scanner.source;
+      int[] leftCount = {0, 0, 0};
+      int[] rightCount = {0, 0, 0};
+      int[] depths = {0, 0, 0};
+      int[][] leftPositions = new int[][]{new int[10], new int[10], new int[10]};
+      int[][] leftDepths = new int[][]{new int[10], new int[10], new int[10]};
+      int[][] rightPositions = new int[][]{new int[10], new int[10], new int[10]};
+      int[][] rightDepths = new int[][]{new int[10], new int[10], new int[10]};
+      scanner.currentPosition = scanner.initialPosition; //starting
+      // point
+      // (first-zero-based
+      // char)
+      while (scanner.currentPosition < scanner.eofPosition) { //loop for
+        // jumping
+        // over
+        // comments
+        try {
+          // ---------Consume white space and handles
+          // startPosition---------
+          boolean isWhiteSpace;
+          do {
+            scanner.startPosition = scanner.currentPosition;
+            //						if (((scanner.currentCharacter =
+            // source[scanner.currentPosition++]) == '\\') &&
+            // (source[scanner.currentPosition] == 'u')) {
+            //							isWhiteSpace = scanner.jumpOverUnicodeWhiteSpace();
+            //						} else {
+            if (scanner.recordLineSeparator && ((scanner.currentCharacter == '\r') || (scanner.currentCharacter == '\n'))) {
+              if (scanner.lineEnds[scanner.linePtr] < scanner.startPosition) {
+                // only record line positions we have not
+                // recorded yet
+                scanner.pushLineSeparator();
+              }
+            }
+            isWhiteSpace = CharOperation.isWhitespace(scanner.currentCharacter);
+            //						}
+          } while (isWhiteSpace && (scanner.currentPosition < scanner.eofPosition));
+          // -------consume token until } is found---------
+          switch (scanner.currentCharacter) {
+            case '{' : {
+              int index = leftCount[CurlyBracket]++;
+              if (index == leftPositions[CurlyBracket].length) {
+                System.arraycopy(leftPositions[CurlyBracket], 0, (leftPositions[CurlyBracket] = new int[index * 2]), 0, index);
+                System.arraycopy(leftDepths[CurlyBracket], 0, (leftDepths[CurlyBracket] = new int[index * 2]), 0, index);
+              }
+              leftPositions[CurlyBracket][index] = scanner.startPosition;
+              leftDepths[CurlyBracket][index] = depths[CurlyBracket]++;
+            }
+              break;
+            case '}' : {
+              int index = rightCount[CurlyBracket]++;
+              if (index == rightPositions[CurlyBracket].length) {
+                System.arraycopy(rightPositions[CurlyBracket], 0, (rightPositions[CurlyBracket] = new int[index * 2]), 0, index);
+                System.arraycopy(rightDepths[CurlyBracket], 0, (rightDepths[CurlyBracket] = new int[index * 2]), 0, index);
+              }
+              rightPositions[CurlyBracket][index] = scanner.startPosition;
+              rightDepths[CurlyBracket][index] = --depths[CurlyBracket];
+            }
+              break;
+            case '(' : {
+              int index = leftCount[RoundBracket]++;
+              if (index == leftPositions[RoundBracket].length) {
+                System.arraycopy(leftPositions[RoundBracket], 0, (leftPositions[RoundBracket] = new int[index * 2]), 0, index);
+                System.arraycopy(leftDepths[RoundBracket], 0, (leftDepths[RoundBracket] = new int[index * 2]), 0, index);
+              }
+              leftPositions[RoundBracket][index] = scanner.startPosition;
+              leftDepths[RoundBracket][index] = depths[RoundBracket]++;
+            }
+              break;
+            case ')' : {
+              int index = rightCount[RoundBracket]++;
+              if (index == rightPositions[RoundBracket].length) {
+                System.arraycopy(rightPositions[RoundBracket], 0, (rightPositions[RoundBracket] = new int[index * 2]), 0, index);
+                System.arraycopy(rightDepths[RoundBracket], 0, (rightDepths[RoundBracket] = new int[index * 2]), 0, index);
+              }
+              rightPositions[RoundBracket][index] = scanner.startPosition;
+              rightDepths[RoundBracket][index] = --depths[RoundBracket];
+            }
+              break;
+            case '[' : {
+              int index = leftCount[SquareBracket]++;
+              if (index == leftPositions[SquareBracket].length) {
+                System.arraycopy(leftPositions[SquareBracket], 0, (leftPositions[SquareBracket] = new int[index * 2]), 0, index);
+                System.arraycopy(leftDepths[SquareBracket], 0, (leftDepths[SquareBracket] = new int[index * 2]), 0, index);
+              }
+              leftPositions[SquareBracket][index] = scanner.startPosition;
+              leftDepths[SquareBracket][index] = depths[SquareBracket]++;
+            }
+              break;
+            case ']' : {
+              int index = rightCount[SquareBracket]++;
+              if (index == rightPositions[SquareBracket].length) {
+                System.arraycopy(rightPositions[SquareBracket], 0, (rightPositions[SquareBracket] = new int[index * 2]), 0, index);
+                System.arraycopy(rightDepths[SquareBracket], 0, (rightDepths[SquareBracket] = new int[index * 2]), 0, index);
+              }
+              rightPositions[SquareBracket][index] = scanner.startPosition;
+              rightDepths[SquareBracket][index] = --depths[SquareBracket];
+            }
+              break;
+            case '\'' : {
+              if (scanner.getNextChar('\\')) {
+                scanner.scanEscapeCharacter();
+              } else { // consume next character
+                scanner.unicodeAsBackSlash = false;
+                //									if (((scanner.currentCharacter =
+                // source[scanner.currentPosition++]) ==
+                // '\\') &&
+                // (source[scanner.currentPosition] ==
+                // 'u')) {
+                //										scanner.getNextUnicodeChar();
+                //									} else {
+                if (scanner.withoutUnicodePtr != 0) {
+                  scanner.withoutUnicodeBuffer[++scanner.withoutUnicodePtr] = scanner.currentCharacter;
+                }
+                //									}
+              }
+              scanner.getNextChar('\'');
+              break;
+            }
+            case '"' :
+              // consume next character
+              scanner.unicodeAsBackSlash = false;
+              //							if (((scanner.currentCharacter =
+              // source[scanner.currentPosition++]) == '\\') &&
+              // (source[scanner.currentPosition] == 'u')) {
+              //								scanner.getNextUnicodeChar();
+              //							} else {
+              if (scanner.withoutUnicodePtr != 0) {
+                scanner.withoutUnicodeBuffer[++scanner.withoutUnicodePtr] = scanner.currentCharacter;
+              }
+              //							}
+              while (scanner.currentCharacter != '"') {
+                if (scanner.currentCharacter == '\r') {
+                  if (source[scanner.currentPosition] == '\n')
+                    scanner.currentPosition++;
+                  break; // the string cannot go further that
+                  // the line
+                }
+                if (scanner.currentCharacter == '\n') {
+                  break; // the string cannot go further that
+                  // the line
+                }
+                if (scanner.currentCharacter == '\\') {
+                  scanner.scanEscapeCharacter();
+                }
+                // consume next character
+                scanner.unicodeAsBackSlash = false;
+                //								if (((scanner.currentCharacter =
+                // source[scanner.currentPosition++]) == '\\')
+                // && (source[scanner.currentPosition] == 'u'))
+                // {
+                //									scanner.getNextUnicodeChar();
+                //								} else {
+                if (scanner.withoutUnicodePtr != 0) {
+                  scanner.withoutUnicodeBuffer[++scanner.withoutUnicodePtr] = scanner.currentCharacter;
+                }
+                //								}
+              }
+              break;
+            case '/' : {
+              int test;
+              if ((test = scanner.getNextChar('/', '*')) == 0) { //line
+                // comment
+                //get the next char
+                if (((scanner.currentCharacter = source[scanner.currentPosition++]) == '\\')
+                    && (source[scanner.currentPosition] == 'u')) {
+                  //-------------unicode traitement
+                  // ------------
+                  int c1 = 0, c2 = 0, c3 = 0, c4 = 0;
+                  scanner.currentPosition++;
+                  while (source[scanner.currentPosition] == 'u') {
+                    scanner.currentPosition++;
+                  }
+                  if ((c1 = Character.getNumericValue(source[scanner.currentPosition++])) > 15 || c1 < 0
+                      || (c2 = Character.getNumericValue(source[scanner.currentPosition++])) > 15 || c2 < 0
+                      || (c3 = Character.getNumericValue(source[scanner.currentPosition++])) > 15 || c3 < 0
+                      || (c4 = Character.getNumericValue(source[scanner.currentPosition++])) > 15 || c4 < 0) { //error
+                                                                                                               // don't
+                    // care of the
+                    // value
+                    scanner.currentCharacter = 'A';
+                  } //something different from \n and \r
+                  else {
+                    scanner.currentCharacter = (char) (((c1 * 16 + c2) * 16 + c3) * 16 + c4);
+                  }
+                }
+                while (scanner.currentCharacter != '\r' && scanner.currentCharacter != '\n') {
+                  //get the next char
+                  scanner.startPosition = scanner.currentPosition;
+                  if (((scanner.currentCharacter = source[scanner.currentPosition++]) == '\\')
+                      && (source[scanner.currentPosition] == 'u')) {
+                    //-------------unicode traitement
+                    // ------------
+                    int c1 = 0, c2 = 0, c3 = 0, c4 = 0;
+                    scanner.currentPosition++;
+                    while (source[scanner.currentPosition] == 'u') {
+                      scanner.currentPosition++;
+                    }
+                    if ((c1 = Character.getNumericValue(source[scanner.currentPosition++])) > 15 || c1 < 0
+                        || (c2 = Character.getNumericValue(source[scanner.currentPosition++])) > 15 || c2 < 0
+                        || (c3 = Character.getNumericValue(source[scanner.currentPosition++])) > 15 || c3 < 0
+                        || (c4 = Character.getNumericValue(source[scanner.currentPosition++])) > 15 || c4 < 0) { //error
+                                                                                                                 // don't
+                      // care of the
+                      // value
+                      scanner.currentCharacter = 'A';
+                    } //something different from \n
+                    // and \r
+                    else {
+                      scanner.currentCharacter = (char) (((c1 * 16 + c2) * 16 + c3) * 16 + c4);
+                    }
+                  }
+                }
+                if (scanner.recordLineSeparator && ((scanner.currentCharacter == '\r') || (scanner.currentCharacter == '\n'))) {
+                  if (scanner.lineEnds[scanner.linePtr] < scanner.startPosition) {
+                    // only record line positions we
+                    // have not recorded yet
+                    scanner.pushLineSeparator();
+                    if (this.scanner.taskTags != null) {
+                      this.scanner.checkTaskTag(this.scanner.getCurrentTokenStartPosition(), this.scanner
+                          .getCurrentTokenEndPosition());
+                    }
+                  }
+                }
+                break;
+              }
+              if (test > 0) { //traditional and annotation
+                // comment
+                boolean star = false;
+                // consume next character
+                scanner.unicodeAsBackSlash = false;
+                //									if (((scanner.currentCharacter =
+                // source[scanner.currentPosition++]) ==
+                // '\\') &&
+                // (source[scanner.currentPosition] ==
+                // 'u')) {
+                //										scanner.getNextUnicodeChar();
+                //									} else {
+                if (scanner.withoutUnicodePtr != 0) {
+                  scanner.withoutUnicodeBuffer[++scanner.withoutUnicodePtr] = scanner.currentCharacter;
+                }
+                //									}
+                if (scanner.currentCharacter == '*') {
+                  star = true;
+                }
+                //get the next char
+                if (((scanner.currentCharacter = source[scanner.currentPosition++]) == '\\')
+                    && (source[scanner.currentPosition] == 'u')) {
+                  //-------------unicode traitement
+                  // ------------
+                  int c1 = 0, c2 = 0, c3 = 0, c4 = 0;
+                  scanner.currentPosition++;
+                  while (source[scanner.currentPosition] == 'u') {
+                    scanner.currentPosition++;
+                  }
+                  if ((c1 = Character.getNumericValue(source[scanner.currentPosition++])) > 15 || c1 < 0
+                      || (c2 = Character.getNumericValue(source[scanner.currentPosition++])) > 15 || c2 < 0
+                      || (c3 = Character.getNumericValue(source[scanner.currentPosition++])) > 15 || c3 < 0
+                      || (c4 = Character.getNumericValue(source[scanner.currentPosition++])) > 15 || c4 < 0) { //error
+                                                                                                               // don't
+                    // care of the
+                    // value
+                    scanner.currentCharacter = 'A';
+                  } //something different from * and /
+                  else {
+                    scanner.currentCharacter = (char) (((c1 * 16 + c2) * 16 + c3) * 16 + c4);
+                  }
+                }
+                //loop until end of comment */
+                while ((scanner.currentCharacter != '/') || (!star)) {
+                  star = scanner.currentCharacter == '*';
+                  //get next char
+                  if (((scanner.currentCharacter = source[scanner.currentPosition++]) == '\\')
+                      && (source[scanner.currentPosition] == 'u')) {
+                    //-------------unicode traitement
+                    // ------------
+                    int c1 = 0, c2 = 0, c3 = 0, c4 = 0;
+                    scanner.currentPosition++;
+                    while (source[scanner.currentPosition] == 'u') {
+                      scanner.currentPosition++;
+                    }
+                    if ((c1 = Character.getNumericValue(source[scanner.currentPosition++])) > 15 || c1 < 0
+                        || (c2 = Character.getNumericValue(source[scanner.currentPosition++])) > 15 || c2 < 0
+                        || (c3 = Character.getNumericValue(source[scanner.currentPosition++])) > 15 || c3 < 0
+                        || (c4 = Character.getNumericValue(source[scanner.currentPosition++])) > 15 || c4 < 0) { //error
+                                                                                                                 // don't
+                      // care of the
+                      // value
+                      scanner.currentCharacter = 'A';
+                    } //something different from * and
+                    // /
+                    else {
+                      scanner.currentCharacter = (char) (((c1 * 16 + c2) * 16 + c3) * 16 + c4);
+                    }
+                  }
+                }
+                if (this.scanner.taskTags != null) {
+                  this.scanner.checkTaskTag(this.scanner.getCurrentTokenStartPosition(), this.scanner.getCurrentTokenEndPosition());
+                }
+                break;
+              }
+              break;
+            }
+            default :
+              if (Scanner.isPHPIdentifierStart(scanner.currentCharacter)) {
+                scanner.scanIdentifierOrKeyword(false);
+                break;
+              }
+              if (Character.isDigit(scanner.currentCharacter)) {
+                scanner.scanNumber(false);
+                break;
+              }
+          }
+          //-----------------end switch while
+          // try--------------------
+        } catch (IndexOutOfBoundsException e) {
+          break; // read until EOF
+        } catch (InvalidInputException e) {
+          return false; // no clue
+        }
+      }
+      if (scanner.recordLineSeparator) {
+        //				compilationUnit.compilationResult.lineSeparatorPositions =
+        // scanner.getLineEnds();
+      }
+      // check placement anomalies against other kinds of brackets
+      for (int kind = 0; kind < BracketKinds; kind++) {
+        for (int leftIndex = leftCount[kind] - 1; leftIndex >= 0; leftIndex--) {
+          int start = leftPositions[kind][leftIndex]; // deepest
+          // first
+          // find matching closing bracket
+          int depth = leftDepths[kind][leftIndex];
+          int end = -1;
+          for (int i = 0; i < rightCount[kind]; i++) {
+            int pos = rightPositions[kind][i];
+            // want matching bracket further in source with same
+            // depth
+            if ((pos > start) && (depth == rightDepths[kind][i])) {
+              end = pos;
+              break;
+            }
+          }
+          if (end < 0) { // did not find a good closing match
+            problemReporter.unmatchedBracket(start, referenceContext, compilationUnit.compilationResult);
+            return true;
+          }
+          // check if even number of opening/closing other brackets
+          // in between this pair of brackets
+          int balance = 0;
+          for (int otherKind = 0; (balance == 0) && (otherKind < BracketKinds); otherKind++) {
+            for (int i = 0; i < leftCount[otherKind]; i++) {
+              int pos = leftPositions[otherKind][i];
+              if ((pos > start) && (pos < end))
+                balance++;
+            }
+            for (int i = 0; i < rightCount[otherKind]; i++) {
+              int pos = rightPositions[otherKind][i];
+              if ((pos > start) && (pos < end))
+                balance--;
+            }
+            if (balance != 0) {
+              problemReporter.unmatchedBracket(start, referenceContext, compilationUnit.compilationResult); //bracket
+              // anomaly
+              return true;
+            }
+          }
+        }
+        // too many opening brackets ?
+        for (int i = rightCount[kind]; i < leftCount[kind]; i++) {
+          anomaliesDetected = true;
+          problemReporter.unmatchedBracket(leftPositions[kind][leftCount[kind] - i - 1], referenceContext,
+              compilationUnit.compilationResult);
+        }
+        // too many closing brackets ?
+        for (int i = leftCount[kind]; i < rightCount[kind]; i++) {
+          anomaliesDetected = true;
+          problemReporter.unmatchedBracket(rightPositions[kind][i], referenceContext, compilationUnit.compilationResult);
+        }
+        if (anomaliesDetected)
+          return true;
+      }
+      return anomaliesDetected;
+    } catch (ArrayStoreException e) { // jdk1.2.2 jit bug
+      return anomaliesDetected;
+    } catch (NullPointerException e) { // jdk1.2.2 jit bug
+      return anomaliesDetected;
+    }
+  }
+  protected void pushOnAstLengthStack(int pos) {
+    try {
+      astLengthStack[++astLengthPtr] = pos;
+    } catch (IndexOutOfBoundsException e) {
+      int oldStackLength = astLengthStack.length;
+      int[] oldPos = astLengthStack;
+      astLengthStack = new int[oldStackLength + StackIncrement];
+      System.arraycopy(oldPos, 0, astLengthStack, 0, oldStackLength);
+      astLengthStack[astLengthPtr] = pos;
+    }
+  }
+  protected void pushOnAstStack(AstNode node) {
+    /*
+     * add a new obj on top of the ast stack
+     */
+    try {
+      astStack[++astPtr] = node;
+    } catch (IndexOutOfBoundsException e) {
+      int oldStackLength = astStack.length;
+      AstNode[] oldStack = astStack;
+      astStack = new AstNode[oldStackLength + AstStackIncrement];
+      System.arraycopy(oldStack, 0, astStack, 0, oldStackLength);
+      astPtr = oldStackLength;
+      astStack[astPtr] = node;
+    }
+    try {
+      astLengthStack[++astLengthPtr] = 1;
+    } catch (IndexOutOfBoundsException e) {
+      int oldStackLength = astLengthStack.length;
+      int[] oldPos = astLengthStack;
+      astLengthStack = new int[oldStackLength + AstStackIncrement];
+      System.arraycopy(oldPos, 0, astLengthStack, 0, oldStackLength);
+      astLengthStack[astLengthPtr] = 1;
+    }
+  }
+
+  protected void resetModifiers() {
+    this.modifiers = AccDefault;
+    this.modifiersSourceStart = -1; // <-- see comment into
+    // modifiersFlag(int)
+    this.scanner.commentPtr = -1;
+  }
 }
\ No newline at end of file
diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/parser/SourceTypeConverter.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/parser/SourceTypeConverter.java
index 732407a..4452e00 100644
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/parser/SourceTypeConverter.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/parser/SourceTypeConverter.java
@@ -103,16 +103,16 @@ public class SourceTypeConverter implements CompilerModifiers {
 		int end = sourceType.getNameSourceEnd();
 
 		/* convert package and imports */
-		if (sourceType.getPackageName() != null
-			&& sourceType.getPackageName().length > 0)
-			// if its null then it is defined in the default package
-			this.unit.currentPackage =
-				createImportReference(sourceType.getPackageName(), start, end);
+//		if (sourceType.getPackageName() != null
+//			&& sourceType.getPackageName().length > 0)
+//			// if its null then it is defined in the default package
+//			this.unit.currentPackage =
+//				createImportReference(sourceType.getPackageName(), start, end);
 		char[][] importNames = sourceType.getImports();
 		int importCount = importNames == null ? 0 : importNames.length;
 		this.unit.imports = new ImportReference[importCount];
-		for (int i = 0; i < importCount; i++)
-			this.unit.imports[i] = createImportReference(importNames[i], start, end);
+//		for (int i = 0; i < importCount; i++)
+//			this.unit.imports[i] = createImportReference(importNames[i], start, end);
 		/* convert type(s) */
 		int typeCount = sourceTypes.length;
 		this.unit.types = new ArrayList(typeCount);
@@ -313,33 +313,33 @@ public class SourceTypeConverter implements CompilerModifiers {
 	/*
 	 * Build an import reference from an import name, e.g. java.lang.*
 	 */
-	private ImportReference createImportReference(
-		char[] importName,
-		int start,
-		int end) {
-
-		/* count identifiers */
-		int max = importName.length;
-		int identCount = 0;
-		for (int i = 0; i < max; i++) {
-			if (importName[i] == '.')
-				identCount++;
-		}
-		/* import on demand? */
-		boolean onDemand = importName[max - 1] == '*';
-		if (!onDemand)
-			identCount++; // one more ident than dots
-
-		long[] positions = new long[identCount];
-		long position = (long) start << 32 + end;
-		for (int i = 0; i < identCount; i++) {
-			positions[i] = position;
-		}
-		return new ImportReference(
-			CharOperation.splitOn('.', importName, 0, max - (onDemand ? 2 : 0)),
-			positions,
-			onDemand);
-	}
+//	private ImportReference createImportReference(
+//		char[] importName,
+//		int start,
+//		int end) {
+//
+//		/* count identifiers */
+//		int max = importName.length;
+//		int identCount = 0;
+//		for (int i = 0; i < max; i++) {
+//			if (importName[i] == '.')
+//				identCount++;
+//		}
+//		/* import on demand? */
+//		boolean onDemand = importName[max - 1] == '*';
+//		if (!onDemand)
+//			identCount++; // one more ident than dots
+//
+//		long[] positions = new long[identCount];
+//		long position = (long) start << 32 + end;
+//		for (int i = 0; i < identCount; i++) {
+//			positions[i] = position;
+//		}
+//		return new ImportReference(
+//			CharOperation.splitOn('.', importName, 0, max - (onDemand ? 2 : 0)),
+//			positions,
+//			onDemand);
+//	}
 
 	/*
 	 * Build a type reference from a readable name, e.g. java.lang.Object[][]
diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/problem/ProblemReporter.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/problem/ProblemReporter.java
index dfb3f18..9df2dae 100644
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/problem/ProblemReporter.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/problem/ProblemReporter.java
@@ -295,11 +295,11 @@ public class ProblemReporter extends ProblemHandler implements ProblemReasons {
         new String(method.selector), parametersAsShortString(method)},
         messageSend.sourceStart, messageSend.sourceEnd);
   }
-  public void cannotImportPackage(ImportReference importRef) {
-    String[] arguments = new String[]{CharOperation.toString(importRef.tokens)};
-    this.handle(IProblem.CannotImportPackage, arguments, arguments,
-        importRef.sourceStart, importRef.sourceEnd);
-  }
+//  public void cannotImportPackage(ImportReference importRef) {
+//    String[] arguments = new String[]{CharOperation.toString(importRef.tokens)};
+//    this.handle(IProblem.CannotImportPackage, arguments, arguments,
+//        importRef.sourceStart, importRef.sourceEnd);
+//  }
   public void cannotInstantiate(TypeReference typeRef, TypeBinding type) {
     this.handle(IProblem.InvalidClassInstantiation, new String[]{new String(
         type.readableName())},
@@ -556,11 +556,11 @@ public class ProblemReporter extends ProblemHandler implements ProblemReasons {
   //		expression.sourceStart,
   //		expression.sourceEnd);
   //}
-  public void conflictingImport(ImportReference importRef) {
-    String[] arguments = new String[]{CharOperation.toString(importRef.tokens)};
-    this.handle(IProblem.ConflictingImport, arguments, arguments,
-        importRef.sourceStart, importRef.sourceEnd);
-  }
+//  public void conflictingImport(ImportReference importRef) {
+//    String[] arguments = new String[]{CharOperation.toString(importRef.tokens)};
+//    this.handle(IProblem.ConflictingImport, arguments, arguments,
+//        importRef.sourceStart, importRef.sourceEnd);
+//  }
   public void constantOutOfFormat(NumberLiteral lit) {
     // the literal is not in a correct format
     // this code is called on IntLiteral and LongLiteral
@@ -651,11 +651,11 @@ public class ProblemReporter extends ProblemHandler implements ProblemReasons {
         new String(type.shortReadableName()), fieldDecl.name()},
         fieldDecl.sourceStart, fieldDecl.sourceEnd);
   }
-  public void duplicateImport(ImportReference importRef) {
-    String[] arguments = new String[]{CharOperation.toString(importRef.tokens)};
-    this.handle(IProblem.DuplicateImport, arguments, arguments,
-        importRef.sourceStart, importRef.sourceEnd);
-  }
+//  public void duplicateImport(ImportReference importRef) {
+//    String[] arguments = new String[]{CharOperation.toString(importRef.tokens)};
+//    this.handle(IProblem.DuplicateImport, arguments, arguments,
+//        importRef.sourceStart, importRef.sourceEnd);
+//  }
   public void duplicateInitializationOfBlankFinalField(FieldBinding field,
       Reference reference) {
     String[] arguments = new String[]{new String(field.readableName())};
@@ -1052,48 +1052,48 @@ public class ProblemReporter extends ProblemHandler implements ProblemReasons {
     this.handle(IProblem.InvalidVoidExpression, NoArgument, NoArgument,
         location.sourceStart, location.sourceEnd);
   }
-  public void importProblem(ImportReference importRef, Binding expectedImport) {
-    int problemId = expectedImport.problemId();
-    int id;
-    switch (problemId) {
-      case NotFound :
-        // 1
-        id = IProblem.ImportNotFound;
-        break;
-      case NotVisible :
-        // 2
-        id = IProblem.ImportNotVisible;
-        break;
-      case Ambiguous :
-        // 3
-        id = IProblem.ImportAmbiguous;
-        break;
-      case InternalNameProvided :
-        // 4
-        id = IProblem.ImportInternalNameProvided;
-        break;
-      case InheritedNameHidesEnclosingName :
-        // 5
-        id = IProblem.ImportInheritedNameHidesEnclosingName;
-        break;
-      case NoError :
-      // 0
-      default :
-        needImplementation(); // want to fail to see why we were
-        // here...
-        return;
-    }
-    String argument;
-    if (expectedImport instanceof ProblemReferenceBinding) {
-      argument = CharOperation
-          .toString(((ProblemReferenceBinding) expectedImport).compoundName);
-    } else {
-      argument = CharOperation.toString(importRef.tokens);
-    }
-    String[] arguments = new String[]{argument};
-    this.handle(id, arguments, arguments, importRef.sourceStart,
-        importRef.sourceEnd);
-  }
+//  public void importProblem(ImportReference importRef, Binding expectedImport) {
+//    int problemId = expectedImport.problemId();
+//    int id;
+//    switch (problemId) {
+//      case NotFound :
+//        // 1
+//        id = IProblem.ImportNotFound;
+//        break;
+//      case NotVisible :
+//        // 2
+//        id = IProblem.ImportNotVisible;
+//        break;
+//      case Ambiguous :
+//        // 3
+//        id = IProblem.ImportAmbiguous;
+//        break;
+//      case InternalNameProvided :
+//        // 4
+//        id = IProblem.ImportInternalNameProvided;
+//        break;
+//      case InheritedNameHidesEnclosingName :
+//        // 5
+//        id = IProblem.ImportInheritedNameHidesEnclosingName;
+//        break;
+//      case NoError :
+//      // 0
+//      default :
+//        needImplementation(); // want to fail to see why we were
+//        // here...
+//        return;
+//    }
+//    String argument;
+//    if (expectedImport instanceof ProblemReferenceBinding) {
+//      argument = CharOperation
+//          .toString(((ProblemReferenceBinding) expectedImport).compoundName);
+//    } else {
+//      argument = CharOperation.toString(importRef.tokens);
+//    }
+//    String[] arguments = new String[]{argument};
+//    this.handle(id, arguments, arguments, importRef.sourceStart,
+//        importRef.sourceEnd);
+//  }
   public void incompatibleExceptionInThrowsClause(SourceTypeBinding type,
       MethodBinding currentMethod, MethodBinding inheritedMethod,
       ReferenceBinding exceptionType) {
@@ -1956,13 +1956,13 @@ public class ProblemReporter extends ProblemHandler implements ProblemReasons {
             new String(inheritedMethod.declaringClass.shortReadableName())},
         localMethod.sourceStart(), localMethod.sourceEnd());
   }
-  public void packageCollidesWithType(CompilationUnitDeclaration compUnitDecl) {
-    String[] arguments = new String[]{CharOperation
-        .toString(compUnitDecl.currentPackage.tokens)};
-    this.handle(IProblem.PackageCollidesWithType, arguments, arguments,
-        compUnitDecl.currentPackage.sourceStart,
-        compUnitDecl.currentPackage.sourceEnd);
-  }
+//  public void packageCollidesWithType(CompilationUnitDeclaration compUnitDecl) {
+//    String[] arguments = new String[]{CharOperation
+//        .toString(compUnitDecl.currentPackage.tokens)};
+//    this.handle(IProblem.PackageCollidesWithType, arguments, arguments,
+//        compUnitDecl.currentPackage.sourceStart,
+//        compUnitDecl.currentPackage.sourceEnd);
+//  }
   public void packageIsNotExpectedPackage(
       CompilationUnitDeclaration compUnitDecl) {
     String[] arguments = new String[]{CharOperation
@@ -2441,11 +2441,11 @@ public class ProblemReporter extends ProblemHandler implements ProblemReasons {
     this.handle(IProblem.ArgumentIsNeverUsed, arguments, arguments,
         localDecl.sourceStart, localDecl.sourceEnd);
   }
-  public void unusedImport(ImportReference importRef) {
-    String[] arguments = new String[]{CharOperation.toString(importRef.tokens)};
-    this.handle(IProblem.UnusedImport, arguments, arguments,
-        importRef.sourceStart, importRef.sourceEnd);
-  }
+//  public void unusedImport(ImportReference importRef) {
+//    String[] arguments = new String[]{CharOperation.toString(importRef.tokens)};
+//    this.handle(IProblem.UnusedImport, arguments, arguments,
+//        importRef.sourceStart, importRef.sourceEnd);
+//  }
   public void unusedLocalVariable(LocalDeclaration localDecl) {
     String[] arguments = new String[]{localDecl.name()};
     this.handle(IProblem.LocalVariableIsNeverUsed, arguments, arguments,
diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/CompilationUnit.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/CompilationUnit.java
index e93d7c9..72e516f 100644
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/CompilationUnit.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/CompilationUnit.java
@@ -558,7 +558,7 @@ public IImportDeclaration getImport(String importName) {
 /**
  * @see ICompilationUnit#getImportContainer()
  */
-public IImportContainer getImportContainer() {
+public ImportContainer getImportContainer() {
 	return new ImportContainer(this);
 }
 
diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/CompilationUnitStructureRequestor.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/CompilationUnitStructureRequestor.java
index cada744..2e24f0c 100644
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/CompilationUnitStructureRequestor.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/CompilationUnitStructureRequestor.java
@@ -16,6 +16,7 @@ import java.util.Stack;
 import net.sourceforge.phpdt.core.Flags;
 import net.sourceforge.phpdt.core.ICompilationUnit;
 import net.sourceforge.phpdt.core.IField;
+import net.sourceforge.phpdt.core.IImportContainer;
 import net.sourceforge.phpdt.core.IJavaElement;
 import net.sourceforge.phpdt.core.IMethod;
 import net.sourceforge.phpdt.core.IType;
@@ -134,41 +135,42 @@ public class CompilationUnitStructureRequestor extends ReferenceInfoAdapter impl
   /**
    * @see ISourceElementRequestor
    */
-  //public void acceptImport(int declarationStart, int declarationEnd, char[] name, boolean onDemand) {
-  //	JavaElementInfo parentInfo = (JavaElementInfo) fInfoStack.peek();
-  //	JavaElement parentHandle= (JavaElement)fHandleStack.peek();
-  //	if (!(parentHandle.getElementType() == IJavaElement.COMPILATION_UNIT)) {
-  //		Assert.isTrue(false); // Should not happen
-  //	}
-  //
-  //	ICompilationUnit parentCU= (ICompilationUnit)parentHandle;
-  //	//create the import container and its info
-  //	IImportContainer importContainer= parentCU.getImportContainer();
-  //	if (fImportContainerInfo == null) {
-  //		fImportContainerInfo= new JavaElementInfo();
-  //		fImportContainerInfo.setIsStructureKnown(true);
-  //		parentInfo.addChild(importContainer);
-  //		fNewElements.put(importContainer, fImportContainerInfo);
-  //	}
-  //	
-  //	// tack on the '.*' if it is onDemand
-  //	String importName;
-  //	if (onDemand) {
-  //		importName= new String(name) + ".*"; //$NON-NLS-1$
-  //	} else {
-  //		importName= new String(name);
-  //	}
-  //	
-  //	ImportDeclaration handle = new ImportDeclaration(importContainer, importName);
-  //	resolveDuplicates(handle);
-  //	
-  //	SourceRefElementInfo info = new SourceRefElementInfo();
-  //	info.setSourceRangeStart(declarationStart);
-  //	info.setSourceRangeEnd(declarationEnd);
-  //
-  //	fImportContainerInfo.addChild(handle);
-  //	fNewElements.put(handle, info);
-  //}
+  public void acceptImport(int declarationStart, int declarationEnd, char[] name, boolean onDemand) {
+  	JavaElementInfo parentInfo = (JavaElementInfo) fInfoStack.peek();
+  	JavaElement parentHandle= (JavaElement)fHandleStack.peek();
+  	if (!(parentHandle.getElementType() == IJavaElement.COMPILATION_UNIT)) {
+  		Assert.isTrue(false); // Should not happen
+  	}
+  
+  	ICompilationUnit parentCU= (ICompilationUnit)parentHandle;
+  	//create the import container and its info
+  	ImportContainer importContainer= parentCU.getImportContainer();
+  	if (fImportContainerInfo == null) {
+  		fImportContainerInfo= new JavaElementInfo();
+  		fImportContainerInfo.setIsStructureKnown(true);
+  		parentInfo.addChild(importContainer);
+  		fNewElements.put(importContainer, fImportContainerInfo);
+  	}
+  	
+  	// tack on the '.*' if it is onDemand
+  	String importName;
+  	if (onDemand) {
+  		importName= new String(name) + ".*"; //$NON-NLS-1$
+  	} else {
+  		importName= new String(name);
+  	}
+  	
+  	ImportDeclaration handle = new ImportDeclaration(importContainer, importName);
+//  	ImportDeclaration handle = new ImportDeclaration(null, importName);
+//  	resolveDuplicates(handle);
+  	
+  	SourceRefElementInfo info = new SourceRefElementInfo();
+  	info.setSourceRangeStart(declarationStart);
+  	info.setSourceRangeEnd(declarationEnd);
+  
+  	fImportContainerInfo.addChild(handle);
+  	fNewElements.put(handle, info);
+  }
   /*
    * Table of line separator position. This table is passed once at the end
    * of the parse action, so as to allow computation of normalized ranges.
diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/JavaProject.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/JavaProject.java
index fcb0e09..978cb1b 100644
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/JavaProject.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/JavaProject.java
@@ -916,7 +916,7 @@ public class JavaProject
 	 * This is the project bin folder
 	 */
 	protected IPath defaultOutputLocation() throws JavaModelException {
-		return getProject().getFullPath().append("bin"); //$NON-NLS-1$
+		return null; //getProject().getFullPath().append("bin"); //$NON-NLS-1$
 	}
 
 	/**
diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/builder/AbstractImageBuilder.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/builder/AbstractImageBuilder.java
index 278d7a6..cf6b24b 100644
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/builder/AbstractImageBuilder.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/builder/AbstractImageBuilder.java
@@ -280,11 +280,11 @@ protected boolean isExcludedFromProject(IPath childPath) throws JavaModelExcepti
 	if (childPath.segmentCount() > 2) return false; // is a subfolder of a package
 
 	for (int j = 0, k = sourceLocations.length; j < k; j++) {
-		if (childPath.equals(sourceLocations[j].binaryFolder.getFullPath())) return true;
+//		if (childPath.equals(sourceLocations[j].binaryFolder.getFullPath())) return true;
 		if (childPath.equals(sourceLocations[j].sourceFolder.getFullPath())) return true;
 	}
 	// skip default output folder which may not be used by any source folder
-	return childPath.equals(javaBuilder.javaProject.getOutputLocation());
+	return false; //childPath.equals(javaBuilder.javaProject.getOutputLocation());
 }
 
 /**
diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/builder/ClasspathDirectory.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/builder/ClasspathDirectory.java
index 9db468d..d27f8c4 100644
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/builder/ClasspathDirectory.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/builder/ClasspathDirectory.java
@@ -30,9 +30,9 @@ String[] missingPackageHolder = new String[1];
 ClasspathDirectory(IContainer binaryFolder, boolean isOutputFolder) {
 	this.binaryFolder = binaryFolder;
 	this.isOutputFolder = isOutputFolder;
-	IPath location = binaryFolder.getLocation();
-	this.binaryLocation = location != null ? location.addTrailingSeparator().toString() : ""; //$NON-NLS-1$
-
+//	IPath location = binaryFolder.getLocation();
+//	this.binaryLocation = location != null ? location.addTrailingSeparator().toString() : ""; //$NON-NLS-1$
+	this.binaryLocation = "";
 	this.directoryCache = new SimpleLookupTable(5);
 }
 
diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/builder/NameEnvironment.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/builder/NameEnvironment.java
index 50456a0..e023b59 100644
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/builder/NameEnvironment.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/builder/NameEnvironment.java
@@ -111,17 +111,17 @@ public class NameEnvironment implements INameEnvironment {
   		switch(entry.getEntryKind()) {
   			case IClasspathEntry.CPE_SOURCE :
   				if (!(target instanceof IContainer)) continue nextEntry;
-  				IPath outputPath = entry.getOutputLocation() != null 
-  					? entry.getOutputLocation() 
-  					: javaProject.getOutputLocation();
-  				IContainer outputFolder;
-  				if (outputPath.segmentCount() == 1) {
-  					outputFolder = javaProject.getProject();
-  				} else {
-  					outputFolder = root.getFolder(outputPath);
-  					if (!outputFolder.exists())
-  						createFolder(outputFolder);
-  				}
+//  				IPath outputPath = entry.getOutputLocation() != null 
+//  					? entry.getOutputLocation() 
+//  					: javaProject.getOutputLocation();
+  				IContainer outputFolder = null;
+//  				if (outputPath.segmentCount() == 1) {
+//  					outputFolder = javaProject.getProject();
+//  				} else {
+//  					outputFolder = root.getFolder(outputPath);
+//  					if (!outputFolder.exists())
+//  						createFolder(outputFolder);
+//  				}
   				sLocations.add(
   					ClasspathLocation.forSourceFolder((IContainer) target, outputFolder, entry.fullExclusionPatternChars()));
   				continue nextEntry;
@@ -207,19 +207,19 @@ public class NameEnvironment implements INameEnvironment {
   		// collect the output folders, skipping duplicates
   		next : for (int i = 0, l = sourceLocations.length; i < l; i++) {
   			ClasspathMultiDirectory md = sourceLocations[i];
-  			IPath outputPath = md.binaryFolder.getFullPath();
-  			for (int j = 0; j < i; j++) { // compare against previously walked source folders
-  				if (outputPath.equals(sourceLocations[j].binaryFolder.getFullPath())) {
-  					md.hasIndependentOutputFolder = sourceLocations[j].hasIndependentOutputFolder;
-  					continue next;
-  				}
-  			}
+//  			IPath outputPath = md.binaryFolder.getFullPath();
+//  			for (int j = 0; j < i; j++) { // compare against previously walked source folders
+//  				if (outputPath.equals(sourceLocations[j].binaryFolder.getFullPath())) {
+//  					md.hasIndependentOutputFolder = sourceLocations[j].hasIndependentOutputFolder;
+//  					continue next;
+//  				}
+//  			}
   			outputFolders.add(md);
   
   			// also tag each source folder whose output folder is an independent folder & is not also a source folder
-  			for (int j = 0, m = sourceLocations.length; j < m; j++)
-  				if (outputPath.equals(sourceLocations[j].sourceFolder.getFullPath()))
-  					continue next;
+//  			for (int j = 0, m = sourceLocations.length; j < m; j++)
+//  				if (outputPath.equals(sourceLocations[j].sourceFolder.getFullPath()))
+//  					continue next;
   			md.hasIndependentOutputFolder = true;
   		}
   	}
diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/builder/PHPBuilder.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/builder/PHPBuilder.java
index 36dadc0..9a161a4 100644
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/builder/PHPBuilder.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/core/builder/PHPBuilder.java
@@ -217,6 +217,8 @@ public class PHPBuilder extends IncrementalProjectBuilder {
       marker.setAttribute(IMarker.MESSAGE, Util.bind("build.missingSourceFile",
           e.missingSourceFile)); //$NON-NLS-1$
       marker.setAttribute(IMarker.SEVERITY, IMarker.SEVERITY_ERROR);
+    } catch (Exception e) {
+      e.printStackTrace();
     } finally {
       if (!ok)
         // If the build failed, clear the previously built state, forcing a
diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/builder/IdentifierIndexManager.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/builder/IdentifierIndexManager.java
index 532a301..81a3928 100644
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/builder/IdentifierIndexManager.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/builder/IdentifierIndexManager.java
@@ -79,7 +79,7 @@ public class IdentifierIndexManager {
         return;
       } catch (InvalidInputException e) {
         // ignore errors
-        e.printStackTrace();
+//        e.printStackTrace();
       }
       fToken = TokenNameERROR;
     }
diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/internal/compiler/ast/CompilationUnitDeclaration.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/internal/compiler/ast/CompilationUnitDeclaration.java
index ad98413..b21bac7 100644
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/internal/compiler/ast/CompilationUnitDeclaration.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/internal/compiler/ast/CompilationUnitDeclaration.java
@@ -131,18 +131,18 @@ public class CompilationUnitDeclaration extends AstNode implements ProblemSeveri
     }
   }
 
-  public void checkUnusedImports() {
-
-    if (this.scope.imports != null) {
-      for (int i = 0, max = this.scope.imports.length; i < max; i++) {
-        ImportBinding importBinding = this.scope.imports[i];
-        ImportReference importReference = importBinding.reference;
-        if (importReference != null && !importReference.used) {
-          scope.problemReporter().unusedImport(importReference);
-        }
-      }
-    }
-  }
+//  public void checkUnusedImports() {
+//
+//    if (this.scope.imports != null) {
+//      for (int i = 0, max = this.scope.imports.length; i < max; i++) {
+//        ImportBinding importBinding = this.scope.imports[i];
+//        ImportReference importReference = importBinding.reference;
+//        if (importReference != null && !importReference.used) {
+//          scope.problemReporter().unusedImport(importReference);
+//        }
+//      }
+//    }
+//  }
 
   public CompilationResult compilationResult() {
     return compilationResult;
diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/internal/compiler/ast/ImportReference.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/internal/compiler/ast/ImportReference.java
index d4b0966..d0d13d3 100644
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/internal/compiler/ast/ImportReference.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/internal/compiler/ast/ImportReference.java
@@ -15,26 +15,32 @@ import net.sourceforge.phpdt.internal.compiler.lookup.CompilationUnitScope;
 
 public class ImportReference extends AstNode {
 	
-	public char[][] tokens;
-	public long[] sourcePositions; //each entry is using the code : (start<<32) + end
+//	public char[][] tokens;
+//	public long[] sourcePositions; //each entry is using the code : (start<<32) + end
 	public boolean onDemand = true; //most of the time
+	public final char[] includeSource;
 	public int declarationEnd;// doesn't include an potential trailing comment
 	public int declarationSourceStart;
 	public int declarationSourceEnd;
 	public boolean used;
 
-public ImportReference(char[][] sources , long[] poss , boolean d) {
-	tokens = sources ;
-	sourcePositions = poss ;
+public ImportReference(char[] sourceString, int start, int end, boolean d) { // char[][] sources , long[] poss , boolean d) {
+//	tokens = sources ;
+//	sourcePositions = poss ;
+    includeSource = sourceString;
 	onDemand = d;
-	sourceEnd = (int)(sourcePositions[sourcePositions.length-1] & 0x00000000FFFFFFFF);
-	sourceStart = (int)(sourcePositions[0]>>>32) ;
+	sourceEnd = end;//(int)(sourcePositions[sourcePositions.length-1] & 0x00000000FFFFFFFF);
+	sourceStart = start;//(int)(sourcePositions[0]>>>32) ;
 }
 /**
  * @return char[][]
  */
-public char[][] getImportName() {
-	return tokens;
+//public char[][] getImportName() {
+//	return tokens;
+//}
+
+public char[] getIncludeName() {
+return includeSource;
 }
 public String toString(int tab ){
 
@@ -42,17 +48,18 @@ public String toString(int tab ){
 }
 public String toString(int tab, boolean withOnDemand) {
 	/* when withOnDemand is false, only the name is printed */
-	StringBuffer buffer = new StringBuffer();
-	for (int i = 0; i < tokens.length; i++) {
-		buffer.append(tokens[i]);
-		if (i < (tokens.length - 1)) {
-			buffer.append("."); //$NON-NLS-1$
-		}
-	}
-	if (withOnDemand && onDemand) {
-		buffer.append(".*"); //$NON-NLS-1$
-	}
-	return buffer.toString();
+//	StringBuffer buffer = new StringBuffer();
+//	for (int i = 0; i < tokens.length; i++) {
+//		buffer.append(tokens[i]);
+//		if (i < (tokens.length - 1)) {
+//			buffer.append("."); //$NON-NLS-1$
+//		}
+//	}
+//	if (withOnDemand && onDemand) {
+//		buffer.append(".*"); //$NON-NLS-1$
+//	}
+//	return buffer.toString();
+    return new String(includeSource);
 }
 public void traverse(IAbstractSyntaxTreeVisitor visitor, CompilationUnitScope scope) {
 	visitor.visit(this, scope);