import net.sourceforge.phpdt.core.ToolFactory;
import net.sourceforge.phpdt.core.compiler.IScanner;
import net.sourceforge.phpdt.core.compiler.ITerminalSymbols;
+import net.sourceforge.phpdt.core.compiler.ITerminalSymbols.TokenName;
import net.sourceforge.phpdt.core.compiler.InvalidInputException;
import net.sourceforge.phpdt.internal.compiler.parser.Scanner;
import net.sourceforge.phpdt.internal.ui.text.DocumentCharacterIterator;
import net.sourceforge.phpeclipse.phpeditor.PHPUnitEditor;
import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.text.Assert;
+//incastrix
+//import org.eclipse.jface.text.Assert;
+import org.eclipse.core.runtime.Assert;
import org.eclipse.jface.text.BadLocationException;
import org.eclipse.jface.text.IDocument;
import org.eclipse.jface.text.IRegion;
scanner.setSource(contents.toCharArray());
scanner.setPHPMode(true);
- int token = scanner.getNextToken();
- while (token != ITerminalSymbols.TokenNameEOF) {
+ TokenName token = scanner.getNextToken();
+ while (token != ITerminalSymbols.TokenName.EOF) {
token = scanner.getNextToken();
start = shift + scanner.getCurrentTokenStartPosition();
switch (token) {
- case ITerminalSymbols.TokenNameCOMMENT_PHPDOC:
- case ITerminalSymbols.TokenNameCOMMENT_BLOCK: {
+ case COMMENT_PHPDOC:
+ case COMMENT_BLOCK: {
int end = shift
+ scanner.getCurrentTokenEndPosition() + 1;
regions.add(new Region(start, end - start));
}
- case ITerminalSymbols.TokenNameCOMMENT_LINE:
+ case COMMENT_LINE:
continue;
}
}
int headerEnd = -1;
try {
boolean foundComment = false;
- int terminal = scanner.getNextToken();
- while (terminal != ITerminalSymbols.TokenNameEOF
- && !(terminal == ITerminalSymbols.TokenNameclass
- || terminal == ITerminalSymbols.TokenNameinterface || foundComment)) {
-
- if (terminal == ITerminalSymbols.TokenNameCOMMENT_PHPDOC
- || terminal == ITerminalSymbols.TokenNameCOMMENT_BLOCK
- || terminal == ITerminalSymbols.TokenNameCOMMENT_LINE) {
+ TokenName terminal = scanner.getNextToken();
+ while (terminal != ITerminalSymbols.TokenName.EOF
+ && !(terminal == ITerminalSymbols.TokenName.CLASS
+ || terminal == ITerminalSymbols.TokenName.INTERFACE || foundComment)) {
+
+ if (terminal == ITerminalSymbols.TokenName.COMMENT_PHPDOC
+ || terminal == ITerminalSymbols.TokenName.COMMENT_BLOCK
+ || terminal == ITerminalSymbols.TokenName.COMMENT_LINE) {
if (!foundComment)
headerStart = scanner
.getCurrentTokenStartPosition();