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 01897dd..50dc61f 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 @@ -9,6 +9,7 @@ package net.sourceforge.phpdt.internal.compiler.parser; import java.util.ArrayList; import java.util.HashMap; +import java.util.HashSet; import net.sourceforge.phpdt.core.compiler.CharOperation; import net.sourceforge.phpdt.core.compiler.ITerminalSymbols; @@ -308,6 +309,7 @@ public class Parser implements ITerminalSymbols, CompilerModifiers, ParserBasicI */ public void parse(String s, HashMap variables) { fMethodVariables = variables; + fStackUnassigned = new ArrayList(); init(s); parse(); } @@ -415,10 +417,11 @@ public class Parser implements ITerminalSymbols, CompilerModifiers, ParserBasicI } 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; } } @@ -470,8 +473,10 @@ public class Parser implements ITerminalSymbols, CompilerModifiers, ParserBasicI try { statement = statement(); blockStatements.add(statement); - if (branchStatement && statement!=null) { - reportSyntaxError("Unreachable code", statement.sourceStart, statement.sourceEnd); + if (branchStatement && statement != null) { + // 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) @@ -525,7 +530,7 @@ public class Parser implements ITerminalSymbols, CompilerModifiers, ParserBasicI private boolean checkUnreachableStatements(Statement statement) { if (statement instanceof ReturnStatement || statement instanceof ContinueStatement || statement instanceof BreakStatement) { return true; - } else if (statement instanceof IfStatement && ((IfStatement)statement).checkUnreachable) { + } else if (statement instanceof IfStatement && ((IfStatement) statement).checkUnreachable) { return true; } return false; @@ -549,15 +554,17 @@ public class Parser implements ITerminalSymbols, CompilerModifiers, ParserBasicI 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."); } } @@ -718,7 +725,7 @@ public class Parser implements ITerminalSymbols, CompilerModifiers, ParserBasicI foreach_optional_arg(); if (token == TokenNameEQUAL_GREATER) { getNextToken(); - variable(); + variable(false, false); } if (token == TokenNameRPAREN) { getNextToken(); @@ -860,11 +867,12 @@ public class Parser implements ITerminalSymbols, CompilerModifiers, ParserBasicI 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) { @@ -1059,7 +1067,7 @@ public class Parser implements ITerminalSymbols, CompilerModifiers, ParserBasicI if (token == TokenNameAND) { getNextToken(); } - w_variable(); + w_variable(true); } private void foreach_optional_arg() { @@ -1075,8 +1083,9 @@ public class Parser implements ITerminalSymbols, CompilerModifiers, ParserBasicI // global_var_list: // global_var_list ',' global_var //| global_var + HashSet set = peekVariableSet(); while (true) { - global_var(); + global_var(set); if (token != TokenNameCOMMA) { break; } @@ -1084,16 +1093,17 @@ public class Parser implements ITerminalSymbols, CompilerModifiers, ParserBasicI } } - private void global_var() { + private void global_var(HashSet set) { //global_var: // T_VARIABLE //| '$' r_variable //| '$' '{' expr '}' if (token == TokenNameVariable) { - VariableInfo info = new VariableInfo(scanner.getCurrentTokenStartPosition(), VariableInfo.LEVEL_GLOBAL_VAR); if (fMethodVariables != null) { + VariableInfo info = new VariableInfo(scanner.getCurrentTokenStartPosition(), VariableInfo.LEVEL_GLOBAL_VAR); fMethodVariables.put(new String(scanner.getCurrentIdentifierSource()), info); } + addVariableSet(set); getNextToken(); } else if (token == TokenNameDOLLAR) { getNextToken(); @@ -1115,13 +1125,15 @@ public class Parser implements ITerminalSymbols, CompilerModifiers, ParserBasicI // static_var_list ',' T_VARIABLE //| static_var_list ',' T_VARIABLE '=' static_scalar //| T_VARIABLE - //| T_VARIABLE '=' static_scalar + //| T_VARIABLE '=' static_scalar, + HashSet set = peekVariableSet(); while (true) { if (token == TokenNameVariable) { - VariableInfo info = new VariableInfo(scanner.getCurrentTokenStartPosition(), VariableInfo.LEVEL_STATIC_VAR); 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) { getNextToken(); @@ -1144,7 +1156,7 @@ public class Parser implements ITerminalSymbols, CompilerModifiers, ParserBasicI // unset_variable: // variable while (true) { - variable(); + variable(false, false); if (token != TokenNameCOMMA) { break; } @@ -1418,11 +1430,12 @@ public class Parser implements ITerminalSymbols, CompilerModifiers, ParserBasicI 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) { @@ -1607,15 +1620,23 @@ public class Parser implements ITerminalSymbols, CompilerModifiers, ParserBasicI } } } - functionDeclarator(methodDecl); - if (token == TokenNameSEMICOLON) { - if (!isAbstract) { - throwSyntaxError("Body declaration expected for method: " + new String(methodDecl.selector)); + try { + pushFunctionVariableSet(); + functionDeclarator(methodDecl); + if (token == TokenNameSEMICOLON) { + if (!isAbstract) { + methodDecl.sourceEnd = scanner.getCurrentTokenStartPosition() - 1; + throwSyntaxError("Body declaration expected for method: " + new String(methodDecl.selector)); + } + getNextToken(); + return; + } + functionBody(methodDecl); + } finally { + if (!fStackUnassigned.isEmpty()) { + fStackUnassigned.remove(fStackUnassigned.size() - 1); } - getNextToken(); - return; } - functionBody(methodDecl); } private void functionDeclarator(MethodDeclaration methodDecl) { @@ -1635,12 +1656,14 @@ public class Parser implements ITerminalSymbols, CompilerModifiers, ParserBasicI 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; @@ -1648,6 +1671,7 @@ public class Parser implements ITerminalSymbols, CompilerModifiers, ParserBasicI } } else { methodDecl.selector = "".toCharArray(); + methodDecl.sourceEnd = scanner.getCurrentTokenStartPosition() - 1; throwSyntaxError("Function name expected after keyword 'function'."); } } @@ -1672,6 +1696,7 @@ public class Parser implements ITerminalSymbols, CompilerModifiers, ParserBasicI // static_scalar char[] typeIdentifier = null; if (token == TokenNameIdentifier || token == TokenNameVariable || token == TokenNameAND) { + HashSet set = peekVariableSet(); while (true) { if (token == TokenNameIdentifier) { typeIdentifier = scanner.getCurrentIdentifierSource(); @@ -1691,6 +1716,7 @@ public class Parser implements ITerminalSymbols, CompilerModifiers, ParserBasicI info.typeIdentifier = typeIdentifier; fMethodVariables.put(new String(scanner.getCurrentIdentifierSource()), info); } + addVariableSet(set); getNextToken(); if (token == TokenNameEQUAL) { getNextToken(); @@ -1794,13 +1820,38 @@ public class Parser implements ITerminalSymbols, CompilerModifiers, ParserBasicI 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); - } - new_else_single(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); + } + } + } if (token != TokenNameendif) { throwSyntaxError("'endif' expected."); } @@ -1816,13 +1867,40 @@ public class Parser implements ITerminalSymbols, CompilerModifiers, ParserBasicI 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) { @@ -1943,14 +2021,14 @@ public class Parser implements ITerminalSymbols, CompilerModifiers, ParserBasicI int off = b.statements.length - 1; if (!(b.statements[off] instanceof ReturnStatement) && !(b.statements[off] instanceof ContinueStatement) && !(b.statements[off] instanceof BreakStatement)) { - if (!(b.statements[off] instanceof IfStatement) || !((IfStatement)b.statements[off]).checkUnreachable) { + if (!(b.statements[off] instanceof IfStatement) || !((IfStatement) b.statements[off]).checkUnreachable) { iState.checkUnreachable = false; } - } + } } } else { if (!(s instanceof ReturnStatement) && !(s instanceof ContinueStatement) && !(s instanceof BreakStatement)) { - if (!(s instanceof IfStatement) || !((IfStatement)s).checkUnreachable) { + if (!(s instanceof IfStatement) || !((IfStatement) s).checkUnreachable) { iState.checkUnreachable = false; } } @@ -2201,7 +2279,30 @@ public class Parser implements ITerminalSymbols, CompilerModifiers, ParserBasicI } 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: @@ -2419,10 +2520,29 @@ public class Parser implements ITerminalSymbols, CompilerModifiers, ParserBasicI case TokenNameIdentifier: case TokenNameVariable: case TokenNameDOLLAR: - boolean rememberedVar = false; - Expression lhs = variable(); + 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 (lhs != null && lhs instanceof FieldReference) { + addVariableSet(((FieldReference) lhs).token); + } + // if (lhsVar != null) { + // addVariableSet(lhsVar); + // } getNextToken(); if (token == TokenNameAND) { getNextToken(); @@ -2446,7 +2566,7 @@ public class Parser implements ITerminalSymbols, CompilerModifiers, ParserBasicI } } } else { - Expression rhs = variable(); + Expression rhs = variable(false, false); if (rhs != null && rhs instanceof FieldReference && lhs != null && lhs instanceof FieldReference) { // example: // $var = &$ref; @@ -2509,6 +2629,9 @@ public class Parser implements ITerminalSymbols, CompilerModifiers, ParserBasicI case TokenNameXOR_EQUAL: case TokenNameRIGHT_SHIFT_EQUAL: case TokenNameLEFT_SHIFT_EQUAL: + if (lhs != null && lhs instanceof FieldReference) { + addVariableSet(((FieldReference) lhs).token); + } getNextToken(); expr(); break; @@ -2734,8 +2857,10 @@ public class Parser implements ITerminalSymbols, CompilerModifiers, ParserBasicI // variable //| T_LIST '(' assignment_list ')' //| /* empty */ - if (token == TokenNameVariable || token == TokenNameDOLLAR) { - variable(); + if (token == TokenNameVariable) { + variable(true, false); + } else if (token == TokenNameDOLLAR) { + variable(false, false); } else { if (token == TokenNamelist) { getNextToken(); @@ -2776,17 +2901,17 @@ public class Parser implements ITerminalSymbols, CompilerModifiers, ParserBasicI while (true) { if (token == TokenNameAND) { getNextToken(); - variable(); + variable(true, false); } else { expr(); if (token == TokenNameAND) { getNextToken(); - variable(); + variable(true, false); } else if (token == TokenNameEQUAL_GREATER) { getNextToken(); if (token == TokenNameAND) { getNextToken(); - variable(); + variable(true, false); } else { expr(); } @@ -2812,7 +2937,7 @@ public class Parser implements ITerminalSymbols, CompilerModifiers, ParserBasicI // } // } while (true); // } - private Expression variable_without_objects() { + private Expression variable_without_objects(boolean lefthandside, boolean ignoreVar) { // variable_without_objects: // reference_variable // | simple_indirect_reference reference_variable @@ -2822,10 +2947,10 @@ public class Parser implements ITerminalSymbols, CompilerModifiers, ParserBasicI while (token == TokenNameDOLLAR) { getNextToken(); } - return reference_variable(); + return reference_variable(lefthandside, ignoreVar); } - private Expression function_call() { + private Expression function_call(boolean lefthandside, boolean ignoreVar) { // function_call: // T_STRING '(' function_call_parameter_list ')' //| class_constant '(' function_call_parameter_list ')' @@ -2855,12 +2980,12 @@ public class Parser implements ITerminalSymbols, CompilerModifiers, ParserBasicI getNextToken(); } else { // static member: - variable_without_objects(); + variable_without_objects(true, false); } break; } } else { - ref = variable_without_objects(); + ref = variable_without_objects(lefthandside, ignoreVar); } if (token != TokenNameLPAREN) { if (defineName != null) { @@ -2931,7 +3056,7 @@ public class Parser implements ITerminalSymbols, CompilerModifiers, ParserBasicI while (true) { if (token == TokenNameAND) { getNextToken(); - w_variable(); + w_variable(true); } else { // if (token == TokenNameIdentifier || token == // TokenNameVariable @@ -2968,10 +3093,10 @@ public class Parser implements ITerminalSymbols, CompilerModifiers, ParserBasicI throwSyntaxError("'::' expected after class name (static_member)."); } getNextToken(); - variable_without_objects(); + variable_without_objects(false, false); } - private Expression base_variable_with_function_calls() { + private Expression base_variable_with_function_calls(boolean lefthandside, boolean ignoreVar) { // base_variable_with_function_calls: // base_variable //| function_call @@ -2993,7 +3118,7 @@ public class Parser implements ITerminalSymbols, CompilerModifiers, ParserBasicI // scanner.phpMode = true; // } // if (functionCall) { - return function_call(); + return function_call(lefthandside, ignoreVar); // } else { // base_variable(); // } @@ -3014,7 +3139,7 @@ public class Parser implements ITerminalSymbols, CompilerModifiers, ParserBasicI while (token == TokenNameDOLLAR) { getNextToken(); } - reference_variable(); + reference_variable(false, false); } return ref; } @@ -3024,7 +3149,7 @@ public class Parser implements ITerminalSymbols, CompilerModifiers, ParserBasicI // // '$' // //| simple_indirect_reference '$' // } - private Expression reference_variable() { + private Expression reference_variable(boolean lefthandside, boolean ignoreVar) { // reference_variable: // reference_variable '[' dim_offset ']' // | reference_variable '{' expr '}' @@ -3033,7 +3158,7 @@ public class Parser implements ITerminalSymbols, CompilerModifiers, ParserBasicI if (Scanner.TRACE) { System.out.println("TRACE: reference_variable()"); } - ref = compound_variable(); + ref = compound_variable(lefthandside, ignoreVar); while (true) { if (token == TokenNameLBRACE) { ref = null; @@ -3044,6 +3169,10 @@ public class Parser implements ITerminalSymbols, CompilerModifiers, ParserBasicI } getNextToken(); } else if (token == TokenNameLBRACKET) { + if (ref != null && ref instanceof FieldReference) { + FieldReference fref = (FieldReference) ref; + addVariableSet(fref.token); + } ref = null; getNextToken(); if (token != TokenNameRBRACKET) { @@ -3061,7 +3190,7 @@ public class Parser implements ITerminalSymbols, CompilerModifiers, ParserBasicI return ref; } - private Expression compound_variable() { + private Expression compound_variable(boolean lefthandside, boolean ignoreVar) { // compound_variable: // T_VARIABLE // | '$' '{' expr '}' @@ -3069,6 +3198,19 @@ public class Parser implements ITerminalSymbols, CompilerModifiers, ParserBasicI System.out.println("TRACE: compound_variable()"); } 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); + } + } else { + if (!ignoreVar) { + addVariableSet(); + } + } FieldReference ref = new FieldReference(scanner.getCurrentIdentifierSource(), scanner.getCurrentTokenStartPosition()); getNextToken(); return ref; @@ -3089,11 +3231,8 @@ public class Parser implements ITerminalSymbols, CompilerModifiers, ParserBasicI getNextToken(); } return null; - } + } // private void dim_offset() { // // dim_offset: // // /* empty */ - // private void dim_offset() { - // // dim_offset: - // // /* empty */ // // | expr // expr(); // } @@ -3105,7 +3244,7 @@ public class Parser implements ITerminalSymbols, CompilerModifiers, ParserBasicI System.out.println("TRACE: object_property()"); } if (token == TokenNameVariable || token == TokenNameDOLLAR) { - variable_without_objects(); + variable_without_objects(false, false); } else { object_dim_list(); } @@ -3171,23 +3310,23 @@ public class Parser implements ITerminalSymbols, CompilerModifiers, ParserBasicI } private void r_variable() { - variable(); + variable(false, false); } - private void w_variable() { - variable(); + private void w_variable(boolean lefthandside) { + variable(lefthandside, false); } private void rw_variable() { - variable(); + variable(false, false); } - private Expression variable() { + 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(); + Expression ref = base_variable_with_function_calls(lefthandside, ignoreVar); if (token == TokenNameMINUS_GREATER) { ref = null; getNextToken(); @@ -3506,32 +3645,32 @@ public class Parser implements ITerminalSymbols, CompilerModifiers, ParserBasicI 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(); - 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); @@ -3658,7 +3797,7 @@ public class Parser implements ITerminalSymbols, CompilerModifiers, ParserBasicI throwSyntaxError("Variable expected after keyword 'isset'"); } while (true) { - variable(); + variable(true, false); if (token == TokenNameCOMMA) { getNextToken(); } else { @@ -3976,6 +4115,8 @@ public class Parser implements ITerminalSymbols, CompilerModifiers, ParserBasicI HashMap fMethodVariables = null; + ArrayList fStackUnassigned = new ArrayList(); + //ast stack final static int AstStackIncrement = 100; @@ -4343,8 +4484,7 @@ public class Parser implements ITerminalSymbols, CompilerModifiers, ParserBasicI } } if (scanner.recordLineSeparator) { - // compilationUnit.compilationResult.lineSeparatorPositions = - // scanner.getLineEnds(); + compilationUnit.compilationResult.lineSeparatorPositions = scanner.getLineEnds(); } // check placement anomalies against other kinds of brackets for (int kind = 0; kind < BracketKinds; kind++) { @@ -4480,4 +4620,123 @@ public class Parser implements ITerminalSymbols, CompilerModifiers, ParserBasicI //endPosition is just before the ; } + + public final static String[] GLOBALS = { + "$this", + "$_COOKIE", + "$_ENV", + "$_FILES", + "$_GET", + "$GLOBALS", + "$_POST", + "$_REQUEST", + "$_SESSION", + "$_SERVER" }; + + /** + * + */ + 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); + } + return null; + } + + /** + * Returns the set of assigned variables returns null if no Set is defined at the current scanner position + */ + private HashSet peekVariableSet() { + if (!fStackUnassigned.isEmpty()) { + return (HashSet) fStackUnassigned.get(fStackUnassigned.size() - 1); + } + return null; + } + + /** + * add the current identifier source to the set of assigned variables + * + * @param set + */ + private void addVariableSet(HashSet set) { + if (set != null) { + set.add(new String(scanner.getCurrentTokenSource())); + } + } + + /** + * add the current identifier source to the set of assigned variables + * + */ + private void addVariableSet() { + HashSet set = peekVariableSet(); + if (set != null) { + set.add(new String(scanner.getCurrentTokenSource())); + } + } + + /** + * add the current identifier source to the set of assigned variables + * + */ + private void addVariableSet(char[] token) { + HashSet set = peekVariableSet(); + if (set != null) { + set.add(new String(token)); + } + } + + /** + * check if the current identifier source is in the set of assigned variables Returns true, if no set is defined for the + * current scanner position + * + */ + private boolean containsVariableSet() { + 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; + } } \ No newline at end of file