X-Git-Url: http://secure.phpeclipse.com
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 e31d80b..99ead74 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
@@ -10,38 +10,24 @@ Contributors:
**********************************************************************/
package net.sourceforge.phpdt.internal.compiler.parser;
-import java.text.MessageFormat;
import java.util.ArrayList;
-import java.util.Hashtable;
-import net.sourceforge.phpdt.core.compiler.*;
-import net.sourceforge.phpdt.internal.compiler.parser.*;
+import net.sourceforge.phpdt.core.compiler.ITerminalSymbols;
+import net.sourceforge.phpdt.core.compiler.InvalidInputException;
import net.sourceforge.phpeclipse.PHPeclipsePlugin;
-import net.sourceforge.phpeclipse.actions.PHPStartApacheAction;
import net.sourceforge.phpeclipse.phpeditor.PHPString;
-import net.sourceforge.phpeclipse.phpeditor.php.PHPKeywords;
import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IMarker;
import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.ui.texteditor.MarkerUtilities;
-public class Parser extends PHPKeywords implements ITerminalSymbols {
- // strings for external parser call
- private static final String PARSE_ERROR_STRING = "Parse error"; //$NON-NLS-1$
- private static final String PARSE_WARNING_STRING = "Warning"; //$NON-NLS-1$
+import test.PHPParserSuperclass;
- public static final int ERROR = 2;
- public static final int WARNING = 1;
- public static final int INFO = 0;
+public class Parser extends PHPParserSuperclass implements ITerminalSymbols {
- public static final boolean DEBUG = false;
- //scanner token
+ //scanner token
public Scanner scanner;
- private IFile fileToParse;
private ArrayList phpList;
private int currentPHPString;
@@ -51,7 +37,7 @@ public class Parser extends PHPKeywords implements ITerminalSymbols {
private String str;
// current character
-// char ch;
+ // char ch;
// current token
int token;
@@ -71,7 +57,7 @@ public class Parser extends PHPKeywords implements ITerminalSymbols {
private String stringValue;
/** Contains the current expression. */
- // private StringBuffer expression;
+ // private StringBuffer expression;
private boolean phpMode;
@@ -150,28 +136,41 @@ public class Parser extends PHPKeywords implements ITerminalSymbols {
// final static int TokenNameNOT_EQUAL_EQUAL = 158;
// final static int TokenNameOR = 159;
// final static int TokenNameAT = 153; // @
+
+ public Parser() {
+ }
+
+ public void setFileToParse(IFile fileToParse) {
+ this.currentPHPString = 0;
+ PHPParserSuperclass.fileToParse = fileToParse;
+ this.phpList = null;
+ this.str = "";
+ this.token = TokenNameEOF;
+ this.phpEnd = false;
+ this.initializeScanner();
+ }
/**
- * Class Constructor.
+ * 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]));
-// }
-// }
+ // 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;
- this.fileToParse = fileToParse;
+ PHPParserSuperclass.fileToParse = fileToParse;
this.phpList = null;
this.str = "";
this.token = TokenNameEOF;
-// this.chIndx = 0;
-// this.rowCount = 1;
-// this.columnCount = 0;
+ // this.chIndx = 0;
+ // this.rowCount = 1;
+ // this.columnCount = 0;
this.phpEnd = false;
// getNextToken();
@@ -184,45 +183,10 @@ public class Parser extends PHPKeywords implements ITerminalSymbols {
/**
* Create marker for the parse error
*/
- private void setMarker(
- String message,
- int charStart,
- int charEnd,
- int errorLevel)
- throws CoreException {
+ private void setMarker(String message, int charStart, int charEnd, int errorLevel) throws CoreException {
setMarker(fileToParse, message, charStart, charEnd, errorLevel);
}
- public static void setMarker(
- IFile file,
- String message,
- int charStart,
- int charEnd,
- int errorLevel)
- throws CoreException {
- if (file != null) {
- Hashtable attributes = new Hashtable();
- MarkerUtilities.setMessage(attributes, message);
- switch (errorLevel) {
- case ERROR :
- attributes.put(IMarker.SEVERITY, new Integer(IMarker.SEVERITY_ERROR));
- break;
- case WARNING :
- attributes.put(
- IMarker.SEVERITY,
- new Integer(IMarker.SEVERITY_WARNING));
- break;
- case INFO :
- attributes.put(IMarker.SEVERITY, new Integer(IMarker.SEVERITY_INFO));
- break;
- }
- MarkerUtilities.setCharStart(attributes, charStart);
- MarkerUtilities.setCharEnd(attributes, charEnd);
- // setLineNumber(attributes, lineNumber);
- MarkerUtilities.createMarker(file, attributes, IMarker.PROBLEM);
- }
- }
-
/**
* This method will throw the SyntaxError.
* It will add the good lines and columns to the Error
@@ -231,28 +195,24 @@ public class Parser extends PHPKeywords implements ITerminalSymbols {
*/
private void throwSyntaxError(String error) {
-// if (str.length() < chIndx) {
-// chIndx--;
-// }
-// // read until end-of-line
-// int eol = chIndx;
-// while (str.length() > eol) {
-// ch = str.charAt(eol++);
-// if (ch == '\n') {
-// eol--;
-// break;
-// }
-// }
-// throw new SyntaxError(
-// rowCount,
-// chIndx - columnCount + 1,
-// str.substring(columnCount, eol),
-// error);
- throw new SyntaxError(
- 1,
- 1,
- "",
- error);
+ // if (str.length() < chIndx) {
+ // chIndx--;
+ // }
+ // // read until end-of-line
+ // int eol = chIndx;
+ // while (str.length() > eol) {
+ // ch = str.charAt(eol++);
+ // if (ch == '\n') {
+ // eol--;
+ // break;
+ // }
+ // }
+ // throw new SyntaxError(
+ // rowCount,
+ // chIndx - columnCount + 1,
+ // str.substring(columnCount, eol),
+ // error);
+ throw new SyntaxError(1, 1, "", error);
}
/**
@@ -270,18 +230,18 @@ public class Parser extends PHPKeywords implements ITerminalSymbols {
*
*@see
*/
-// private void getChar() {
-// if (str.length() > chIndx) {
-// ch = str.charAt(chIndx++);
-//
-// return;
-// }
-//
-// chIndx = str.length() + 1;
-// ch = ' ';
-// // token = TokenNameEOF;
-// phpEnd = true;
-// }
+ // 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
@@ -289,12 +249,11 @@ public class Parser extends PHPKeywords implements ITerminalSymbols {
private void getNextToken() throws CoreException {
try {
token = scanner.getNextToken();
- if (DEBUG) {
+ if (Scanner.DEBUG) {
int currentEndPosition = scanner.getCurrentTokenEndPosition();
int currentStartPosition = scanner.getCurrentTokenStartPosition();
- System.out.print(
- currentStartPosition + "," + currentEndPosition + ": ");
+ System.out.print(currentStartPosition + "," + currentEndPosition + ": ");
System.out.println(scanner.toStringAction(token));
}
} catch (InvalidInputException e) {
@@ -302,617 +261,8 @@ public class Parser extends PHPKeywords implements ITerminalSymbols {
}
return;
- // boolean phpFound = false;
- // char ch2;
- //
- // phpEnd = false;
- // try {
- // if (!phpMode) {
- //
- // while (str.length() > chIndx) {
- // token = TokenNameERROR;
- // ch = str.charAt(chIndx++);
- //
- // if (ch == '\n') {
- // rowCount++;
- // }
- // if (ch == '<') {
- // ch2 = str.charAt(chIndx++);
- // if (ch2 == '?') {
- // ch2 = str.charAt(chIndx++);
- // if (Character.isWhitespace(ch2)) {
- // // php start
- // phpMode = true;
- // phpFound = true;
- // break;
- // } else if (ch2 == 'p' || ch2 == 'P') {
- // ch2 = str.charAt(chIndx++);
- // if (ch2 == 'h' || ch2 == 'H') {
- // ch2 = str.charAt(chIndx++);
- // if (ch2 == 'p' || ch2 == 'P') {
- // phpMode = true;
- // phpFound = true;
- // break;
- // }
- // chIndx--;
- // }
- // chIndx--;
- // }
- // chIndx--;
- // }
- // chIndx--;
- // }
- // }
- //
- // }
- //
- // if (phpMode) {
- // while (str.length() > chIndx) {
- // ch = str.charAt(chIndx++);
- // token = TokenNameERROR;
- // if (ch == '\n') {
- // rowCount++;
- // columnCount = chIndx;
- // continue; // while loop
- // }
- // if (str.length() == chIndx) {
- // phpEnd = true;
- // }
- // if (!Character.isWhitespace(ch)) {
- // if (ch == '$') {
- // if (str.length() > chIndx) {
- // if (str.charAt(chIndx) == '{') {
- // chIndx++;
- // token = TokenNameDOLLAROPEN;
- // return;
- // }
- // }
- // getIdentifier();
- // return;
- // }
- // if ((ch >= 'a' && ch <= 'z')
- // || (ch >= 'A' && ch <= 'Z')
- // || (ch == '_')
- // || (ch == '$')) {
- // getIdentifier();
- // return;
- // }
- // if (ch >= '0' && ch <= '9') {
- // getNumber();
- // return;
- // }
- // if (ch == '/') {
- // if (str.length() > chIndx) {
- // if (str.charAt(chIndx) == '/') {
- // ch = '/';
- // chIndx++;
- // // read comment until end of line:
- // while ((str.length() > chIndx)
- // && (ch != '\n')) {
- // ch = str.charAt(chIndx++);
- // if (ch == '?') {
- // ch2 = str.charAt(chIndx);
- // if (ch2 == '>') {
- // chIndx++;
- // token = TokenNameHTML;
- // // php end
- // phpMode = false;
- // phpEnd = true;
- // return;
- // }
- // }
- // }
- // rowCount++;
- // continue;
- //
- // } else if (str.charAt(chIndx) == '*') {
- // chIndx++;
- // // multi line comment:
- // while (str.length() > chIndx) {
- // if (str.charAt(chIndx) == '*'
- // && (str.length() > (chIndx + 1))
- // && str.charAt(chIndx + 1) == '/') {
- // chIndx += 2;
- // break;
- // }
- // ch = str.charAt(chIndx++);
- // if (ch == '\n') {
- // rowCount++;
- // columnCount = chIndx;
- // }
- // }
- // continue;
- // }
- // }
- // } else if (ch == '#') {
- // // read comment until end of line:
- // while ((str.length() > chIndx) && (ch != '\n')) {
- // ch = str.charAt(chIndx++);
- // if (ch == '?') {
- // ch2 = str.charAt(chIndx);
- // if (ch2 == '>') {
- // chIndx++;
- // token = TokenNameHTML;
- // // php end
- // phpMode = false;
- // phpEnd = true;
- // return;
- // }
- // }
- // }
- // rowCount++;
- // continue;
- //
- // } else if (ch == '"') {
- // getString(
- // '"',
- // TokenNameStringInterpolated,
- // "Open string character '\"' at end of file.");
- // return;
- // } else if (ch == '\'') {
- // getString(
- // '\'',
- // TokenNameStringConstant,
- // "Open string character \"'\" at end of file.");
- // return;
- // } else if (ch == '`') {
- // getString(
- // '`',
- // TokenNameStringConstant,
- // "Open string character \"`\" at end of file.");
- // setMarker(
- // "Other string delimiters prefered (found \"`\").",
- // rowCount,
- // PHPParser.INFO);
- // return;
- // }
- //
- // switch (ch) {
- //
- // case '(' :
- // token = TokenNameLPAREN;
- //
- // break;
- // case ')' :
- // token = TokenNameRPAREN;
- //
- // break;
- // case '{' :
- // token = TokenNameLBRACE;
- //
- // break;
- // case '}' :
- // token = TokenNameRBRACE;
- //
- // break;
- // case '[' :
- // token = TokenNameLBRACKET;
- //
- // break;
- // case ']' :
- // token = TokenNameRBRACKET;
- //
- // break;
- // case ',' :
- // token = TokenNameCOMMA;
- //
- // break;
- // case '?' :
- // token = TokenNameQUESTION;
- // if (str.length() > chIndx) {
- // if (str.charAt(chIndx) == '>') {
- // chIndx++;
- // token = TokenNameHTML;
- // // php end
- // phpMode = false;
- // phpEnd = true;
- // break;
- // }
- // }
- //
- // break;
- // case '@' :
- // token = TokenNameAT;
- // break;
- // case '~' :
- // token = TokenNameTWIDDLE;
- // if (str.length() > chIndx) {
- // if (str.charAt(chIndx) == '=') {
- // chIndx++;
- // token = TokenNameTWIDDLE_EQUAL;
- //
- // break;
- // }
- // }
- // break;
- // case '.' :
- // token = TokenNameDOT;
- // if (str.length() > chIndx) {
- // if (str.charAt(chIndx) == '=') {
- // chIndx++;
- // token = TokenNameDOT_EQUAL;
- //
- // break;
- // }
- // }
- //
- // break;
- // case '"' :
- // token = TokenNameStringLiteral;
- //
- // break;
- // case '%' :
- // token = TokenNameREMAINDER;
- // if (str.length() > chIndx) {
- // if (str.charAt(chIndx) == '=') {
- // chIndx++;
- // token = TokenNameREMAINDER_EQUAL;
- //
- // break;
- // }
- // }
- // break;
- // case ';' :
- // token = TokenNameSEMICOLON;
- //
- // break;
- // case '^' :
- // token = TokenNameXOR;
- // if (str.length() > chIndx) {
- // if (str.charAt(chIndx) == '=') {
- // chIndx++;
- // token = TokenNameXOR_EQUAL;
- //
- // break;
- // }
- // }
- // break;
- // case '/' :
- // token = TokenNameDIVIDE;
- //
- // if (str.length() > chIndx) {
- // if (str.charAt(chIndx) == '=') {
- // chIndx++;
- // token = TokenNameDIVIDE_EQUAL;
- //
- // break;
- // }
- // }
- //
- // break;
- // case '*' :
- // token = TokenNameMULTIPLY;
- // if (str.length() > chIndx) {
- // if (str.charAt(chIndx) == '*') {
- // chIndx++;
- // token = TokenNameXOR;
- //
- // break;
- // }
- // if (str.charAt(chIndx) == '=') {
- // chIndx++;
- // token = TokenNameMULTIPLY_EQUAL;
- //
- // break;
- // }
- // }
- //
- // break;
- // case '+' :
- // token = TokenNamePLUS;
- // if (str.length() > chIndx) {
- // if (str.charAt(chIndx) == '+') {
- // chIndx++;
- // token = TokenNamePLUS_PLUS;
- //
- // break;
- // }
- // if (str.charAt(chIndx) == '=') {
- // chIndx++;
- // token = TokenNamePLUS_EQUAL;
- //
- // break;
- // }
- // }
- // break;
- // case '-' :
- // token = TokenNameMINUS;
- // if (str.length() > chIndx) {
- // if (str.charAt(chIndx) == '-') {
- // chIndx++;
- // token = TokenNameMINUS_MINUS;
- //
- // break;
- // }
- // if (str.charAt(chIndx) == '=') {
- // chIndx++;
- // token = TokenNameMINUS_EQUAL;
- //
- // break;
- // }
- // if (str.charAt(chIndx) == '>') {
- // chIndx++;
- // token = TokenNameMINUS_GREATER;
- //
- // break;
- // }
- // }
- //
- // break;
- // case '=' :
- // token = TokenNameEQUAL;
- //
- // if (str.length() > chIndx) {
- // ch = str.charAt(chIndx);
- //
- // if (ch == '=') {
- // chIndx++;
- // token = TokenNameEQUAL_EQUAL;
- // if (str.length() > chIndx) {
- // ch = str.charAt(chIndx);
- //
- // if (ch == '=') {
- // chIndx++;
- // token =
- // TokenNameEQUAL_EQUAL_EQUAL;
- // }
- // }
- // break;
- // }
- // if (ch == '>') {
- // chIndx++;
- // token = TokenNameEQUAL_GREATER;
- //
- // break;
- // }
- // }
- //
- // break;
- // case '!' :
- // token = TokenNameNOT;
- //
- // if (str.length() > chIndx) {
- // if (str.charAt(chIndx) == '=') {
- // chIndx++;
- // token = TokenNameNOT_EQUAL;
- // if (str.length() > chIndx) {
- // ch = str.charAt(chIndx);
- //
- // if (ch == '=') {
- // chIndx++;
- // token =
- // TokenNameNOT_EQUAL_EQUAL;
- // }
- // }
- // break;
- // }
- // }
- //
- // break;
- // case '>' :
- // token = TokenNameGREATER;
- //
- // if (str.length() > chIndx) {
- // if (str.charAt(chIndx) == '=') {
- // chIndx++;
- // token = TokenNameGREATER_EQUAL;
- // break;
- // }
- // if (str.charAt(chIndx) == '>') {
- // chIndx++;
- // token = TokenNameRIGHT_SHIFT;
- // if (str.length() > chIndx) {
- // if (str.charAt(chIndx) == '=') {
- // chIndx++;
- // token =
- // TokenNameRIGHT_SHIFT_EQUAL;
- // break;
- // }
- // }
- // break;
- // }
- // }
- //
- // break;
- // case '<' :
- // token = TokenNameLESS;
- //
- // if (str.length() > chIndx) {
- // if (str.charAt(chIndx) == '=') {
- // chIndx++;
- // token = TokenNameLESS_EQUAL;
- //
- // break;
- // }
- // if (str.charAt(chIndx) == '<') {
- // chIndx++;
- // token = TokenNameLEFT_SHIFT;
- // if (str.charAt(chIndx) == '<') {
- // // heredoc
- // int startRow = rowCount;
- // if (str.length() > chIndx) {
- //
- // ch = str.charAt(++chIndx);
- // if ((ch >= 'a' && ch <= 'z')
- // || (ch >= 'A' && ch <= 'Z')
- // || (ch == '_')) {
- // chIndx++;
- // getIdentifier();
- // token =
- // TokenNameStringConstant;
- // while (str.length()
- // > chIndx) {
- // ch =
- // str.charAt(
- // chIndx++);
- // if (ch == '\n') {
- // if (str.length()
- // >= chIndx
- // + identifier
- // .length()) {
- // if (str
- // .substring(
- // chIndx,
- // chIndx
- // + identifier
- // .length())
- // .equals(identifier)) {
- // chIndx
- // += identifier
- // .length();
- // return;
- // }
- // }
- // }
- // }
- // }
- // }
- // throwSyntaxError(
- // "Open heredoc syntax after operator '<<<'.",
- // startRow);
- // } else if (str.charAt(chIndx) == '=') {
- // chIndx++;
- // token = TokenNameLEFT_SHIFT_EQUAL;
- // break;
- // }
- // break;
- // }
- // }
- //
- // break;
- //
- // case '|' :
- // token = TokenNameOR;
- //
- // if (str.length() > chIndx) {
- // if (str.charAt(chIndx) == '|') {
- // chIndx++;
- // token = TokenNameOR_OR;
- // break;
- // }
- // if (str.charAt(chIndx) == '=') {
- // chIndx++;
- // token = TokenNameOR_EQUAL;
- // break;
- // }
- // }
- //
- // break;
- // case '&' :
- // token = TokenNameAND;
- // if (str.length() > chIndx) {
- // if (str.charAt(chIndx) == '&') {
- // chIndx++;
- // token = TokenNameAND_AND;
- // break;
- // }
- // if (str.charAt(chIndx) == '=') {
- // chIndx++;
- // token = TokenNameAND_EQUAL;
- // break;
- // }
- // break;
- // }
- //
- // break;
- // case ':' :
- // token = TokenNameCOLON;
- // if (str.length() > chIndx) {
- // if (str.charAt(chIndx) == ':') {
- // chIndx++;
- // token = TokenNameCOLON_COLON;
- // }
- // }
- // break;
- // // case '#' :
- // // token = TokenNameHASH;
- // //
- // // break;
- // // case '@' :
- // // token = TokenNameAT;
- // //
- // // break;
- // default :
- // throwSyntaxError(
- // "unexpected character: '" + ch + "'");
- // }
- //
- // if (token == TokenNameERROR) {
- // throwSyntaxError("token not found");
- // }
- //
- // return;
- // }
- // }
- // }
- // } catch (StringIndexOutOfBoundsException e) {
- // // catched from charAt
- // }
- //
- // chIndx = str.length() + 1;
- // ch = ' ';
- // token = TokenNameEOF;
- // phpEnd = true;
- // //PHPString temp;
- // // if (phpList != null) {
- // // if (currentPHPString < phpList.size()) {
- // // token = TokenNameUNDEFINED;
- // // temp = (PHPString) phpList.get(currentPHPString++);
- // // this.str = temp.getPHPString();
- // // this.token = TokenNameEOF;
- // // this.chIndx = 0;
- // // this.rowCount = temp.getLineNumber();
- // // this.columnCount = 0;
- // // getNextToken();
- // // phpEnd = true;
- // // } else {
- // // token = TokenNameUNDEFINED;
- // // return;
- // // }
- // // }
}
- // /**
- // * Get an identifier.
- // */
- // private void getIdentifier() {
- // // StringBuffer ident = new StringBuffer();
- // int startPosition = chIndx - 1;
- // // ident.append(ch);
- // if (ch == '$') {
- // getChar();
- // // attention recursive call:
- // getIdentifier();
- // token = TokenNameVariable;
- // return;
- // } else {
- // token = TokenNameIdentifier;
- // }
- //
- // getChar();
- //
- // //this will read the buffer until the next character is a forbidden character for identifier
- // while ((ch >= 'a' && ch <= 'z')
- // || (ch >= 'A' && ch <= 'Z')
- // || (ch >= '0' && ch <= '9')
- // || (ch == '_')) {
- // // ident.append(ch);
- // getChar();
- // }
- // int endPosition = chIndx--;
- // int length = (--endPosition) - startPosition;
- //
- // identifier = str.substring(startPosition, endPosition);
- // // System.out.println(identifier);
- //
- // // determine if this identitfer is a keyword
- // // @todo improve this in future version
- // Integer i = (Integer) keywordMap.get(identifier.toLowerCase());
- // if (i != null) {
- // token = i.intValue();
- // }
- // }
-
/**
* Get a number.
* if it's a double the number will be stored in doubleNumber and the token will have the
@@ -920,137 +270,137 @@ public class Parser extends PHPKeywords implements ITerminalSymbols {
* if it's a double the number will be stored in longNumber and the token will have the
* value {@link Parser#TokenNameINT_NUMBER}
*/
-// private void getNumber() {
-// StringBuffer inum = new StringBuffer();
-// char dFlag = ' ';
-// int numFormat = 10;
-//
-// // save first digit
-// char firstCh = ch;
-// inum.append(ch);
-//
-// getChar();
-// // determine number conversions:
-// if (firstCh == '0') {
-// switch (ch) {
-// case 'b' :
-// numFormat = 2;
-// getChar();
-// break;
-// case 'B' :
-// numFormat = 2;
-// getChar();
-// break;
-// case 'o' :
-// numFormat = 8;
-// getChar();
-// break;
-// case 'O' :
-// numFormat = 8;
-// getChar();
-// break;
-// case 'x' :
-// numFormat = 16;
-// getChar();
-// break;
-// case 'X' :
-// numFormat = 16;
-// getChar();
-// break;
-// }
-// }
-//
-// if (numFormat == 16) {
-// while ((ch >= '0' && ch <= '9')
-// || (ch >= 'a' && ch <= 'f')
-// || (ch >= 'A' && ch <= 'F')) {
-// inum.append(ch);
-// getChar();
-// }
-// } else {
-// while ((ch >= '0' && ch <= '9')
-// || (ch == '.')
-// || (ch == 'E')
-// || (ch == 'e')) {
-// if ((ch == '.') || (ch == 'E') || (ch == 'e')) {
-// if (ch == '.' && dFlag != ' ') {
-// break;
-// }
-// if ((dFlag == 'E') || (dFlag == 'e')) {
-// break;
-// }
-// dFlag = ch;
-// inum.append(ch);
-// getChar();
-// if ((ch == '-') || (ch == '+')) {
-// inum.append(ch);
-// getChar();
-// }
-// } else {
-// inum.append(ch);
-// getChar();
-// }
-// }
-// }
-// chIndx--;
-//
-// try {
-// if (dFlag != ' ') {
-// doubleNumber = new Double(inum.toString());
-// token = TokenNameDoubleLiteral;
-// return;
-// } else {
-// longNumber = Long.valueOf(inum.toString(), numFormat);
-// token = TokenNameIntegerLiteral;
-// return;
-// }
-//
-// } catch (Throwable e) {
-// throwSyntaxError("Number format error: " + inum.toString());
-// }
-// }
-//
-// /**
-// * Get a String.
-// * @param openChar the opening char ('\'', '"', '`')
-// * @param typeString the type of string {@link #TokenNameSTRING_CONSTANT},{@link #TokenNameINTERPOLATED_STRING}
-// * @param errorMsg the error message in case of parse error in the string
-// */
-// private void getString(
-// final char openChar,
-// final int typeString,
-// final String errorMsg) {
-// StringBuffer sBuffer = new StringBuffer();
-// boolean openString = true;
-// int startRow = rowCount;
-// while (str.length() > chIndx) {
-// ch = str.charAt(chIndx++);
-// if (ch == '\\') {
-// sBuffer.append(ch);
-// if (str.length() > chIndx) {
-// ch = str.charAt(chIndx++);
-// sBuffer.append(ch);
-// }
-// } else if (ch == openChar) {
-// openString = false;
-// break;
-// } else if (ch == '\n') {
-// rowCount++;
-// columnCount = chIndx;
-// } else {
-// sBuffer.append(ch);
-// }
-// }
-// if (openString) {
-// if (typeString == TokenNameStringConstant) {
-// throwSyntaxError(errorMsg, startRow);
-// } else {
-// throwSyntaxError(errorMsg);
-// }
-// }
-// token = typeString;
-// stringValue = sBuffer.toString();
-// }
+ // private void getNumber() {
+ // StringBuffer inum = new StringBuffer();
+ // char dFlag = ' ';
+ // int numFormat = 10;
+ //
+ // // save first digit
+ // char firstCh = ch;
+ // inum.append(ch);
+ //
+ // getChar();
+ // // determine number conversions:
+ // if (firstCh == '0') {
+ // switch (ch) {
+ // case 'b' :
+ // numFormat = 2;
+ // getChar();
+ // break;
+ // case 'B' :
+ // numFormat = 2;
+ // getChar();
+ // break;
+ // case 'o' :
+ // numFormat = 8;
+ // getChar();
+ // break;
+ // case 'O' :
+ // numFormat = 8;
+ // getChar();
+ // break;
+ // case 'x' :
+ // numFormat = 16;
+ // getChar();
+ // break;
+ // case 'X' :
+ // numFormat = 16;
+ // getChar();
+ // break;
+ // }
+ // }
+ //
+ // if (numFormat == 16) {
+ // while ((ch >= '0' && ch <= '9')
+ // || (ch >= 'a' && ch <= 'f')
+ // || (ch >= 'A' && ch <= 'F')) {
+ // inum.append(ch);
+ // getChar();
+ // }
+ // } else {
+ // while ((ch >= '0' && ch <= '9')
+ // || (ch == '.')
+ // || (ch == 'E')
+ // || (ch == 'e')) {
+ // if ((ch == '.') || (ch == 'E') || (ch == 'e')) {
+ // if (ch == '.' && dFlag != ' ') {
+ // break;
+ // }
+ // if ((dFlag == 'E') || (dFlag == 'e')) {
+ // break;
+ // }
+ // dFlag = ch;
+ // inum.append(ch);
+ // getChar();
+ // if ((ch == '-') || (ch == '+')) {
+ // inum.append(ch);
+ // getChar();
+ // }
+ // } else {
+ // inum.append(ch);
+ // getChar();
+ // }
+ // }
+ // }
+ // chIndx--;
+ //
+ // try {
+ // if (dFlag != ' ') {
+ // doubleNumber = new Double(inum.toString());
+ // token = TokenNameDoubleLiteral;
+ // return;
+ // } else {
+ // longNumber = Long.valueOf(inum.toString(), numFormat);
+ // token = TokenNameIntegerLiteral;
+ // return;
+ // }
+ //
+ // } catch (Throwable e) {
+ // throwSyntaxError("Number format error: " + inum.toString());
+ // }
+ // }
+ //
+ // /**
+ // * Get a String.
+ // * @param openChar the opening char ('\'', '"', '`')
+ // * @param typeString the type of string {@link #TokenNameSTRING_CONSTANT},{@link #TokenNameINTERPOLATED_STRING}
+ // * @param errorMsg the error message in case of parse error in the string
+ // */
+ // private void getString(
+ // final char openChar,
+ // final int typeString,
+ // final String errorMsg) {
+ // StringBuffer sBuffer = new StringBuffer();
+ // boolean openString = true;
+ // int startRow = rowCount;
+ // while (str.length() > chIndx) {
+ // ch = str.charAt(chIndx++);
+ // if (ch == '\\') {
+ // sBuffer.append(ch);
+ // if (str.length() > chIndx) {
+ // ch = str.charAt(chIndx++);
+ // sBuffer.append(ch);
+ // }
+ // } else if (ch == openChar) {
+ // openString = false;
+ // break;
+ // } else if (ch == '\n') {
+ // rowCount++;
+ // columnCount = chIndx;
+ // } else {
+ // sBuffer.append(ch);
+ // }
+ // }
+ // if (openString) {
+ // if (typeString == TokenNameStringConstant) {
+ // throwSyntaxError(errorMsg, startRow);
+ // } else {
+ // throwSyntaxError(errorMsg);
+ // }
+ // }
+ // token = typeString;
+ // stringValue = sBuffer.toString();
+ // }
// public void htmlParserTester(String input) {
// int lineNumber = 1;
@@ -1270,9 +620,9 @@ public class Parser extends PHPKeywords implements ITerminalSymbols {
}
}
this.token = TokenNameEOF;
-// this.chIndx = 0;
-// this.rowCount = rowCount;
-// this.columnCount = 0;
+ // this.chIndx = 0;
+ // this.rowCount = rowCount;
+ // this.columnCount = 0;
this.phpEnd = false;
this.phpMode = true;
scanner.setSource(s.toCharArray());
@@ -1283,7 +633,10 @@ public class Parser extends PHPKeywords implements ITerminalSymbols {
if (token != TokenNameEOF && token != TokenNameERROR) {
statementList();
}
- if (token != TokenNameEOF && token != TokenNameERROR) {
+ 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.");
}
@@ -1312,11 +665,7 @@ public class Parser extends PHPKeywords implements ITerminalSymbols {
throw err;
} else {
// setMarker(err.getMessage(), err.getLine(), ERROR);
- setMarker(
- err.getMessage(),
- scanner.getCurrentTokenStartPosition(),
- scanner.getCurrentTokenEndPosition(),
- ERROR);
+ setMarker(err.getMessage(), scanner.getCurrentTokenStartPosition(), scanner.getCurrentTokenEndPosition(), ERROR);
}
// if an error occured,
// try to find keywords 'class' or 'function'
@@ -1342,9 +691,9 @@ public class Parser extends PHPKeywords implements ITerminalSymbols {
public void parse(String s) throws CoreException {
this.str = s;
this.token = TokenNameEOF;
-// this.chIndx = 0;
-// this.rowCount = 1;
-// this.columnCount = 0;
+ // this.chIndx = 0;
+ // this.rowCount = 1;
+ // this.columnCount = 0;
this.phpEnd = false;
this.phpMode = false;
/* scanner initialization */
@@ -1356,7 +705,10 @@ public class Parser extends PHPKeywords implements ITerminalSymbols {
if (token != TokenNameEOF && token != TokenNameERROR) {
statementList();
}
- if (token != TokenNameEOF && token != TokenNameERROR) {
+ 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.");
}
@@ -1382,11 +734,7 @@ public class Parser extends PHPKeywords implements ITerminalSymbols {
return;
} catch (SyntaxError sytaxErr1) {
// setMarker(sytaxErr1.getMessage(), sytaxErr1.getLine(), ERROR);
- setMarker(
- sytaxErr1.getMessage(),
- scanner.getCurrentTokenStartPosition(),
- scanner.getCurrentTokenEndPosition(),
- ERROR);
+ setMarker(sytaxErr1.getMessage(), scanner.getCurrentTokenStartPosition(), scanner.getCurrentTokenEndPosition(), ERROR);
try {
// if an error occured,
// try to find keywords 'class' or 'function'
@@ -1402,11 +750,7 @@ public class Parser extends PHPKeywords implements ITerminalSymbols {
}
} catch (SyntaxError sytaxErr2) {
// setMarker(sytaxErr2.getMessage(), sytaxErr2.getLine(), ERROR);
- setMarker(
- sytaxErr2.getMessage(),
- scanner.getCurrentTokenStartPosition(),
- scanner.getCurrentTokenEndPosition(),
- ERROR);
+ setMarker(sytaxErr2.getMessage(), scanner.getCurrentTokenStartPosition(), scanner.getCurrentTokenEndPosition(), ERROR);
return;
}
}
@@ -1421,9 +765,9 @@ public class Parser extends PHPKeywords implements ITerminalSymbols {
this.str = s;
this.token = TokenNameEOF;
-// this.chIndx = 0;
-// this.rowCount = 1;
-// this.columnCount = 0;
+ // this.chIndx = 0;
+ // this.rowCount = 1;
+ // this.columnCount = 0;
this.phpEnd = false;
this.phpMode = false;
scanner.setSource(s.toCharArray());
@@ -1437,15 +781,16 @@ public class Parser extends PHPKeywords implements ITerminalSymbols {
return outlineInfo;
}
- private void parseDeclarations(
- PHPOutlineInfo outlineInfo,
- PHPSegmentWithChildren current,
- boolean goBack) {
+ 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) {
@@ -1455,14 +800,14 @@ public class Parser extends PHPKeywords implements ITerminalSymbols {
getNextToken();
} else if (token == TokenNamevar) {
getNextToken();
- if (token == TokenNameVariable
- && store.getBoolean(PHPeclipsePlugin.PHP_OUTLINE_VAR)) {
+ if (token == TokenNameVariable && store.getBoolean(PHPeclipsePlugin.PHP_OUTLINE_VAR)) {
ident = scanner.getCurrentIdentifierSource();
- String variableName = new String(ident);
+ //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) {
@@ -1472,6 +817,7 @@ public class Parser extends PHPKeywords implements ITerminalSymbols {
} else {
switch (token) {
case TokenNameVariable :
+ case TokenNamethis :
current.add(new PHPVarDeclaration(current, variableName,
// chIndx - ident.length,
scanner.getCurrentTokenStartPosition(), new String(ident)));
@@ -1482,10 +828,7 @@ public class Parser extends PHPKeywords implements ITerminalSymbols {
scanner.getCurrentTokenStartPosition(), new String(ident)));
break;
case TokenNameDoubleLiteral :
- current
- .add(new PHPVarDeclaration(
- current,
- variableName + doubleNumber,
+ current.add(new PHPVarDeclaration(current, variableName + doubleNumber,
// chIndx - ident.length,
scanner.getCurrentTokenStartPosition(), new String(ident)));
break;
@@ -1526,8 +869,7 @@ public class Parser extends PHPKeywords implements ITerminalSymbols {
if (token == TokenNameAND) {
getNextToken();
}
- if (token == TokenNameIdentifier
- && store.getBoolean(PHPeclipsePlugin.PHP_OUTLINE_FUNC)) {
+ if (token == TokenNameIdentifier && store.getBoolean(PHPeclipsePlugin.PHP_OUTLINE_FUNC)) {
ident = scanner.getCurrentIdentifierSource();
outlineInfo.addVariable(new String(ident));
temp = new PHPFunctionDeclaration(current, new String(ident),
@@ -1539,8 +881,7 @@ public class Parser extends PHPKeywords implements ITerminalSymbols {
}
} else if (token == TokenNameclass) {
getNextToken();
- if (token == TokenNameIdentifier
- && store.getBoolean(PHPeclipsePlugin.PHP_OUTLINE_CLASS)) {
+ if (token == TokenNameIdentifier && store.getBoolean(PHPeclipsePlugin.PHP_OUTLINE_CLASS)) {
ident = scanner.getCurrentIdentifierSource();
outlineInfo.addVariable(new String(ident));
temp = new PHPClassDeclaration(current, new String(ident),
@@ -1551,15 +892,13 @@ public class Parser extends PHPKeywords implements ITerminalSymbols {
getNextToken();
//skip tokens for classname, extends and others until we have the opening '{'
- while (token != TokenNameLBRACE
- && token != TokenNameEOF
- && token != TokenNameERROR) {
+ while (token != TokenNameLBRACE && token != TokenNameEOF && token != TokenNameERROR) {
getNextToken();
}
parseDeclarations(outlineInfo, temp, true);
// stack.pop();
}
- } else if (token == TokenNameLBRACE) {
+ } else if ((token == TokenNameLBRACE) || (token == TokenNameDOLLAR_LBRACE)) {
getNextToken();
counter++;
} else if (token == TokenNameRBRACE) {
@@ -1573,12 +912,12 @@ public class Parser extends PHPKeywords implements ITerminalSymbols {
|| token == TokenNamerequire_once
|| token == TokenNameinclude
|| token == TokenNameinclude_once) {
- ident = scanner.getCurrentTokenSource();
-
+ ident = scanner.getCurrentTokenSource();
+
getNextToken();
int startPosition = scanner.getCurrentTokenStartPosition();
expression();
- char[] expr = scanner.getCurrentTokenSource(startPosition);
+ char[] expr = scanner.getCurrentTokenSource(startPosition);
outlineInfo.addVariable(new String(ident));
current.add(new PHPReqIncDeclaration(current, new String(ident),
// chIndx - ident.length,
@@ -1592,11 +931,7 @@ public class Parser extends PHPKeywords implements ITerminalSymbols {
} catch (SyntaxError sytaxErr) {
try {
// setMarker(sytaxErr.getMessage(), sytaxErr.getLine(), ERROR);
- setMarker(
- sytaxErr.getMessage(),
- scanner.getCurrentTokenStartPosition(),
- scanner.getCurrentTokenEndPosition(),
- ERROR);
+ setMarker(sytaxErr.getMessage(), scanner.getCurrentTokenStartPosition(), scanner.getCurrentTokenEndPosition(), ERROR);
} catch (CoreException e) {
}
}
@@ -1604,10 +939,11 @@ public class Parser extends PHPKeywords implements ITerminalSymbols {
private void statementList() throws CoreException {
do {
- statement();
+ statement(TokenNameEOF);
if ((token == TokenNameRBRACE)
|| (token == TokenNamecase)
|| (token == TokenNamedefault)
+ || (token == TokenNameelse)
|| (token == TokenNameelseif)
|| (token == TokenNameendif)
|| (token == TokenNameendfor)
@@ -1638,33 +974,42 @@ public class Parser extends PHPKeywords implements ITerminalSymbols {
}
}
- private void statement() throws CoreException {
+ private void statement(int previousToken) throws CoreException {
// if (token > TokenNameKEYWORD && token != TokenNamelist && token != TokenNamenew) {
// char[] ident = scanner.getCurrentIdentifierSource();
// String keyword = new String(ident);
if (token == TokenNameinclude || token == TokenNameinclude_once) {
getNextToken();
- expression();
- if (token == TokenNameSEMICOLON) {
- getNextToken();
- } else {
- if (token != TokenNameStopPHP) {
- throwSyntaxError("';' character after 'include' or 'include_once' expected.");
+ if (token == TokenNameLPAREN) {
+ expression();
+ if (token == TokenNameSEMICOLON) {
+ getNextToken();
+ } else {
+ if (previousToken != TokenNameAT && token != TokenNameStopPHP) {
+ throwSyntaxError("';' expected after 'include' or 'include_once'.");
+ }
+ // getNextToken();
}
- getNextToken();
+ } else {
+ concatenationExpression();
}
+
return;
} else if (token == TokenNamerequire || token == TokenNamerequire_once) {
getNextToken();
//constant();
- expression();
- if (token == TokenNameSEMICOLON) {
- getNextToken();
- } else {
- if (token != TokenNameStopPHP) {
- throwSyntaxError("';' character after 'require' or 'require_once' expected.");
+ if (token == TokenNameLPAREN) {
+ expression();
+ if (token == TokenNameSEMICOLON) {
+ getNextToken();
+ } else {
+ if (previousToken != TokenNameAT && token != TokenNameStopPHP) {
+ throwSyntaxError("';' expected after 'require' or 'require_once'.");
+ }
+ // getNextToken();
}
- getNextToken();
+ } else {
+ concatenationExpression();
}
return;
} else if (token == TokenNameif) {
@@ -1818,10 +1163,7 @@ public class Parser extends PHPKeywords implements ITerminalSymbols {
foreachStatement();
return;
- } else if (
- token == TokenNamecontinue
- || token == TokenNamebreak
- || token == TokenNamereturn) {
+ } else if (token == TokenNamecontinue || token == TokenNamebreak || token == TokenNamereturn) {
getNextToken();
if (token != TokenNameSEMICOLON) {
expression();
@@ -1976,10 +1318,7 @@ public class Parser extends PHPKeywords implements ITerminalSymbols {
return;
} else {
if (token != TokenNameStopPHP && token != TokenNameEOF) {
- throwSyntaxError(
- "';' expected after expression (Found token: "
- + scanner.toStringAction(token)
- + ")");
+ throwSyntaxError("';' expected after expression (Found token: " + scanner.toStringAction(token) + ")");
}
getNextToken();
}
@@ -1992,15 +1331,20 @@ public class Parser extends PHPKeywords implements ITerminalSymbols {
if (token == TokenNameIdentifier) {
getNextToken();
if (token == TokenNameextends) {
- getNextToken();
- if (token == TokenNameIdentifier) {
+ do {
getNextToken();
- } else {
- throwSyntaxError("Class name expected after keyword 'extends'.");
- }
+ if (token == TokenNameIdentifier) {
+ getNextToken();
+ } else {
+ throwSyntaxError("ClassDeclaration name expected after keyword 'extends'.");
+ }
+ } while (token == TokenNameCOMMA);
}
} else {
- throwSyntaxError("Class name expected after keyword 'class'.");
+ if (token > TokenNameKEYWORD) {
+ throwSyntaxError("Don't use keyword for class declaration [" + token + "].");
+ }
+ throwSyntaxError("ClassDeclaration name expected after keyword 'class'.");
}
}
@@ -2052,6 +1396,9 @@ public class Parser extends PHPKeywords implements ITerminalSymbols {
constant();
}
} else {
+ if (token == TokenNamethis) {
+ throwSyntaxError("Reserved word '$this' not allowed after keyword 'var'.");
+ }
throwSyntaxError("Variable expected after keyword 'var'.");
}
if (token != TokenNameCOMMA) {
@@ -2091,6 +1438,11 @@ public class Parser extends PHPKeywords implements ITerminalSymbols {
} else {
getNextToken();
}
+ } else {
+ if (token > TokenNameKEYWORD) {
+ throwSyntaxError("Don't use keyword for function declaration [" + token + "].");
+ }
+ throwSyntaxError("Function name expected after keyword 'function'.");
}
}
//
@@ -2111,7 +1463,7 @@ public class Parser extends PHPKeywords implements ITerminalSymbols {
//variable-reference
if (token == TokenNameAND) {
getNextToken();
- if (token == TokenNameVariable) {
+ if (isVariable()) {
getNextToken();
} else {
throwSyntaxError("Variable expected after reference operator '&'.");
@@ -2126,6 +1478,9 @@ public class Parser extends PHPKeywords implements ITerminalSymbols {
}
return;
}
+ if (token == TokenNamethis) {
+ throwSyntaxError("Reserved word '$this' not allowed in parameter declaration.");
+ }
}
private void labeledStatementList() throws CoreException {
@@ -2135,11 +1490,10 @@ public class Parser extends PHPKeywords implements ITerminalSymbols {
do {
if (token == TokenNamecase) {
getNextToken();
- constant();
+ expression(); //constant();
if (token == TokenNameCOLON) {
getNextToken();
- if (token == TokenNamecase
- || token == TokenNamedefault) { // empty case statement ?
+ if (token == TokenNamecase || token == TokenNamedefault) { // empty case statement ?
continue;
}
statementList();
@@ -2151,9 +1505,7 @@ public class Parser extends PHPKeywords implements ITerminalSymbols {
// rowCount,
// PHPParser.INFO);
setMarker(
- "':' expected after 'case' keyword (Found token: "
- + scanner.toStringAction(token)
- + ")",
+ "':' expected after 'case' keyword (Found token: " + scanner.toStringAction(token) + ")",
scanner.getCurrentTokenStartPosition(),
scanner.getCurrentTokenEndPosition(),
INFO);
@@ -2163,10 +1515,7 @@ public class Parser extends PHPKeywords implements ITerminalSymbols {
}
statementList();
} else {
- throwSyntaxError(
- "':' character after 'case' constant expected (Found token: "
- + scanner.toStringAction(token)
- + ")");
+ throwSyntaxError("':' character after 'case' constant expected (Found token: " + scanner.toStringAction(token) + ")");
}
} else { // TokenNamedefault
getNextToken();
@@ -2237,26 +1586,30 @@ public class Parser extends PHPKeywords implements ITerminalSymbols {
// ':' statement-list [elseif-list] [else-colon-statement] 'endif' ';'
if (token == TokenNameCOLON) {
getNextToken();
- statementList();
- switch (token) {
- case TokenNameelse :
- getNextToken();
- if (token == TokenNameCOLON) {
+ if (token != TokenNameendif) {
+ statementList();
+ switch (token) {
+ case TokenNameelse :
getNextToken();
- statementList();
- } else {
- if (token == TokenNameif) { //'else if'
+ if (token == TokenNameCOLON) {
getNextToken();
- elseifStatementList();
+ if (token != TokenNameendif) {
+ statementList();
+ }
} else {
- throwSyntaxError("':' expected after 'else'.");
+ if (token == TokenNameif) { //'else if'
+ getNextToken();
+ elseifStatementList();
+ } else {
+ throwSyntaxError("':' expected after 'else'.");
+ }
}
- }
- break;
- case TokenNameelseif :
- getNextToken();
- elseifStatementList();
- break;
+ break;
+ case TokenNameelseif :
+ getNextToken();
+ elseifStatementList();
+ break;
+ }
}
if (token != TokenNameendif) {
@@ -2269,7 +1622,7 @@ public class Parser extends PHPKeywords implements ITerminalSymbols {
getNextToken();
} else {
// statement [else-statement]
- statement();
+ statement(TokenNameEOF);
if (token == TokenNameelseif) {
getNextToken();
if (token == TokenNameLPAREN) {
@@ -2286,7 +1639,7 @@ public class Parser extends PHPKeywords implements ITerminalSymbols {
ifStatement();
} else if (token == TokenNameelse) {
getNextToken();
- statement();
+ statement(TokenNameEOF);
}
}
}
@@ -2299,7 +1652,9 @@ public class Parser extends PHPKeywords implements ITerminalSymbols {
getNextToken();
if (token == TokenNameCOLON) {
getNextToken();
- statementList();
+ if (token != TokenNameendif) {
+ statementList();
+ }
return;
} else {
if (token == TokenNameif) { //'else if'
@@ -2322,7 +1677,7 @@ public class Parser extends PHPKeywords implements ITerminalSymbols {
if (token == TokenNameLPAREN) {
getNextToken();
expression();
- if (token != TokenNameLPAREN) {
+ if (token != TokenNameRPAREN) {
throwSyntaxError("')' expected in else-if-statement.");
}
getNextToken();
@@ -2330,7 +1685,9 @@ public class Parser extends PHPKeywords implements ITerminalSymbols {
throwSyntaxError("':' expected in else-if-statement.");
}
getNextToken();
- statementList();
+ if (token != TokenNameendif) {
+ statementList();
+ }
}
}
@@ -2377,7 +1734,7 @@ public class Parser extends PHPKeywords implements ITerminalSymbols {
}
getNextToken();
} else {
- statement();
+ statement(TokenNameEOF);
}
}
@@ -2395,7 +1752,7 @@ public class Parser extends PHPKeywords implements ITerminalSymbols {
}
getNextToken();
} else {
- statement();
+ statement(TokenNameEOF);
}
}
@@ -2412,7 +1769,7 @@ public class Parser extends PHPKeywords implements ITerminalSymbols {
}
getNextToken();
} else {
- statement();
+ statement(TokenNameEOF);
}
}
@@ -2445,14 +1802,14 @@ public class Parser extends PHPKeywords implements ITerminalSymbols {
private void expression() throws CoreException {
//todo: find a better way to get the expression
-// expression = new StringBuffer();
-// for (int i = chIndx; i < str.length(); i++) {
-// if (str.charAt(i) == ';') {
-// break;
-// }
-// expression.append(str.charAt(i));
-// }
-
+ // expression = new StringBuffer();
+ // for (int i = chIndx; i < str.length(); i++) {
+ // if (str.charAt(i) == ';') {
+ // break;
+ // }
+ // expression.append(str.charAt(i));
+ // }
+
// if (token == TokenNameSTRING_CONSTANT || token == TokenNameINTERPOLATED_STRING) {
// getNextToken();
// } else {
@@ -2467,6 +1824,7 @@ public class Parser extends PHPKeywords implements ITerminalSymbols {
// String ident;
char[] ident;
boolean castFlag = false;
+ boolean arrayFlag = false;
switch (token) {
case TokenNamenew :
getNextToken();
@@ -2491,6 +1849,7 @@ public class Parser extends PHPKeywords implements ITerminalSymbols {
break;
case TokenNameLPAREN :
getNextToken();
+
if (token == TokenNameIdentifier) {
// check if identifier is a type:
// ident = identifier;
@@ -2499,20 +1858,34 @@ public class Parser extends PHPKeywords implements ITerminalSymbols {
for (int i = 0; i < PHP_TYPES.length; i++) {
if (PHP_TYPES[i].equals(str)) {
castFlag = true;
+ if (PHP_TYPES[i].equals("array")) {
+ arrayFlag = true;
+ }
break;
}
}
- if (castFlag) {
+ }
+
+ if (castFlag) {
+ getNextToken();
+ if (arrayFlag && token == TokenNameLPAREN) {
getNextToken();
- if (token != TokenNameRPAREN) {
- throwSyntaxError(") expected after cast-type '" + str + "'.");
+ if (token == TokenNameRPAREN) {
+ getNextToken();
+ } else {
+ expression();
+ if (token != TokenNameRPAREN) {
+ throwSyntaxError(") expected after 'array('.");
+ }
}
- getNextToken();
- expression();
- break;
}
- }
- if (!castFlag) {
+ if (token != TokenNameRPAREN) {
+ throwSyntaxError(") expected after cast-type '" + str + "'.");
+ }
+ getNextToken();
+ expression();
+ break;
+ } else {
expression();
}
if (token != TokenNameRPAREN) {
@@ -2535,16 +1908,14 @@ public class Parser extends PHPKeywords implements ITerminalSymbols {
getNextToken();
break;
case TokenNameVariable :
+ case TokenNamethis :
ident = scanner.getCurrentIdentifierSource();
getNextToken();
if (token == TokenNameLBRACE) {
getNextToken();
expression();
if (token != TokenNameRBRACE) {
- throwSyntaxError(
- "'}' expected after variable '"
- + new String(ident)
- + "' in variable-expression.");
+ throwSyntaxError("'}' expected after variable '" + new String(ident) + "' in variable-expression.");
}
getNextToken();
} else if (token == TokenNameLPAREN) {
@@ -2552,10 +1923,7 @@ public class Parser extends PHPKeywords implements ITerminalSymbols {
if (token != TokenNameRPAREN) {
expressionList();
if (token != TokenNameRPAREN) {
- throwSyntaxError(
- "')' expected after variable '"
- + new String(ident)
- + "' in postfix-expression.");
+ throwSyntaxError("')' expected after variable '" + new String(ident) + "' in postfix-expression.");
}
}
getNextToken();
@@ -2685,9 +2053,7 @@ public class Parser extends PHPKeywords implements ITerminalSymbols {
// rowCount,
// PHPParser.INFO);
setMarker(
- "Avoid using keyword '"
- + new String(ident)
- + "' as variable name.",
+ "Avoid using keyword '" + new String(ident) + "' as variable name.",
scanner.getCurrentTokenStartPosition(),
scanner.getCurrentTokenEndPosition(),
INFO);
@@ -2719,10 +2085,7 @@ public class Parser extends PHPKeywords implements ITerminalSymbols {
break;
default :
throwSyntaxError("Syntax error after '->' token.");
- } while (
- token == TokenNameLBRACKET
- || token == TokenNameLPAREN
- || token == TokenNameLBRACE) {
+ } while (token == TokenNameLBRACKET || token == TokenNameLPAREN || token == TokenNameLBRACE) {
if (token == TokenNameLBRACKET) {
getNextToken();
expressionList();
@@ -2730,16 +2093,14 @@ public class Parser extends PHPKeywords implements ITerminalSymbols {
throwSyntaxError("] expected after '->'.");
}
getNextToken();
- }
- if (token == TokenNameLPAREN) {
+ } else if (token == TokenNameLPAREN) {
getNextToken();
expressionList();
if (token != TokenNameRPAREN) {
throwSyntaxError(") expected after '->'.");
}
getNextToken();
- }
- if (token == TokenNameLBRACE) {
+ } else if (token == TokenNameLBRACE) {
getNextToken();
expression();
if (token != TokenNameRBRACE) {
@@ -2776,7 +2137,14 @@ public class Parser extends PHPKeywords implements ITerminalSymbols {
// '@' '&' '*' '+' '-' '~' '!'
case TokenNameAT :
getNextToken();
- castExpression();
+ if (token == TokenNameinclude
+ || token == TokenNameinclude_once
+ || token == TokenNamerequire
+ || token == TokenNamerequire_once) {
+ statement(TokenNameAT);
+ } else {
+ postfixExpression(); // castExpression();
+ }
break;
case TokenNameAND :
getNextToken();
@@ -2819,27 +2187,6 @@ public class Parser extends PHPKeywords implements ITerminalSymbols {
unaryExpression();
}
- private void typeName() throws CoreException {
- //'string' 'unset' 'array' 'object'
- //'bool' 'boolean'
- //'real' 'double' 'float'
- //'int' 'integer'
- String identifier = "";
- if (token == TokenNameIdentifier) {
- char[] ident = scanner.getCurrentIdentifierSource();
- identifier = new String(ident);
- String str = identifier.toLowerCase();
- getNextToken();
- for (int i = 0; i < PHP_TYPES.length; i++) {
- if (PHP_TYPES[i].equals(str)) {
- return;
- }
- }
- }
- throwSyntaxError(
- "Expected type cast '( )'; Got '" + identifier + "'.");
- }
-
private void assignExpression() throws CoreException {
castExpression();
if (token == TokenNameEQUAL) { // =
@@ -2890,9 +2237,7 @@ public class Parser extends PHPKeywords implements ITerminalSymbols {
private void multiplicativeExpression() throws CoreException {
do {
assignExpression();
- if (token != TokenNameMULTIPLY
- && token != TokenNameDIVIDE
- && token != TokenNameREMAINDER) {
+ if (token != TokenNameMULTIPLY && token != TokenNameDIVIDE && token != TokenNameREMAINDER) {
return;
}
getNextToken();
@@ -2932,10 +2277,7 @@ public class Parser extends PHPKeywords implements ITerminalSymbols {
private void relationalExpression() throws CoreException {
do {
shiftExpression();
- if (token != TokenNameLESS
- && token != TokenNameGREATER
- && token != TokenNameLESS_EQUAL
- && token != TokenNameGREATER_EQUAL) {
+ if (token != TokenNameLESS && token != TokenNameGREATER && token != TokenNameLESS_EQUAL && token != TokenNameGREATER_EQUAL) {
return;
}
getNextToken();
@@ -2945,8 +2287,7 @@ public class Parser extends PHPKeywords implements ITerminalSymbols {
private void identicalExpression() throws CoreException {
do {
relationalExpression();
- if (token != TokenNameEQUAL_EQUAL_EQUAL
- && token != TokenNameNOT_EQUAL_EQUAL) {
+ if (token != TokenNameEQUAL_EQUAL_EQUAL && token != TokenNameNOT_EQUAL_EQUAL) {
return;
}
getNextToken();
@@ -3160,10 +2501,7 @@ public class Parser extends PHPKeywords implements ITerminalSymbols {
if (token != TokenNameRPAREN) {
expressionList();
if (token != TokenNameRPAREN) {
- throwSyntaxError(
- "')' expected after identifier '"
- + new String(ident)
- + "' in postfix-expression.");
+ throwSyntaxError("')' expected after identifier '" + new String(ident) + "' in postfix-expression.");
}
}
getNextToken();
@@ -3189,97 +2527,4 @@ public class Parser extends PHPKeywords implements ITerminalSymbols {
}
}
- /**
- * Call the php parse command ( php -l -f <filename> )
- * and create markers according to the external parser output
- */
- public static void phpExternalParse(IFile file) {
- //IFile file = (IFile) resource;
- IPath path = file.getFullPath();
- IPreferenceStore store = PHPeclipsePlugin.getDefault().getPreferenceStore();
- String filename = file.getLocation().toString();
-
- String[] arguments = { filename };
- MessageFormat form =
- new MessageFormat(store.getString(PHPeclipsePlugin.EXTERNAL_PARSER_PREF));
- String command = form.format(arguments);
-
- String parserResult =
- PHPStartApacheAction.getParserOutput(command, "External parser: ");
-
- try {
- // parse the buffer to find the errors and warnings
- createMarkers(parserResult, file);
- } catch (CoreException e) {
- }
- }
-
- /**
- * Create markers according to the external parser output
- */
- private static void createMarkers(String output, IFile file)
- throws CoreException {
- // delete all markers
- file.deleteMarkers(IMarker.PROBLEM, false, 0);
-
- int indx = 0;
- int brIndx = 0;
- boolean flag = true;
- while ((brIndx = output.indexOf("
", indx)) != -1) {
- // newer php error output (tested with 4.2.3)
- scanLine(output, file, indx, brIndx);
- indx = brIndx + 6;
- flag = false;
- }
- if (flag) {
- while ((brIndx = output.indexOf("
", indx)) != -1) {
- // older php error output (tested with 4.2.3)
- scanLine(output, file, indx, brIndx);
- indx = brIndx + 4;
- }
- }
- }
-
- private static void scanLine(String output, IFile file, int indx, int brIndx)
- throws CoreException {
- String current;
- String outLineNumberString;
- StringBuffer lineNumberBuffer = new StringBuffer(10);
- char ch;
- current = output.substring(indx, brIndx);
-
- if (current.indexOf(PARSE_WARNING_STRING) != -1
- || current.indexOf(PARSE_ERROR_STRING) != -1) {
- int onLine = current.indexOf("on line ");
- if (onLine != -1) {
- lineNumberBuffer.delete(0, lineNumberBuffer.length());
- for (int i = onLine; i < current.length(); i++) {
- ch = current.charAt(i);
- if ('0' <= ch && '9' >= ch) {
- lineNumberBuffer.append(ch);
- }
- }
-
- int lineNumber = Integer.parseInt(lineNumberBuffer.toString());
-
- Hashtable attributes = new Hashtable();
-
- current = current.replaceAll("\n", "");
- current = current.replaceAll("", "");
- current = current.replaceAll("", "");
- MarkerUtilities.setMessage(attributes, current);
-
- if (current.indexOf(PARSE_ERROR_STRING) != -1)
- attributes.put(IMarker.SEVERITY, new Integer(IMarker.SEVERITY_ERROR));
- else if (current.indexOf(PARSE_WARNING_STRING) != -1)
- attributes.put(
- IMarker.SEVERITY,
- new Integer(IMarker.SEVERITY_WARNING));
- else
- attributes.put(IMarker.SEVERITY, new Integer(IMarker.SEVERITY_INFO));
- MarkerUtilities.setLineNumber(attributes, lineNumber);
- MarkerUtilities.createMarker(file, attributes, IMarker.PROBLEM);
- }
- }
- }
}
\ No newline at end of file