feature request 1245255, no uninitialized variable warning for functions with referen...

[phpeclipse.git] / net.sourceforge.phpeclipse / src / net / sourceforge / phpdt / internal / compiler / parser / Parser.java

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 95c4fd6..2cb48e4 100644 (file)
--- 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
@@ -2172,11 +2172,11 @@ public class Parser implements ITerminalSymbols, CompilerModifiers, ParserBasicI
                if (Scanner.TRACE) {
                        System.out.println("TRACE: expr()");
                }
-               return expr_without_variable(true);
+               return expr_without_variable(true,null);
                // }
        }
 
-       private Expression expr_without_variable(boolean only_variable) {
+       private Expression expr_without_variable(boolean only_variable, UninitializedVariableHandler initHandler) {
                int exprSourceStart = scanner.getCurrentTokenStartPosition();
                int exprSourceEnd = scanner.getCurrentTokenEndPosition();
                Expression expression = new Expression();
@@ -2526,8 +2526,10 @@ public class Parser implements ITerminalSymbols, CompilerModifiers, ParserBasicI
                                                        && token != TokenNameLEFT_SHIFT_EQUAL) {
                                                FieldReference ref = (FieldReference) lhs;
                                                if (!containsVariableSet(ref.token)) {
-                                                       problemReporter.uninitializedLocalVariable(new String(ref.token), ref.sourceStart(), ref.sourceEnd(),
+                                                       if (null==initHandler || initHandler.reportError()) {
+                                                               problemReporter.uninitializedLocalVariable(new String(ref.token), ref.sourceStart(), ref.sourceEnd(),
                                                                        referenceContext, compilationUnit.compilationResult);
+                                                       }
                                                        addVariableSet(ref.token);
                                                }
                                        }
@@ -3034,12 +3036,16 @@ public class Parser implements ITerminalSymbols, CompilerModifiers, ParserBasicI
                return ref;
        }
 
+       private void non_empty_function_call_parameter_list() {
+               this.non_empty_function_call_parameter_list(null);
+       }
+
        // private void function_call_parameter_list() {
        // function_call_parameter_list:
        // non_empty_function_call_parameter_list { $$ = $1; }
        // | /* empty */
        // }
-       private void non_empty_function_call_parameter_list() {
+       private void non_empty_function_call_parameter_list(String functionName) {
                // non_empty_function_call_parameter_list:
                // expr_without_variable
                // | variable
@@ -3050,7 +3056,10 @@ public class Parser implements ITerminalSymbols, CompilerModifiers, ParserBasicI
                if (Scanner.TRACE) {
                        System.out.println("TRACE: non_empty_function_call_parameter_list()");
                }
+               UninitializedVariableHandler initHandler = new UninitializedVariableHandler();
+               initHandler.setFunctionName(functionName);
                while (true) {
+                       initHandler.incrementArgumentCount();
                        if (token == TokenNameAND) {
                                getNextToken();
                                w_variable(true);
@@ -3060,7 +3069,7 @@ public class Parser implements ITerminalSymbols, CompilerModifiers, ParserBasicI
                                // || token == TokenNameDOLLAR) {
                                // variable();
                                // } else {
-                               expr_without_variable(true);
+                               expr_without_variable(true, initHandler);
                                // }
                        }
                        if (token != TokenNameCOMMA) {
@@ -3429,14 +3438,14 @@ public class Parser implements ITerminalSymbols, CompilerModifiers, ParserBasicI
                                getNextToken();
                                ref = null;
                        } else {
-                               non_empty_function_call_parameter_list();
+                               String functionName;
+                               if (ident == null) {
+                                       functionName = new String(" ");
+                               } else {
+                                       functionName = new String(ident);
+                               }
+                               non_empty_function_call_parameter_list(functionName);
                                if (token != TokenNameRPAREN) {
-                                       String functionName;
-                                       if (ident == null) {
-                                               functionName = new String(" ");
-                                       } else {
-                                               functionName = new String(ident);
-                                       }
                                        throwSyntaxError("')' expected in function call (" + functionName + ").");
                                }
                                getNextToken();