*/
public void parse(String s, HashMap variables) {
fMethodVariables = variables;
- fStackUnassigned = new Stack();
+ fStackUnassigned = new ArrayList();
init(s);
parse();
}
} catch (SyntaxError sytaxErr1) {
return;
} finally {
- int sourceEnd = scanner.getCurrentTokenStartPosition();
+ int sourceEnd = methodDecl.sourceEnd;
if (sourceEnd <= 0 || methodDecl.declarationSourceStart > sourceEnd) {
sourceEnd = methodDecl.declarationSourceStart + 1;
}
+ methodDecl.sourceEnd = sourceEnd;
methodDecl.declarationSourceEnd = sourceEnd;
}
}
statement = statement();
blockStatements.add(statement);
if (branchStatement && statement != null) {
-// reportSyntaxError("Unreachable code", statement.sourceStart, statement.sourceEnd);
- problemReporter.unreachableCode(new String(scanner.getCurrentIdentifierSource()),statement.sourceStart, statement.sourceEnd,
- referenceContext, compilationUnit.compilationResult);
+ // reportSyntaxError("Unreachable code", statement.sourceStart, statement.sourceEnd);
+ problemReporter.unreachableCode(new String(scanner.getCurrentIdentifierSource()), statement.sourceStart,
+ statement.sourceEnd, referenceContext, compilationUnit.compilationResult);
}
if ((token == TokenNameRBRACE) || (token == TokenNamecase) || (token == TokenNamedefault) || (token == TokenNameelse)
|| (token == TokenNameelseif) || (token == TokenNameendif) || (token == TokenNameendfor)
if (token == TokenNameLBRACE) {
getNextToken();
} else {
+ methodDecl.sourceEnd = scanner.getCurrentTokenStartPosition() - 1;
throwSyntaxError("'{' expected in compound-statement.");
}
if (token != TokenNameRBRACE) {
statementList();
}
if (token == TokenNameRBRACE) {
- // methodDecl.declarationSourceEnd = scanner.getCurrentTokenEndPosition();
+ methodDecl.sourceEnd = scanner.getCurrentTokenEndPosition();
getNextToken();
} else {
+ methodDecl.sourceEnd = scanner.getCurrentTokenStartPosition() - 1;
throwSyntaxError("'}' expected in compound-statement.");
}
}
foreach_optional_arg();
if (token == TokenNameEQUAL_GREATER) {
getNextToken();
- variable(false);
+ variable(false, false);
}
if (token == TokenNameRPAREN) {
getNextToken();
getNextToken();
functionDefinition(methodDecl);
} finally {
- sourceEnd = scanner.getCurrentTokenStartPosition();
+ sourceEnd = methodDecl.sourceEnd;
if (sourceEnd <= 0 || methodDecl.declarationSourceStart > sourceEnd) {
sourceEnd = methodDecl.declarationSourceStart + 1;
}
methodDecl.declarationSourceEnd = sourceEnd;
+ methodDecl.sourceEnd = sourceEnd;
}
return statement;
} else if (token == TokenNamedeclare) {
if (fMethodVariables != null) {
VariableInfo info = new VariableInfo(scanner.getCurrentTokenStartPosition(), VariableInfo.LEVEL_STATIC_VAR);
fMethodVariables.put(new String(scanner.getCurrentIdentifierSource()), info);
- }
+ }
addVariableSet(set);
getNextToken();
if (token == TokenNameEQUAL) {
// unset_variable:
// variable
while (true) {
- variable(false);
+ variable(false, false);
if (token != TokenNameCOMMA) {
break;
}
getNextToken();
functionDefinition(methodDecl);
} finally {
- int sourceEnd = scanner.getCurrentTokenStartPosition();
+ int sourceEnd = methodDecl.sourceEnd;
if (sourceEnd <= 0 || methodDecl.declarationSourceStart > sourceEnd) {
sourceEnd = methodDecl.declarationSourceStart + 1;
}
methodDecl.declarationSourceEnd = sourceEnd;
+ methodDecl.sourceEnd = sourceEnd;
}
} else {
if (!hasModifiers) {
}
}
try {
- pushVariableSet();
+ pushFunctionVariableSet();
functionDeclarator(methodDecl);
if (token == TokenNameSEMICOLON) {
if (!isAbstract) {
+ methodDecl.sourceEnd = scanner.getCurrentTokenStartPosition() - 1;
throwSyntaxError("Body declaration expected for method: " + new String(methodDecl.selector));
}
getNextToken();
}
functionBody(methodDecl);
} finally {
- fStackUnassigned.pop();
+ if (!fStackUnassigned.isEmpty()) {
+ fStackUnassigned.remove(fStackUnassigned.size() - 1);
+ }
}
}
if (token == TokenNameLPAREN) {
getNextToken();
} else {
+ methodDecl.sourceEnd = scanner.getCurrentTokenStartPosition() - 1;
throwSyntaxError("'(' expected in function declaration.");
}
if (token != TokenNameRPAREN) {
parameter_list(methodDecl);
}
if (token != TokenNameRPAREN) {
+ methodDecl.sourceEnd = scanner.getCurrentTokenStartPosition() - 1;
throwSyntaxError("')' expected in function declaration.");
} else {
methodDecl.bodyStart = scanner.getCurrentTokenEndPosition() + 1;
}
} else {
methodDecl.selector = "<undefined>".toCharArray();
+ methodDecl.sourceEnd = scanner.getCurrentTokenStartPosition() - 1;
throwSyntaxError("Function name expected after keyword 'function'.");
}
}
private void ifStatementColon(IfStatement iState) {
// T_IF '(' expr ')' ':' inner_statement_list new_elseif_list new_else_single T_ENDIF ';'
- Block b = inner_statement_list();
- iState.thenStatement = b;
- checkUnreachable(iState, b);
+ HashSet assignedVariableSet = null;
+ try {
+ Block b = inner_statement_list();
+ iState.thenStatement = b;
+ checkUnreachable(iState, b);
+ } finally {
+ assignedVariableSet = removeIfVariableSet();
+ }
if (token == TokenNameelseif) {
- new_elseif_list(iState);
+ try {
+ pushIfVariableSet();
+ new_elseif_list(iState);
+ } finally {
+ HashSet set = removeIfVariableSet();
+ if (assignedVariableSet != null) {
+ assignedVariableSet.addAll(set);
+ }
+ }
+ }
+ try {
+ pushIfVariableSet();
+ new_else_single(iState);
+ } finally {
+ HashSet set = removeIfVariableSet();
+ if (assignedVariableSet != null) {
+ HashSet topSet = peekVariableSet();
+ if (topSet != null) {
+ topSet.addAll(set);
+ topSet.addAll(assignedVariableSet);
+ }
+ }
}
- new_else_single(iState);
if (token != TokenNameendif) {
throwSyntaxError("'endif' expected.");
}
private void ifStatement(IfStatement iState) {
// T_IF '(' expr ')' statement elseif_list else_single
- Statement s = statement();
- iState.thenStatement = s;
- checkUnreachable(iState, s);
+ HashSet assignedVariableSet = null;
+ try {
+ pushIfVariableSet();
+ Statement s = statement();
+ iState.thenStatement = s;
+ checkUnreachable(iState, s);
+ } finally {
+ assignedVariableSet = removeIfVariableSet();
+ }
+
if (token == TokenNameelseif) {
- elseif_list(iState);
+ try {
+ pushIfVariableSet();
+ elseif_list(iState);
+ } finally {
+ HashSet set = removeIfVariableSet();
+ if (assignedVariableSet != null) {
+ assignedVariableSet.addAll(set);
+ }
+ }
+ }
+ try {
+ pushIfVariableSet();
+ else_single(iState);
+ } finally {
+ HashSet set = removeIfVariableSet();
+ if (assignedVariableSet != null) {
+ HashSet topSet = peekVariableSet();
+ if (topSet != null) {
+ topSet.addAll(set);
+ topSet.addAll(assignedVariableSet);
+ }
+ }
}
- else_single(iState);
}
private void elseif_list(IfStatement iState) {
}
switch (token) {
case TokenNameisset:
+ // T_ISSET '(' isset_variables ')'
+ getNextToken();
+ if (token != TokenNameLPAREN) {
+ throwSyntaxError("'(' expected after keyword 'isset'");
+ }
+ getNextToken();
+ isset_variables();
+ if (token != TokenNameRPAREN) {
+ throwSyntaxError("')' expected after keyword 'isset'");
+ }
+ getNextToken();
+ break;
case TokenNameempty:
+ getNextToken();
+ if (token != TokenNameLPAREN) {
+ throwSyntaxError("'(' expected after keyword 'empty'");
+ }
+ getNextToken();
+ variable(true, false);
+ if (token != TokenNameRPAREN) {
+ throwSyntaxError("')' expected after keyword 'empty'");
+ }
+ getNextToken();
+ break;
case TokenNameeval:
case TokenNameinclude:
case TokenNameinclude_once:
case TokenNameIdentifier:
case TokenNameVariable:
case TokenNameDOLLAR:
- boolean rememberedVar = false;
-// char[] lhsVar = null;
-// if (token==TokenNameVariable) {
-// lhsVar = scanner.getCurrentTokenSource();
-// }
- Expression lhs = variable(true);
+ boolean rememberedVar = false;
+ Expression lhs = variable(true, true);
+ if (lhs != null && lhs instanceof FieldReference && token != TokenNameEQUAL && token != TokenNamePLUS_EQUAL
+ && token != TokenNameMINUS_EQUAL && token != TokenNameMULTIPLY_EQUAL && token != TokenNameDIVIDE_EQUAL
+ && token != TokenNameDOT_EQUAL && token != TokenNameREMAINDER_EQUAL && token != TokenNameAND_EQUAL
+ && token != TokenNameOR_EQUAL && token != TokenNameXOR_EQUAL && token != TokenNameRIGHT_SHIFT_EQUAL
+ && token != TokenNameLEFT_SHIFT_EQUAL) {
+ FieldReference ref = (FieldReference) lhs;
+ if (!containsVariableSet(ref.token)) {
+ problemReporter.uninitializedLocalVariable(new String(ref.token), ref.sourceStart(), ref.sourceEnd(), referenceContext,
+ compilationUnit.compilationResult);
+ addVariableSet(ref.token);
+ }
+ }
switch (token) {
case TokenNameEQUAL:
-// if (lhsVar != null) {
-// addVariableSet(lhsVar);
-// }
+ if (lhs != null && lhs instanceof FieldReference) {
+ addVariableSet(((FieldReference) lhs).token);
+ }
+ // if (lhsVar != null) {
+ // addVariableSet(lhsVar);
+ // }
getNextToken();
if (token == TokenNameAND) {
getNextToken();
}
}
} else {
- Expression rhs = variable(false);
+ Expression rhs = variable(false, false);
if (rhs != null && rhs instanceof FieldReference && lhs != null && lhs instanceof FieldReference) {
// example:
// $var = &$ref;
case TokenNameXOR_EQUAL:
case TokenNameRIGHT_SHIFT_EQUAL:
case TokenNameLEFT_SHIFT_EQUAL:
+ if (lhs != null && lhs instanceof FieldReference) {
+ addVariableSet(((FieldReference) lhs).token);
+ }
getNextToken();
expr();
break;
//| T_LIST '(' assignment_list ')'
//| /* empty */
if (token == TokenNameVariable) {
- variable(true);
+ variable(true, false);
} else if (token == TokenNameDOLLAR) {
- variable(false);
+ variable(false, false);
} else {
if (token == TokenNamelist) {
getNextToken();
while (true) {
if (token == TokenNameAND) {
getNextToken();
- variable(false);
+ variable(true, false);
} else {
expr();
if (token == TokenNameAND) {
getNextToken();
- variable(false);
+ variable(true, false);
} else if (token == TokenNameEQUAL_GREATER) {
getNextToken();
if (token == TokenNameAND) {
getNextToken();
- variable(false);
+ variable(true, false);
} else {
expr();
}
// }
// } while (true);
// }
- private Expression variable_without_objects(boolean lefthandside) {
+ private Expression variable_without_objects(boolean lefthandside, boolean ignoreVar) {
// variable_without_objects:
// reference_variable
// | simple_indirect_reference reference_variable
while (token == TokenNameDOLLAR) {
getNextToken();
}
- return reference_variable(lefthandside);
+ return reference_variable(lefthandside, ignoreVar);
}
- private Expression function_call(boolean lefthandside) {
+ private Expression function_call(boolean lefthandside, boolean ignoreVar) {
// function_call:
// T_STRING '(' function_call_parameter_list ')'
//| class_constant '(' function_call_parameter_list ')'
getNextToken();
} else {
// static member:
- variable_without_objects(false);
+ variable_without_objects(true, false);
}
break;
}
} else {
- ref = variable_without_objects(lefthandside);
+ ref = variable_without_objects(lefthandside, ignoreVar);
}
if (token != TokenNameLPAREN) {
if (defineName != null) {
while (true) {
if (token == TokenNameAND) {
getNextToken();
- w_variable(false);
+ w_variable(true);
} else {
// if (token == TokenNameIdentifier || token ==
// TokenNameVariable
throwSyntaxError("'::' expected after class name (static_member).");
}
getNextToken();
- variable_without_objects(false);
+ variable_without_objects(false, false);
}
- private Expression base_variable_with_function_calls(boolean lefthandside) {
+ private Expression base_variable_with_function_calls(boolean lefthandside, boolean ignoreVar) {
// base_variable_with_function_calls:
// base_variable
//| function_call
// scanner.phpMode = true;
// }
// if (functionCall) {
- return function_call(lefthandside);
+ return function_call(lefthandside, ignoreVar);
// } else {
// base_variable();
// }
while (token == TokenNameDOLLAR) {
getNextToken();
}
- reference_variable(false);
+ reference_variable(false, false);
}
return ref;
}
// // '$'
// //| simple_indirect_reference '$'
// }
- private Expression reference_variable(boolean lefthandside) {
+ private Expression reference_variable(boolean lefthandside, boolean ignoreVar) {
// reference_variable:
// reference_variable '[' dim_offset ']'
// | reference_variable '{' expr '}'
if (Scanner.TRACE) {
System.out.println("TRACE: reference_variable()");
}
- ref = compound_variable(lefthandside);
+ ref = compound_variable(lefthandside, ignoreVar);
while (true) {
if (token == TokenNameLBRACE) {
ref = null;
}
getNextToken();
} else if (token == TokenNameLBRACKET) {
+ if (ref != null && ref instanceof FieldReference) {
+ FieldReference fref = (FieldReference) ref;
+ addVariableSet(fref.token);
+ }
ref = null;
getNextToken();
if (token != TokenNameRBRACKET) {
return ref;
}
- private Expression compound_variable(boolean lefthandside) {
+ private Expression compound_variable(boolean lefthandside, boolean ignoreVar) {
// compound_variable:
// T_VARIABLE
// | '$' '{' expr '}'
if (token == TokenNameVariable) {
if (!lefthandside) {
if (!containsVariableSet()) {
-// reportSyntaxError("The local variable " + new String(scanner.getCurrentIdentifierSource())
-// + " may not have been initialized");
- problemReporter.uninitializedLocalVariable(new String(scanner.getCurrentIdentifierSource()),scanner.getCurrentTokenStartPosition(), scanner.getCurrentTokenEndPosition(),
- referenceContext, compilationUnit.compilationResult);
+ // reportSyntaxError("The local variable " + new String(scanner.getCurrentIdentifierSource())
+ // + " may not have been initialized");
+ problemReporter.uninitializedLocalVariable(new String(scanner.getCurrentIdentifierSource()), scanner
+ .getCurrentTokenStartPosition(), scanner.getCurrentTokenEndPosition(), referenceContext,
+ compilationUnit.compilationResult);
}
} else {
- addVariableSet();
+ if (!ignoreVar) {
+ addVariableSet();
+ }
}
FieldReference ref = new FieldReference(scanner.getCurrentIdentifierSource(), scanner.getCurrentTokenStartPosition());
getNextToken();
getNextToken();
}
return null;
- }
+ } // private void dim_offset() { // // dim_offset: // // /* empty */
- // private void dim_offset() {
- // // dim_offset:
- // // /* empty */
// // | expr
// expr();
// }
System.out.println("TRACE: object_property()");
}
if (token == TokenNameVariable || token == TokenNameDOLLAR) {
- variable_without_objects(false);
+ variable_without_objects(false, false);
} else {
object_dim_list();
}
}
private void r_variable() {
- variable(false);
+ variable(false, false);
}
private void w_variable(boolean lefthandside) {
- variable(lefthandside);
+ variable(lefthandside, false);
}
private void rw_variable() {
- variable(false);
+ variable(false, false);
}
- private Expression variable(boolean lefthandside) {
+ private Expression variable(boolean lefthandside, boolean ignoreVar) {
// variable:
// base_variable_with_function_calls T_OBJECT_OPERATOR
// object_property method_or_not variable_properties
// | base_variable_with_function_calls
- Expression ref = base_variable_with_function_calls(lefthandside);
+ Expression ref = base_variable_with_function_calls(lefthandside, ignoreVar);
if (token == TokenNameMINUS_GREATER) {
ref = null;
getNextToken();
private void internal_functions_in_yacc() {
// int start = 0;
switch (token) {
- case TokenNameisset:
- // T_ISSET '(' isset_variables ')'
- getNextToken();
- if (token != TokenNameLPAREN) {
- throwSyntaxError("'(' expected after keyword 'isset'");
- }
- getNextToken();
- isset_variables();
- if (token != TokenNameRPAREN) {
- throwSyntaxError("')' expected after keyword 'isset'");
- }
- getNextToken();
- break;
- case TokenNameempty:
- // T_EMPTY '(' variable ')'
- getNextToken();
- if (token != TokenNameLPAREN) {
- throwSyntaxError("'(' expected after keyword 'empty'");
- }
- getNextToken();
- variable(false);
- if (token != TokenNameRPAREN) {
- throwSyntaxError("')' expected after keyword 'empty'");
- }
- getNextToken();
- break;
+ // case TokenNameisset:
+ // // T_ISSET '(' isset_variables ')'
+ // getNextToken();
+ // if (token != TokenNameLPAREN) {
+ // throwSyntaxError("'(' expected after keyword 'isset'");
+ // }
+ // getNextToken();
+ // isset_variables();
+ // if (token != TokenNameRPAREN) {
+ // throwSyntaxError("')' expected after keyword 'isset'");
+ // }
+ // getNextToken();
+ // break;
+ // case TokenNameempty:
+ // // T_EMPTY '(' variable ')'
+ // getNextToken();
+ // if (token != TokenNameLPAREN) {
+ // throwSyntaxError("'(' expected after keyword 'empty'");
+ // }
+ // getNextToken();
+ // variable(false);
+ // if (token != TokenNameRPAREN) {
+ // throwSyntaxError("')' expected after keyword 'empty'");
+ // }
+ // getNextToken();
+ // break;
case TokenNameinclude:
//T_INCLUDE expr
checkFileName(token);
throwSyntaxError("Variable expected after keyword 'isset'");
}
while (true) {
- variable(false);
+ variable(true, false);
if (token == TokenNameCOMMA) {
getNextToken();
} else {
HashMap fMethodVariables = null;
- Stack fStackUnassigned = new Stack();
+ ArrayList fStackUnassigned = new ArrayList();
//ast stack
final static int AstStackIncrement = 100;
"$_POST",
"$_REQUEST",
"$_SESSION",
- "$_SERVER"
- };
+ "$_SERVER" };
+
/**
- *
+ *
*/
- private void pushVariableSet() {
- HashSet set =new HashSet();
- for (int i = 0; i < GLOBALS.length; i++) {
- set.add(GLOBALS[i]);
+ private void pushFunctionVariableSet() {
+ HashSet set = new HashSet();
+ if (fStackUnassigned.isEmpty()) {
+ for (int i = 0; i < GLOBALS.length; i++) {
+ set.add(GLOBALS[i]);
+ }
+ }
+ fStackUnassigned.add(set);
+ }
+
+ private void pushIfVariableSet() {
+ if (!fStackUnassigned.isEmpty()) {
+ HashSet set = new HashSet();
+ fStackUnassigned.add(set);
+ }
+ }
+
+ private HashSet removeIfVariableSet() {
+ if (!fStackUnassigned.isEmpty()) {
+ return (HashSet) fStackUnassigned.remove(fStackUnassigned.size() - 1);
}
- fStackUnassigned.push(set);
+ return null;
}
-
+
/**
* Returns the <i>set of assigned variables </i> returns null if no Set is defined at the current scanner position
*/
private HashSet peekVariableSet() {
if (!fStackUnassigned.isEmpty()) {
- return (HashSet) fStackUnassigned.peek();
+ return (HashSet) fStackUnassigned.get(fStackUnassigned.size() - 1);
}
return null;
}
*
*/
private boolean containsVariableSet() {
- HashSet set = peekVariableSet();
- if (set != null) {
- return set.contains(new String(scanner.getCurrentTokenSource()));
+ return containsVariableSet(scanner.getCurrentTokenSource());
+ // if (!fStackUnassigned.isEmpty()) {
+ // HashSet set;
+ // String str = new String(scanner.getCurrentTokenSource());
+ // for (int i = 0; i < fStackUnassigned.size(); i++) {
+ // set = (HashSet) fStackUnassigned.get(i);
+ // if (set.contains(str)) {
+ // return true;
+ // }
+ // }
+ // return false;
+ // }
+ // return true;
+ }
+
+ private boolean containsVariableSet(char[] token) {
+
+ if (!fStackUnassigned.isEmpty()) {
+ HashSet set;
+ String str = new String(token);
+ for (int i = 0; i < fStackUnassigned.size(); i++) {
+ set = (HashSet) fStackUnassigned.get(i);
+ if (set.contains(str)) {
+ return true;
+ }
+ }
+ return false;
}
return true;
}
git://secure.phpeclipse.com / phpeclipse.git / blobdiff