X-Git-Url: http://git.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 7369a24..939f999 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
@@ -1,29 +1,34 @@
-/**********************************************************************
- Copyright (c) 2002 Klaus Hartlage - www.eclipseproject.de
- All rights reserved. This program and the accompanying materials
- are made available under the terms of the Common Public License v1.0
- which accompanies this distribution, and is available at
- http://www.eclipse.org/legal/cpl-v10.html
-
- Contributors:
- Klaus Hartlage - www.eclipseproject.de
- **********************************************************************/
+/*******************************************************************************
+ * Copyright (c) 2002 Klaus Hartlage - www.eclipseproject.de All rights
+ * reserved. This program and the accompanying material are made available under
+ * the terms of the Common Public License v1.0 which accompanies this
+ * distribution, and is available at http://www.eclipse.org/legal/cpl-v10.html
+ *
+ * Contributors: Klaus Hartlage - www.eclipseproject.de
+ ******************************************************************************/
package net.sourceforge.phpdt.internal.compiler.parser;
import java.util.ArrayList;
+
import net.sourceforge.phpdt.core.compiler.CharOperation;
import net.sourceforge.phpdt.core.compiler.ITerminalSymbols;
import net.sourceforge.phpdt.core.compiler.InvalidInputException;
+import net.sourceforge.phpdt.internal.compiler.impl.CompilerOptions;
import net.sourceforge.phpdt.internal.compiler.impl.ReferenceContext;
import net.sourceforge.phpdt.internal.compiler.lookup.CompilerModifiers;
import net.sourceforge.phpdt.internal.compiler.lookup.TypeConstants;
import net.sourceforge.phpdt.internal.compiler.problem.ProblemReporter;
+import net.sourceforge.phpdt.internal.compiler.problem.ProblemSeverities;
+import net.sourceforge.phpdt.internal.compiler.util.Util;
+import net.sourceforge.phpeclipse.builder.IdentifierIndexManager;
import net.sourceforge.phpeclipse.internal.compiler.ast.AbstractMethodDeclaration;
import net.sourceforge.phpeclipse.internal.compiler.ast.AstNode;
import net.sourceforge.phpeclipse.internal.compiler.ast.CompilationUnitDeclaration;
+import net.sourceforge.phpeclipse.internal.compiler.ast.FieldDeclaration;
+import net.sourceforge.phpeclipse.internal.compiler.ast.ImportReference;
import net.sourceforge.phpeclipse.internal.compiler.ast.MethodDeclaration;
import net.sourceforge.phpeclipse.internal.compiler.ast.SingleTypeReference;
import net.sourceforge.phpeclipse.internal.compiler.ast.TypeDeclaration;
-import net.sourceforge.phpeclipse.phpeditor.PHPString;
+
import org.eclipse.core.resources.IFile;
public class Parser //extends PHPParserSuperclass
implements ITerminalSymbols, CompilerModifiers, ParserBasicInformation {
@@ -62,13 +67,18 @@ public class Parser //extends PHPParserSuperclass
private String stringValue;
/** Contains the current expression. */
// private StringBuffer expression;
- private boolean phpMode;
+ //private boolean phpMode;
protected int modifiers;
protected int modifiersSourceStart;
- protected Parser() {
+// protected IdentifierIndexManager indexManager;
+
+ protected Parser(ProblemReporter problemReporter) {
+ this.problemReporter = problemReporter;
+ this.options = problemReporter.options;
this.currentPHPString = 0;
// PHPParserSuperclass.fileToParse = fileToParse;
this.phpList = null;
+// this.indexManager = null;
this.str = "";
this.token = TokenNameEOF;
// this.chIndx = 0;
@@ -82,6 +92,7 @@ public class Parser //extends PHPParserSuperclass
this.currentPHPString = 0;
// PHPParserSuperclass.fileToParse = fileToParse;
this.phpList = null;
+// this.indexManager = null;
this.str = "";
this.token = TokenNameEOF;
this.phpEnd = false;
@@ -92,7 +103,7 @@ public class Parser //extends PHPParserSuperclass
*
* @param s
* @param sess
- * Description of Parameter
+ * Description of Parameter
* @see
*/
public Parser(IFile fileToParse) {
@@ -105,6 +116,7 @@ public class Parser //extends PHPParserSuperclass
this.currentPHPString = 0;
// PHPParserSuperclass.fileToParse = fileToParse;
this.phpList = null;
+ this.includesList = null;
this.str = "";
this.token = TokenNameEOF;
// this.chIndx = 0;
@@ -115,7 +127,9 @@ public class Parser //extends PHPParserSuperclass
this.initializeScanner();
}
public void initializeScanner() {
- this.scanner = new Scanner(false, false, false, false);
+ 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
@@ -129,41 +143,39 @@ public class Parser //extends PHPParserSuperclass
* columns to the Error
*
* @param error
- * the error message
+ * the error message
* @throws SyntaxError
- * the error raised
+ * the error raised
*/
private void throwSyntaxError(String error) {
int problemStartPosition = scanner.getCurrentTokenStartPosition();
int problemEndPosition = scanner.getCurrentTokenEndPosition();
- throwSyntaxError(error, problemStartPosition, problemEndPosition);
+ 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
+ * the error message
* @throws SyntaxError
- * the error raised
+ * 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);
+ 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 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.
@@ -191,434 +203,20 @@ public class Parser //extends PHPParserSuperclass
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) {
token = TokenNameERROR;
- }
- return;
- }
- /**
- * Get a number. if it's a double the number will be stored in
- * doubleNumber and the token will have the value
- * {@link Parser#TokenNameDOUBLE_NUMBER}
- * 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();
- // }
- // public void htmlParserTester(String input) {
- // int lineNumber = 1;
- // int startLineNumber = 1;
- // int startIndex = 0;
- // char ch;
- // char ch2;
- // boolean phpMode = false;
- // boolean phpFound = false;
- //
- // phpList = new ArrayList();
- // currentPHPString = 0;
- //
- // try {
- // int i = 0;
- // while (i < input.length()) {
- // ch = input.charAt(i++);
- // if (ch == '\n') {
- // lineNumber++;
- // }
- // if ((!phpMode) && ch == '<') {
- // ch2 = input.charAt(i++);
- // if (ch2 == '?') {
- // ch2 = input.charAt(i++);
- // if (Character.isWhitespace(ch2)) {
- // // php start
- // phpMode = true;
- // phpFound = true;
- // startIndex = i;
- // startLineNumber = lineNumber;
- // continue;
- // } else if (ch2 == 'p') {
- // ch2 = input.charAt(i++);
- // if (ch2 == 'h') {
- // ch2 = input.charAt(i++);
- // if (ch2 == 'p') {
- // phpMode = true;
- // phpFound = true;
- // startIndex = i;
- // startLineNumber = lineNumber;
- // continue;
- // }
- // i--;
- // }
- // i--;
- // } else if (ch2 == 'P') {
- // ch2 = input.charAt(i++);
- // if (ch2 == 'H') {
- // ch2 = input.charAt(i++);
- // if (ch2 == 'P') {
- // phpMode = true;
- // phpFound = true;
- // startIndex = i;
- // startLineNumber = lineNumber;
- // continue;
- // }
- // i--;
- // }
- // i--;
- // }
- // i--;
- // }
- // i--;
- // }
- //
- // if (phpMode) {
- // if (ch == '/' && i < input.length()) {
- // ch2 = input.charAt(i++);
- // if (ch2 == '/') {
- // while (i < input.length()) {
- // ch = input.charAt(i++);
- // if (ch == '?' && i < input.length()) {
- // ch2 = input.charAt(i++);
- // if (ch2 == '>') {
- // // php end
- // phpMode = false;
- // phpList.add(
- // new PHPString(
- // input.substring(
- // startIndex,
- // i - 2),
- // startLineNumber));
- // continue;
- // }
- // i--;
- // } else if (ch == '\n') {
- // lineNumber++;
- // break;
- // }
- // }
- // continue;
- // } else if (ch2 == '*') {
- // // multi-line comment
- // while (i < input.length()) {
- // ch = input.charAt(i++);
- // if (ch == '\n') {
- // lineNumber++;
- // } else if (ch == '*' && i < input.length()) {
- // ch2 = input.charAt(i++);
- // if (ch2 == '/') {
- // break;
- // }
- // i--;
- // }
- // }
- // continue;
- // } else {
- // i--;
- // }
- // } else if (ch == '#') {
- // while (i < input.length()) {
- // ch = input.charAt(i++);
- // if (ch == '?' && i < input.length()) {
- // ch2 = input.charAt(i++);
- // if (ch2 == '>') {
- // // php end
- // phpMode = false;
- // phpList.add(
- // new PHPString(
- // input.substring(startIndex, i - 2),
- // startLineNumber));
- // continue;
- // }
- // i--;
- // } else if (ch == '\n') {
- // lineNumber++;
- // break;
- // }
- // }
- // continue;
- // } else if (ch == '"') {
- // ch = ' ';
- // while (i < input.length()) {
- // ch = input.charAt(i++);
- // if (ch == '\n') {
- // lineNumber++;
- // } else if (
- // ch == '\\' && i < input.length()) { // escape
- // i++;
- // } else if (ch == '"') {
- // break;
- // }
- // }
- // continue;
- // } else if (ch == '\'') {
- // ch = ' ';
- // while (i < input.length()) {
- // ch = input.charAt(i++);
- // if (ch == '\n') {
- // lineNumber++;
- // } else if (
- // ch == '\\' && i < input.length()) { // escape
- // i++;
- // } else if (ch == '\'') {
- // break;
- // }
- // }
- // continue;
- // }
- //
- // if (ch == '?' && i < input.length()) {
- // ch2 = input.charAt(i++);
- // if (ch2 == '>') {
- // // php end
- // phpMode = false;
- // phpList.add(
- // new PHPString(
- // input.substring(startIndex, i - 2),
- // startLineNumber));
- // continue;
- // }
- // i--;
- // }
- // }
- // }
- //
- // if (!phpFound) {
- // setMarker(
- // "No PHP source code found.",
- // lineNumber,
- // PHPParser.INFO);
- // } else {
- // if (phpMode) {
- // setMarker(
- // "Open PHP tag at end of file.",
- // lineNumber,
- // PHPParser.INFO);
- // phpList.add(
- // new PHPString(
- // input.substring(startIndex, i - 2),
- // startLineNumber));
- // }
- // // for (int j=0;j");
- // // }
- // phpParserTester(null, 1);
- // // PHPString temp;
- // // for(int j=0;j 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);
+ problemReporter.phpKeywordWarning(new String[]{scanner.toStringAction(token)}, scanner.getCurrentTokenStartPosition(), scanner.getCurrentTokenEndPosition(),
+ referenceContext, compilationUnit.compilationResult);
+// 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);
+ throwSyntaxError("Interface name expected after keyword 'interface'.", typeDecl.sourceStart, typeDecl.sourceEnd);
return;
}
} else {
@@ -1365,38 +1118,36 @@ public class Parser //extends PHPParserSuperclass
// '{' class_statement_list'}'
class_entry_type();
typeDecl.modifiers = this.modifiers;
+ typeDecl.sourceStart = scanner.getCurrentTokenStartPosition();
+ typeDecl.sourceEnd = scanner.getCurrentTokenEndPosition();
//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);
+ problemReporter.phpKeywordWarning(new String[]{scanner.toStringAction(token)}, scanner.getCurrentTokenStartPosition(), scanner.getCurrentTokenEndPosition(),
+ referenceContext, compilationUnit.compilationResult);
+// 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) {
- getNextToken();
- if (token == TokenNameIdentifier) {
- getNextToken();
- } else {
- throwSyntaxError("Class name expected after keyword 'extends'.",
- scanner.getCurrentTokenStartPosition(), scanner
- .getCurrentTokenEndPosition());
- }
+ 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);
+ throwSyntaxError("Class name expected after keyword 'class'.", typeDecl.sourceStart, typeDecl.sourceEnd);
return;
}
}
@@ -1404,7 +1155,12 @@ public class Parser //extends PHPParserSuperclass
if (token == TokenNameLBRACE) {
getNextToken();
if (token != TokenNameRBRACE) {
- class_statement_list();
+ 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();
@@ -1437,7 +1193,7 @@ public class Parser //extends PHPParserSuperclass
}
getNextToken();
} else {
- throwSyntaxError("Keyword 'class' 'final' or 'abstract' expected");
+ throwSyntaxError("Keyword 'class' 'final' or 'abstract' expected");
}
}
private void interface_extends_list() {
@@ -1489,43 +1245,43 @@ public class Parser //extends PHPParserSuperclass
// throwSyntaxError("'{' expected at start of class body.");
// }
// }
- private void class_statement_list() {
+ private void class_statement_list(ArrayList list) {
do {
- class_statement();
- } while (token == TokenNamepublic ||
- token == TokenNameprotected ||
- token == TokenNameprivate ||
- token == TokenNamestatic ||
- token == TokenNameabstract ||
- token == TokenNamefinal ||
- token == TokenNamefunction ||
- token == TokenNamevar);
- }
- private void class_statement() {
+ 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);
- reportSyntaxError(
- "Keyword 'var' is deprecated. Please use 'public' 'private' or 'protected' modifier for field declarations.",
- scanner.getCurrentTokenStartPosition(), scanner
- .getCurrentTokenEndPosition());
+ problemReporter.phpVarDeprecatedWarning(scanner.getCurrentTokenStartPosition(), scanner.getCurrentTokenEndPosition(),
+ referenceContext, compilationUnit.compilationResult);
+ getNextToken();
+ class_variable_declaration(declarationSourceStart, list);
+ } else if (token == TokenNameconst) {
+ checkAndSetModifiers(AccFinal|AccPublic);
+ class_constant_declaration(declarationSourceStart, list);
+ if (token != TokenNameSEMICOLON) {
+ throwSyntaxError("';' expected after class const declaration.");
+ }
getNextToken();
- classProperty();
} else {
boolean hasModifiers = member_modifiers();
if (token == TokenNamefunction) {
if (!hasModifiers) {
checkAndSetModifiers(AccPublic);
}
- MethodDeclaration methodDecl = new MethodDeclaration(
- this.compilationUnit.compilationResult);
- methodDecl.declarationSourceStart = scanner
- .getCurrentTokenStartPosition();
+ MethodDeclaration methodDecl = new MethodDeclaration(this.compilationUnit.compilationResult);
+ methodDecl.declarationSourceStart = scanner.getCurrentTokenStartPosition();
methodDecl.modifiers = this.modifiers;
getNextToken();
functionDefinition(methodDecl);
@@ -1533,22 +1289,41 @@ public class Parser //extends PHPParserSuperclass
if (!hasModifiers) {
throwSyntaxError("'public' 'private' or 'protected' modifier expected for field declarations.");
}
- classProperty();
+ 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(int declarationSourceStart, ArrayList list) {
+ // 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.");
+ }
+ 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) {
+ throwSyntaxError("'=' expected in class const declaration.");
+ }
+ getNextToken();
+ static_scalar();
+ if (token != TokenNameCOMMA) {
+ break; // while(true)-loop
+ }
+ getNextToken();
+ }
}
// private void variable_modifiers() {
// // variable_modifiers:
@@ -1558,7 +1333,8 @@ public class Parser //extends PHPParserSuperclass
// if (token == TokenNamevar) {
// checkAndSetModifiers(AccPublic);
// reportSyntaxError(
- // "Keyword 'var' is deprecated. Please use 'public' 'private' or 'protected'
+ // "Keyword 'var' is deprecated. Please use 'public' 'private' or
+ // 'protected'
// modifier for field declarations.",
// scanner.getCurrentTokenStartPosition(), scanner
// .getCurrentTokenEndPosition());
@@ -1618,34 +1394,49 @@ public class Parser //extends PHPParserSuperclass
}
return foundToken;
}
- private void classProperty() {
- //'var' variable ';'
- //'var' variable '=' constant ';'
+ 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
+ char[] classVariable;
do {
if (token == TokenNameVariable) {
+ classVariable = scanner.getCurrentIdentifierSource();
+ // indexManager.addIdentifierInformation('v', classVariable, buf, -1, -1);
+ FieldDeclaration fieldDeclaration = new FieldDeclaration(classVariable, 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();
- constant();
+ static_scalar();
}
} else {
- if (token == TokenNamethis) {
- throwSyntaxError("Reserved word '$this' not allowed after keyword 'var'.");
- }
- throwSyntaxError("Variable expected after keyword 'var'.");
+ // 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) {
- getNextToken();
- } else {
- throwSyntaxError("';' expected after variable declaration.");
+ 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 {
@@ -1656,18 +1447,26 @@ public class Parser //extends PHPParserSuperclass
typeDecl.methods = new AbstractMethodDeclaration[]{methodDecl};
} else {
AbstractMethodDeclaration[] newMethods;
- System
- .arraycopy(
- typeDecl.methods,
- 0,
- newMethods = new AbstractMethodDeclaration[typeDecl.methods.length + 1],
- 1, typeDecl.methods.length);
+ 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) {
@@ -1675,10 +1474,16 @@ public class Parser //extends PHPParserSuperclass
if (token == TokenNameAND) {
getNextToken();
}
- if (token == TokenNameIdentifier) {
- methodDecl.sourceStart = scanner.getCurrentTokenStartPosition();
- methodDecl.sourceEnd = scanner.getCurrentTokenEndPosition();
+ methodDecl.sourceStart = scanner.getCurrentTokenStartPosition();
+ methodDecl.sourceEnd = scanner.getCurrentTokenEndPosition();
+ if (Scanner.isIdentifierOrKeyword(token)) {
methodDecl.selector = scanner.getCurrentIdentifierSource();
+ if (token > TokenNameKEYWORD) {
+ problemReporter.phpKeywordWarning(new String[]{scanner.toStringAction(token)}, scanner.getCurrentTokenStartPosition(), scanner.getCurrentTokenEndPosition(),
+ referenceContext, compilationUnit.compilationResult);
+// reportSyntaxWarning("Don't use keyword for function declaration [" + scanner.toStringAction(token) + "].",
+// scanner.getCurrentTokenStartPosition(), scanner.getCurrentTokenEndPosition());
+ }
getNextToken();
if (token == TokenNameLPAREN) {
getNextToken();
@@ -1686,7 +1491,7 @@ public class Parser //extends PHPParserSuperclass
throwSyntaxError("'(' expected in function declaration.");
}
if (token != TokenNameRPAREN) {
- parameterList();
+ parameter_list();
}
if (token != TokenNameRPAREN) {
throwSyntaxError("')' expected in function declaration.");
@@ -1695,24 +1500,58 @@ public class Parser //extends PHPParserSuperclass
getNextToken();
}
} else {
- if (token > TokenNameKEYWORD) {
- throwSyntaxError("Don't use keyword for function declaration [" + token
- + "].");
- }
+ methodDecl.selector = "".toCharArray();
throwSyntaxError("Function name expected after keyword 'function'.");
}
}
//
- private void parameterList() {
- //parameter-declaration
- //parameter-list ',' parameter-declaration
- do {
- parameterDeclaration();
- if (token != TokenNameCOMMA) {
- break;
+ 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();
}
- getNextToken();
- } while (true);
+ return;
+ }
+ if (!empty_allowed) {
+ throwSyntaxError("Identifier expected in parameter list.");
+ }
+ }
+ private void optional_class_type() {
+ // /* empty */
+ //| T_STRING
}
private void parameterDeclaration() {
//variable
@@ -1730,13 +1569,14 @@ public class Parser //extends PHPParserSuperclass
getNextToken();
if (token == TokenNameEQUAL) {
getNextToken();
- constant();
+ static_scalar();
}
return;
}
- if (token == TokenNamethis) {
- throwSyntaxError("Reserved word '$this' not allowed in parameter declaration.");
- }
+ // if (token == TokenNamethis) {
+ // throwSyntaxError("Reserved word '$this' not allowed in parameter
+ // declaration.");
+ // }
}
private void labeledStatementList() {
if (token != TokenNamecase && token != TokenNamedefault) {
@@ -1748,10 +1588,8 @@ public class Parser //extends PHPParserSuperclass
expr(); //constant();
if (token == TokenNameCOLON || token == TokenNameSEMICOLON) {
getNextToken();
- if (token == TokenNamecase || token == TokenNamedefault) { // empty
- // case
- // statement
- // ?
+ if (token == TokenNamecase || token == TokenNamedefault) {
+ // empty case statement ?
continue;
}
statementList();
@@ -1770,16 +1608,21 @@ public class Parser //extends PHPParserSuperclass
// statementList();
// }
else {
- throwSyntaxError("':' character after 'case' constant expected (Found token: "
- + scanner.toStringAction(token) + ")");
+ throwSyntaxError("':' character expected after 'case' constant (Found token: " + scanner.toStringAction(token) + ")");
}
} else { // TokenNamedefault
getNextToken();
if (token == TokenNameCOLON) {
getNextToken();
- statementList();
+ if (token == TokenNameRBRACE) {
+ // empty default case
+ break;
+ }
+ if (token != TokenNamecase) {
+ statementList();
+ }
} else {
- throwSyntaxError("':' character after 'default' expected.");
+ throwSyntaxError("':' character expected after 'default'.");
}
}
} while (token == TokenNamecase || token == TokenNamedefault);
@@ -2040,29 +1883,85 @@ public class Parser //extends PHPParserSuperclass
} while (true);
}
private void expr() {
- //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));
- // }
- // if (token == TokenNameSTRING_CONSTANT || token ==
- // TokenNameINTERPOLATED_STRING) {
- // getNextToken();
- // } else {
- logicalinclusiveorExpression();
- // while (token != TokenNameSEMICOLON) {
- // getNextToken();
- // // }
+ // 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() {
- // String ident;
- char[] ident;
- boolean castFlag = false;
- boolean arrayFlag = false;
+ 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 :
@@ -2073,127 +1972,126 @@ public class Parser //extends PHPParserSuperclass
case TokenNamerequire_once :
internal_functions_in_yacc();
break;
- case TokenNamenew :
- getNextToken();
- expr();
- break;
- case TokenNamenull :
- getNextToken();
- break;
- case TokenNamefalse :
- getNextToken();
- break;
- case TokenNametrue :
- getNextToken();
- break;
- case TokenNameStringConstant :
- getNextToken();
- break;
- case TokenNameHEREDOC :
- case TokenNameStringInterpolated :
- case TokenNameStringLiteral :
- getNextToken();
- break;
+ // | '(' expr ')'
case TokenNameLPAREN :
getNextToken();
- if (token == TokenNameIdentifier) {
- // check if identifier is a type:
- // ident = identifier;
- ident = scanner.getCurrentIdentifierSource();
- String str = new String(ident).toLowerCase();
- 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) {
- getNextToken();
- if (arrayFlag && token == TokenNameLPAREN) {
- getNextToken();
- if (token == TokenNameRPAREN) {
- getNextToken();
- } else {
- expr();
- if (token != TokenNameRPAREN) {
- throwSyntaxError(") expected after 'array('.");
- }
- }
- }
- if (token != TokenNameRPAREN) {
- throwSyntaxError(") expected after cast-type '" + str + "'.");
- }
+ expr();
+ if (token == TokenNameRPAREN) {
getNextToken();
- expr();
- break;
} else {
- expr();
+ throwSyntaxError("')' expected in expression.");
}
- if (token != TokenNameRPAREN) {
- throwSyntaxError(") expected in postfix-expression.");
- }
- getNextToken();
break;
- case TokenNameDoubleLiteral :
+ // | 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 TokenNameIntegerLiteral :
+ case TokenNameexit :
getNextToken();
+ exit_expr();
break;
- case TokenNameDOLLAR_LBRACE :
+ // 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();
- expr();
- if (token != TokenNameRBRACE) {
- throwSyntaxError("'}' expected after indirect variable token '${'.");
+ 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();
}
- getNextToken();
break;
- case TokenNameVariable :
- case TokenNamethis :
- ident = scanner.getCurrentIdentifierSource();
+ // | '\'' encaps_list '\''
+ case TokenNameEncapsedString1 :
+ scanner.encapsedStringStack.push(new Character('\''));
getNextToken();
- if (token == TokenNameLBRACE) {
- getNextToken();
- expr();
- if (token != TokenNameRBRACE) {
- throwSyntaxError("'}' expected after variable '"
- + new String(ident) + "' in variable-expression.");
- }
- getNextToken();
- } else if (token == TokenNameLPAREN) {
- getNextToken();
- if (token != TokenNameRPAREN) {
- expressionList();
- if (token != TokenNameRPAREN) {
- throwSyntaxError("')' expected after variable '"
- + new String(ident) + "' in postfix-expression.");
+ 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;
- case TokenNameIdentifier :
- ident = scanner.getCurrentIdentifierSource();
+ //| '"' encaps_list '"'
+ case TokenNameEncapsedString2 :
+ scanner.encapsedStringStack.push(new Character('"'));
getNextToken();
- if (token == TokenNameLPAREN) {
- getNextToken();
- if (token != TokenNameRPAREN) {
- expressionList();
- if (token != TokenNameRPAREN) {
- throwSyntaxError("')' expected after identifier '"
- + new String(ident) + "' in postfix-expression."
- + "(Found token: " + scanner.toStringAction(token) + ")");
+ 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 TokenNameStringDoubleQuote :
+ case TokenNameStringSingleQuote :
+ 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 ')'
+ // T_ARRAY '(' array_pair_list ')'
getNextToken();
if (token == TokenNameLPAREN) {
getNextToken();
@@ -2203,514 +2101,788 @@ public class Parser //extends PHPParserSuperclass
}
array_pair_list();
if (token != TokenNameRPAREN) {
- throwSyntaxError("')' expected after keyword 'array'"
- + "(Found token: " + scanner.toStringAction(token) + ")");
+ throwSyntaxError("')' expected after keyword 'array'" + "(Found token: " + scanner.toStringAction(token) + ")");
}
getNextToken();
} else {
- throwSyntaxError("'(' expected after keyword 'array'"
- + "(Found token: " + scanner.toStringAction(token) + ")");
+ throwSyntaxError("'(' expected after keyword 'array'" + "(Found token: " + scanner.toStringAction(token) + ")");
}
break;
- case TokenNameprint :
- getNextToken();
- expr();
- break;
- case TokenNameexit :
- getNextToken();
- exit_expr();
- break;
case TokenNamelist :
+ // | T_LIST '(' assignment_list ')' '=' expr
getNextToken();
if (token == TokenNameLPAREN) {
getNextToken();
- if (token == TokenNameCOMMA) {
- getNextToken();
- }
- expressionList();
+ assignment_list();
if (token != TokenNameRPAREN) {
throwSyntaxError("')' expected after 'list' keyword.");
}
getNextToken();
- // if (token == TokenNameSET) {
- // getNextToken();
- // logicalinclusiveorExpression();
- // }
+ if (token != TokenNameEQUAL) {
+ throwSyntaxError("'=' expected after 'list' keyword.");
+ }
+ getNextToken();
+ expr();
} else {
throwSyntaxError("'(' expected after 'list' keyword.");
}
break;
- // case TokenNameexit :
- // getNextToken();
- // if (token != TokenNameSEMICOLON) {
- // exitStatus();
- // }
- // if (token == TokenNameSEMICOLON) {
- // getNextToken();
- // } else {
- // if (token != TokenNameStopPHP) {
- // throwSyntaxError("';' expected after 'exit' expression.");
- // }
- // getNextToken();
- // }
- // break;
- // case TokenNamedie :
- // getNextToken();
- // if (token != TokenNameSEMICOLON) {
- // exitStatus();
- // }
- // if (token == TokenNameSEMICOLON) {
- // getNextToken();
- // } else {
- // if (token != TokenNameStopPHP) {
- // throwSyntaxError("';' expected after 'die' expression.");
- // }
- // }
- // break;
- // case TokenNamearray :
- // getNextToken();
- // if (token == TokenNameARGOPEN) {
- // getNextToken();
- // if (token == TokenNameCOMMA) {
- // getNextToken();
- // }
- // expressionList();
- // if (token != TokenNameARGCLOSE) {
- // throwSyntaxError("')' expected after 'list' keyword.");
- // }
- // getNextToken();
- // if (token == TokenNameSET) {
- // getNextToken();
- // logicalinclusiveorExpression();
- // }
- // } else {
- // throwSyntaxError("'(' expected after 'list' keyword.");
- // }
- // break;
- }
- boolean while_flag = true;
- do {
- switch (token) {
- case TokenNameLBRACKET :
- getNextToken();
- expr();
- if (token != TokenNameRBRACKET) {
- throwSyntaxError("] expected in postfix-expression.");
- }
- getNextToken();
- break;
- case TokenNameCOLON_COLON :
- // ::
- case TokenNameMINUS_GREATER :
- // ->
- getNextToken();
- if (token > TokenNameKEYWORD) {
- ident = scanner.getCurrentIdentifierSource();
- // setMarker(
- // "Avoid using keyword '"
- // + new String(ident)
- // + "' as variable name.",
- // rowCount,
- // PHPParser.INFO);
- // setMarker(
- // "Avoid using keyword '" + new String(ident) + "' as
- // variable name.",
- // scanner.getCurrentTokenStartPosition(),
- // scanner.getCurrentTokenEndPosition(),
- // INFO);
- }
- switch (token) {
- case TokenNameVariable :
- ident = scanner.getCurrentIdentifierSource();
- getNextToken();
- // if (token == TokenNameARGOPEN) {
- // getNextToken();
- // expressionList();
- // if (token != TokenNameARGCLOSE) {
- // throwSyntaxError(") expected after variable '" +
- // ident + "'.");
- // }
- // getNextToken();
- // }
- break;
- case TokenNameIdentifier :
- //ident = scanner.getCurrentIdentifierSource();
- getNextToken();
- break;
- case TokenNameLBRACE :
- getNextToken();
- expr();
- if (token != TokenNameRBRACE) {
- throwSyntaxError("} expected in postfix-expression.");
- }
- getNextToken();
- break;
- default :
- throwSyntaxError("Syntax error after '->' token.");
- }
- while (token == TokenNameLBRACKET || token == TokenNameLPAREN
- || token == TokenNameLBRACE) {
- if (token == TokenNameLBRACKET) {
- getNextToken();
- expressionList();
- if (token != TokenNameRBRACKET) {
- throwSyntaxError("] expected after '->'.");
- }
- getNextToken();
- } else if (token == TokenNameLPAREN) {
+ 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();
- expressionList();
- if (token != TokenNameRPAREN) {
- throwSyntaxError(") expected after '->'.");
+ if (token == TokenNamenew) {
+ // | variable '=' '&' T_NEW class_name_reference
+ // ctor_arguments
+ getNextToken();
+ class_name_reference();
+ ctor_arguments();
+ } else {
+ variable();
}
- getNextToken();
- } else if (token == TokenNameLBRACE) {
- getNextToken();
+ } else {
expr();
- if (token != TokenNameRBRACE) {
- throwSyntaxError("} expected after '->'.");
- }
- getNextToken();
}
+ 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;
- case TokenNamePLUS_PLUS :
+ // | expr T_INSTANCEOF class_name_reference
+ // | expr '?' expr ':' expr
+ case TokenNameinstanceof :
getNextToken();
+ class_name_reference();
break;
- case TokenNameMINUS_MINUS :
+ case TokenNameQUESTION :
getNextToken();
+ expr();
+ if (token == TokenNameCOLON) {
+ getNextToken();
+ expr();
+ }
break;
default :
- while_flag = false;
+ return;
}
- } while (while_flag);
+ }
}
- private void array_pair_list() {
-// array_pair_list:
-// /* empty */
-//| non_empty_array_pair_list possible_comma
- non_empty_array_pair_list();
- if (token == TokenNameCOMMA) {
+ 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 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
- }
-
- private void unaryExpression() {
- switch (token) {
- case TokenNamePLUS_PLUS :
- getNextToken();
- unaryExpression();
- break;
- case TokenNameMINUS_MINUS :
- getNextToken();
- unaryExpression();
- break;
- // '@' '&' '*' '+' '-' '~' '!'
- case TokenNameAT :
- getNextToken();
- if (token == TokenNameinclude || token == TokenNameinclude_once
- || token == TokenNamerequire || token == TokenNamerequire_once) {
- statement(TokenNameAT);
- } else {
- expr_without_variable(); // castExpression();
- }
- break;
- case TokenNameAND :
- getNextToken();
- castExpression();
- break;
- case TokenNameMULTIPLY :
- getNextToken();
- castExpression();
- break;
- case TokenNamePLUS :
- getNextToken();
- castExpression();
- break;
- case TokenNameMINUS :
- getNextToken();
- castExpression();
- break;
- case TokenNameTWIDDLE :
- getNextToken();
- castExpression();
- break;
- case TokenNameNOT :
- getNextToken();
- castExpression();
- break;
- default :
- expr_without_variable();
+ 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 castExpression() {
- // if (token == TokenNameARGOPEN) {
- // getNextToken();
- // typeName();
- // if (token != TokenNameARGCLOSE) {
- // throwSyntaxError(") expected after cast-expression.");
- // }
- // getNextToken();
- // }
- unaryExpression();
+ 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 assignExpression() {
- castExpression();
- if (token == TokenNameEQUAL) { // =
- getNextToken();
- logicalinclusiveorExpression();
- } else if (token == TokenNameDOT_EQUAL) { // .=
- getNextToken();
- logicalinclusiveorExpression();
- } else if (token == TokenNameEQUAL_GREATER) { // =>
- getNextToken();
- logicalinclusiveorExpression();
- } else if (token == TokenNamePLUS_EQUAL) { // +=
- getNextToken();
- logicalinclusiveorExpression();
- } else if (token == TokenNameMINUS_EQUAL) { // -=
- getNextToken();
- logicalinclusiveorExpression();
- } else if (token == TokenNameMULTIPLY_EQUAL) { // *=
- getNextToken();
- logicalinclusiveorExpression();
- } else if (token == TokenNameDIVIDE_EQUAL) { // *=
- getNextToken();
- logicalinclusiveorExpression();
- } else if (token == TokenNameREMAINDER_EQUAL) { // %=
- getNextToken();
- logicalinclusiveorExpression();
- } else if (token == TokenNameAND_EQUAL) { // &=
- getNextToken();
- logicalinclusiveorExpression();
- } else if (token == TokenNameOR_EQUAL) { // |=
- getNextToken();
- logicalinclusiveorExpression();
- } else if (token == TokenNameXOR_EQUAL) { // ^=
- getNextToken();
- logicalinclusiveorExpression();
- } else if (token == TokenNameLEFT_SHIFT_EQUAL) { // <<=
- getNextToken();
- logicalinclusiveorExpression();
- } else if (token == TokenNameRIGHT_SHIFT_EQUAL) { // >>=
- getNextToken();
- logicalinclusiveorExpression();
- } else if (token == TokenNameTWIDDLE_EQUAL) { // ~=
+ 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();
- logicalinclusiveorExpression();
+ object_property();
}
}
- private void multiplicativeExpression() {
- do {
- assignExpression();
- if (token != TokenNameMULTIPLY && token != TokenNameDIVIDE
- && token != TokenNameREMAINDER) {
- return;
- }
+ private void ctor_arguments() {
+ // ctor_arguments:
+ // /* empty */
+ //| '(' function_call_parameter_list ')'
+ if (token == TokenNameLPAREN) {
getNextToken();
- } while (true);
- }
- private void concatenationExpression() {
- do {
- multiplicativeExpression();
- if (token != TokenNameDOT) {
+ if (token == TokenNameRPAREN) {
+ getNextToken();
return;
}
- getNextToken();
- } while (true);
- }
- private void additiveExpression() {
- do {
- concatenationExpression();
- if (token != TokenNamePLUS && token != TokenNameMINUS) {
- return;
+ non_empty_function_call_parameter_list();
+ if (token != TokenNameRPAREN) {
+ throwSyntaxError("')' expected in ctor_arguments.");
}
getNextToken();
- } while (true);
+ }
}
- private void shiftExpression() {
- do {
- additiveExpression();
- if (token != TokenNameLEFT_SHIFT && token != TokenNameRIGHT_SHIFT) {
- return;
+ private void assignment_list() {
+ // assignment_list:
+ // assignment_list ',' assignment_list_element
+ //| assignment_list_element
+ while (true) {
+ assignment_list_element();
+ if (token != TokenNameCOMMA) {
+ break;
}
getNextToken();
- } while (true);
+ }
}
- private void relationalExpression() {
- do {
- shiftExpression();
- if (token != TokenNameLESS && token != TokenNameGREATER
- && token != TokenNameLESS_EQUAL && token != TokenNameGREATER_EQUAL) {
- return;
+ 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();
- } while (true);
+ }
}
- private void identicalExpression() {
- do {
- relationalExpression();
- if (token != TokenNameEQUAL_EQUAL_EQUAL
- && token != TokenNameNOT_EQUAL_EQUAL) {
+ 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();
- } while (true);
- }
- private void equalityExpression() {
- do {
- identicalExpression();
- if (token != TokenNameEQUAL_EQUAL && token != TokenNameNOT_EQUAL) {
+ if (token == TokenNameRPAREN) {
return;
}
- getNextToken();
- } while (true);
+ }
}
- private void ternaryExpression() {
- equalityExpression();
- if (token == TokenNameQUESTION) {
+ // 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();
- expr();
- if (token == TokenNameCOLON) {
- getNextToken();
- expr();
- } else {
- throwSyntaxError("':' expected in ternary operator '? :'.");
+ }
+ 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 ')'
+ char[] defineName = null;
+ char[] ident = null;
+ int startPos=0;
+ int endPos=0;
+ if (Scanner.TRACE) {
+ System.out.println("TRACE: function_call()");
+ }
+ if (token == TokenNameIdentifier) {
+ ident = scanner.getCurrentIdentifierSource();
+ defineName = ident;
+ startPos = scanner.getCurrentTokenStartPosition();
+ endPos = scanner.getCurrentTokenEndPosition();
+ getNextToken();
+ switch (token) {
+ case TokenNamePAAMAYIM_NEKUDOTAYIM :
+ // static member:
+ defineName = null;
+ getNextToken();
+ if (token == TokenNameIdentifier) {
+ // class _constant
+ getNextToken();
+ } else {
+ // static member:
+ variable_without_objects();
+ }
+ break;
}
+ } else {
+ variable_without_objects();
}
- }
- private void andExpression() {
- do {
- ternaryExpression();
- if (token != TokenNameAND) {
- return;
+ if (token != TokenNameLPAREN) {
+ if (defineName!=null) {
+ // does this identifier contain only uppercase characters?
+ if (defineName.length==3) {
+ if (defineName[0]=='d' &&
+ defineName[1]=='i' &&
+ defineName[2]=='e' ) {
+ defineName=null;
+ }
+ } else if (defineName.length==4) {
+ if (defineName[0]=='t' &&
+ defineName[1]=='r' &&
+ defineName[2]=='u' &&
+ defineName[3]=='e' ) {
+ defineName=null;
+ } else if (defineName[0]=='n' &&
+ defineName[1]=='u' &&
+ defineName[2]=='l' &&
+ defineName[3]=='l' ) {
+ defineName=null;
+ }
+ } else if (defineName.length==5) {
+ if (defineName[0]=='f' &&
+ defineName[1]=='a' &&
+ defineName[2]=='l' &&
+ defineName[3]=='s' &&
+ defineName[4]=='e' ) {
+ defineName=null;
+ }
+ }
+ if (defineName!=null) {
+ for (int i=0; i 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 after indirect variable token '${'.");
+ 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 {
- if (token == TokenNameVariable) {
+ 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();
- if (token == TokenNameLBRACKET) {
- getNextToken();
- expr();
- if (token != TokenNameRBRACKET) {
- throwSyntaxError("']' expected in variable-list.");
- }
- getNextToken();
- } else if (token == TokenNameEQUAL) {
- getNextToken();
- constant();
- }
- } else {
- throwSyntaxError("$-variable expected in variable-list.");
+ return;
}
+ non_empty_function_call_parameter_list();
+ if (token != TokenNameRPAREN) {
+ throwSyntaxError("')' expected in method_or_not.");
+ }
+ getNextToken();
}
}
private void exit_expr() {
@@ -2731,7 +2903,247 @@ public class Parser //extends PHPParserSuperclass
}
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 ')'
@@ -2761,13 +3173,28 @@ public class Parser //extends PHPParserSuperclass
break;
case TokenNameinclude :
//T_INCLUDE 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 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 ')'
@@ -2784,13 +3211,27 @@ public class Parser //extends PHPParserSuperclass
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;
}
}
@@ -2809,80 +3250,185 @@ public class Parser //extends PHPParserSuperclass
}
}
}
- /**
- * It will look for a value (after a '=' for example) @
- */
- private void constant() {
- // String ident;
+ 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 TokenNamePLUS :
+ case TokenNameIntegerLiteral :
getNextToken();
- switch (token) {
- case TokenNameDoubleLiteral :
- getNextToken();
- break;
- case TokenNameIntegerLiteral :
- getNextToken();
- break;
- default :
- throwSyntaxError("Constant expected after '+' presign.");
- }
- break;
- case TokenNameMINUS :
+ return true;
+ case TokenNameDoubleLiteral :
getNextToken();
- switch (token) {
- case TokenNameDoubleLiteral :
- getNextToken();
- break;
- case TokenNameIntegerLiteral :
- getNextToken();
- break;
- default :
- throwSyntaxError("Constant expected after '-' presign.");
- }
- break;
- case TokenNamenull :
+ return true;
+ case TokenNameStringDoubleQuote :
getNextToken();
- break;
- case TokenNamefalse :
+ return true;
+ case TokenNameStringSingleQuote :
getNextToken();
- break;
- case TokenNametrue :
+ return true;
+ case TokenNameStringInterpolated :
getNextToken();
- break;
+ 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 :
- // ident = identifier;
- char[] ident = scanner.getCurrentIdentifierSource();
getNextToken();
- if (token == TokenNameLPAREN) {
+ // static_class_constant:
+ // T_STRING T_PAAMAYIM_NEKUDOTAYIM T_STRING
+ if (token == TokenNamePAAMAYIM_NEKUDOTAYIM) {
getNextToken();
- if (token != TokenNameRPAREN) {
- expressionList();
- if (token != TokenNameRPAREN) {
- throwSyntaxError("')' expected after identifier '"
- + new String(ident) + "' in postfix-expression.");
+ 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 TokenNameStringLiteral :
- getNextToken();
+ 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 TokenNameStringConstant :
- getNextToken();
+ 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 TokenNameStringInterpolated :
+ case TokenNamePLUS :
getNextToken();
+ static_scalar();
break;
- case TokenNameDoubleLiteral :
+ case TokenNameMINUS :
getNextToken();
+ static_scalar();
break;
- case TokenNameIntegerLiteral :
+ 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("Constant expected.");
+ 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
@@ -3007,6 +3553,8 @@ public class Parser //extends PHPParserSuperclass
*/
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
@@ -3015,8 +3563,7 @@ public class Parser //extends PHPParserSuperclass
*/
public ProblemReporter problemReporter() {
if (scanner.recordLineSeparator) {
- compilationUnit.compilationResult.lineSeparatorPositions = scanner
- .getLineEnds();
+ compilationUnit.compilationResult.lineSeparatorPositions = scanner.getLineEnds();
}
problemReporter.referenceContext = referenceContext;
return problemReporter;
@@ -3034,8 +3581,7 @@ public class Parser //extends PHPParserSuperclass
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[][] 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
@@ -3056,8 +3602,7 @@ public class Parser //extends PHPParserSuperclass
// (source[scanner.currentPosition] == 'u')) {
// isWhiteSpace = scanner.jumpOverUnicodeWhiteSpace();
// } else {
- if (scanner.recordLineSeparator
- && ((scanner.currentCharacter == '\r') || (scanner.currentCharacter == '\n'))) {
+ 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
@@ -3066,123 +3611,89 @@ public class Parser //extends PHPParserSuperclass
}
isWhiteSpace = CharOperation.isWhitespace(scanner.currentCharacter);
// }
- } while (isWhiteSpace
- && (scanner.currentPosition < scanner.eofPosition));
+ } 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]++;
+ 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];
+ 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]++;
+ 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];
+ 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]++;
+ 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];
+ 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;
- }
- // }
+ 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;
+ // }
}
+ scanner.getNextChar('\'');
+ break;
+ }
case '"' :
// consume next character
scanner.unicodeAsBackSlash = false;
@@ -3223,12 +3734,36 @@ public class Parser //extends PHPParserSuperclass
// }
}
break;
- case '/' :
- {
- int test;
- if ((test = scanner.getNextChar('/', '*')) == 0) { //line
- // comment
+ 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
@@ -3238,96 +3773,80 @@ public class Parser //extends PHPParserSuperclass
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
+ 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
+ } //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());
- }
+ }
+ 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;
+ 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 (scanner.currentCharacter == '*') {
- star = true;
+ 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);
}
- //get the next char
+ }
+ //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
@@ -3337,70 +3856,28 @@ public class Parser //extends PHPParserSuperclass
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
+ 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 /
+ } //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;
+ }
+ 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);
@@ -3441,8 +3918,7 @@ public class Parser //extends PHPParserSuperclass
}
}
if (end < 0) { // did not find a good closing match
- problemReporter.unmatchedBracket(start, referenceContext,
- compilationUnit.compilationResult);
+ problemReporter.unmatchedBracket(start, referenceContext, compilationUnit.compilationResult);
return true;
}
// check if even number of opening/closing other brackets
@@ -3460,8 +3936,7 @@ public class Parser //extends PHPParserSuperclass
balance--;
}
if (balance != 0) {
- problemReporter.unmatchedBracket(start, referenceContext,
- compilationUnit.compilationResult); //bracket
+ problemReporter.unmatchedBracket(start, referenceContext, compilationUnit.compilationResult); //bracket
// anomaly
return true;
}
@@ -3470,14 +3945,13 @@ public class Parser //extends PHPParserSuperclass
// 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);
+ 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);
+ problemReporter.unmatchedBracket(rightPositions[kind][i], referenceContext, compilationUnit.compilationResult);
}
if (anomaliesDetected)
return true;
@@ -3524,4 +3998,11 @@ public class Parser //extends PHPParserSuperclass
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