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 95c4fd6..a9fdbb2 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
@@ -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);
 						}
 					}
@@ -2551,7 +2553,7 @@ public class Parser implements ITerminalSymbols, CompilerModifiers, ParserBasicI
 									// example:
 									// $var = & new Object();
 									if (fMethodVariables != null) {
-										VariableInfo lhsInfo = new VariableInfo(((FieldReference) lhs).sourceStart());
+										VariableInfo lhsInfo = new VariableInfo(((FieldReference) lhs).sourceStart);
 										lhsInfo.reference = classRef;
 										lhsInfo.typeIdentifier = classRef.token;
 										fMethodVariables.put(new String(((FieldReference) lhs).token), lhsInfo);
@@ -2567,7 +2569,7 @@ public class Parser implements ITerminalSymbols, CompilerModifiers, ParserBasicI
 								if (fMethodVariables != null) {
 									VariableInfo rhsInfo = (VariableInfo) fMethodVariables.get(((FieldReference) rhs).token);
 									if (rhsInfo != null && rhsInfo.reference != null) {
-										VariableInfo lhsInfo = new VariableInfo(((FieldReference) lhs).sourceStart());
+										VariableInfo lhsInfo = new VariableInfo(((FieldReference) lhs).sourceStart);
 										lhsInfo.reference = rhsInfo.reference;
 										lhsInfo.typeIdentifier = rhsInfo.typeIdentifier;
 										fMethodVariables.put(new String(((FieldReference) lhs).token), lhsInfo);
@@ -2585,7 +2587,7 @@ public class Parser implements ITerminalSymbols, CompilerModifiers, ParserBasicI
 								if (fMethodVariables != null) {
 									VariableInfo rhsInfo = (VariableInfo) fMethodVariables.get(((FieldReference) rhs).token);
 									if (rhsInfo != null && rhsInfo.reference != null) {
-										VariableInfo lhsInfo = new VariableInfo(((FieldReference) lhs).sourceStart());
+										VariableInfo lhsInfo = new VariableInfo(((FieldReference) lhs).sourceStart);
 										lhsInfo.reference = rhsInfo.reference;
 										lhsInfo.typeIdentifier = rhsInfo.typeIdentifier;
 										fMethodVariables.put(new String(((FieldReference) lhs).token), lhsInfo);
@@ -2596,7 +2598,7 @@ public class Parser implements ITerminalSymbols, CompilerModifiers, ParserBasicI
 								// example:
 								// $var = new Object();
 								if (fMethodVariables != null) {
-									VariableInfo lhsInfo = new VariableInfo(((FieldReference) lhs).sourceStart());
+									VariableInfo lhsInfo = new VariableInfo(((FieldReference) lhs).sourceStart);
 									lhsInfo.reference = (SingleTypeReference) rhs;
 									lhsInfo.typeIdentifier = ((SingleTypeReference) rhs).token;
 									fMethodVariables.put(new String(((FieldReference) lhs).token), lhsInfo);
@@ -2607,7 +2609,7 @@ public class Parser implements ITerminalSymbols, CompilerModifiers, ParserBasicI
 					}
 					if (rememberedVar == false && lhs != null && lhs instanceof FieldReference) {
 						if (fMethodVariables != null) {
-							VariableInfo lhsInfo = new VariableInfo(((FieldReference) lhs).sourceStart());
+							VariableInfo lhsInfo = new VariableInfo(((FieldReference) lhs).sourceStart);
 							fMethodVariables.put(new String(((FieldReference) lhs).token), lhsInfo);
 						}
 					}
@@ -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();