X-Git-Url: http://secure.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 1f05db8..f79075c 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
@@ -422,6 +422,9 @@ public class Parser implements ITerminalSymbols, CompilerModifiers, ParserBasicI
 			try {
 				statement = statement();
 				blockStatements.add(statement);
+				if (token == TokenNameEOF) {
+					return null;
+				}
 				if (branchStatement && statement != null) {
 					// reportSyntaxError("Unreachable code", statement.sourceStart,
 					// statement.sourceEnd);
@@ -453,10 +456,10 @@ public class Parser implements ITerminalSymbols, CompilerModifiers, ParserBasicI
 						}
 						if (token == TokenNameif || token == TokenNameswitch || token == TokenNamefor || token == TokenNamewhile
 								|| token == TokenNamedo || token == TokenNameforeach || token == TokenNamecontinue || token == TokenNamebreak
-								|| token == TokenNamereturn || token == TokenNameexit || token == TokenNameecho || token == TokenNameglobal
-								|| token == TokenNamestatic || token == TokenNameunset || token == TokenNamefunction || token == TokenNamedeclare
-								|| token == TokenNametry || token == TokenNamecatch || token == TokenNamethrow || token == TokenNamefinal
-								|| token == TokenNameabstract || token == TokenNameclass || token == TokenNameinterface) {
+								|| token == TokenNamereturn || token == TokenNameexit || token == TokenNameecho || token == TokenNameECHO_INVISIBLE
+								|| token == TokenNameglobal || token == TokenNamestatic || token == TokenNameunset || token == TokenNamefunction
+								|| token == TokenNamedeclare || token == TokenNametry || token == TokenNamecatch || token == TokenNamethrow
+								|| token == TokenNamefinal || token == TokenNameabstract || token == TokenNameclass || token == TokenNameinterface) {
 							break;
 						}
 						// System.out.println(scanner.toStringAction(token));
@@ -748,33 +751,26 @@ public class Parser implements ITerminalSymbols, CompilerModifiers, ParserBasicI
 				getNextToken();
 			}
 			return statement;
-		} else if (token == TokenNameINLINE_HTML) {
-			if (scanner.phpExpressionTag) {
-				// start of <?= ... ?> block
+		} else if (token == TokenNameECHO_INVISIBLE) {
+			// 0-length token directly after PHP short tag &lt;?=
+			getNextToken();
+			expressionList();
+			if (token == TokenNameSEMICOLON) {
 				getNextToken();
-				expr();
-				if (token == TokenNameSEMICOLON) {
-					getNextToken();
-				}
 				if (token != TokenNameINLINE_HTML) {
-					throwSyntaxError("Missing '?>' for open PHP expression block ('<?=').");
+					// TODO should this become a configurable warning?
+					reportSyntaxError("Probably '?>' expected  after PHP short tag expression (only the first expression will be echoed).");
 				}
 			} else {
+				if (token != TokenNameINLINE_HTML) {
+					throwSyntaxError("';' expected after PHP short tag '<?=' expression.");
+				}
 				getNextToken();
 			}
 			return statement;
-			// } else if (token == TokenNameprint) {
-			// getNextToken();
-			// expression();
-			// if (token == TokenNameSEMICOLON) {
-			// getNextToken();
-			// } else {
-			// if (token != TokenNameStopPHP) {
-			// throwSyntaxError("';' expected after 'print' statement.");
-			// }
-			// getNextToken();
-			// }
-			// return;
+		} else if (token == TokenNameINLINE_HTML) {
+			getNextToken();
+			return statement;
 		} else if (token == TokenNameglobal) {
 			getNextToken();
 			global_var_list();
@@ -1746,6 +1742,11 @@ public class Parser implements ITerminalSymbols, CompilerModifiers, ParserBasicI
 				expr(); // constant();
 				if (token == TokenNameCOLON || token == TokenNameSEMICOLON) {
 					getNextToken();
+					if (token == TokenNameRBRACE) {
+						// empty case; assumes that the '}' token belongs to the wrapping
+						// switch statement - #1371992
+						break;
+					}
 					if (token == TokenNamecase || token == TokenNamedefault) {
 						// empty case statement ?
 						continue;
@@ -1773,7 +1774,8 @@ public class Parser implements ITerminalSymbols, CompilerModifiers, ParserBasicI
 				if (token == TokenNameCOLON || token == TokenNameSEMICOLON) {
 					getNextToken();
 					if (token == TokenNameRBRACE) {
-						// empty default case
+						// empty default case; ; assumes that the '}' token belongs to the
+						// wrapping switch statement - #1371992
 						break;
 					}
 					if (token != TokenNamecase) {
@@ -2784,7 +2786,7 @@ public class Parser implements ITerminalSymbols, CompilerModifiers, ParserBasicI
 		if (Scanner.TRACE) {
 			System.out.println("TRACE: dynamic_class_name_reference()");
 		}
-		base_variable();
+		base_variable(true);
 		if (token == TokenNameMINUS_GREATER) {
 			getNextToken();
 			object_property();
@@ -3010,26 +3012,24 @@ public class Parser implements ITerminalSymbols, CompilerModifiers, ParserBasicI
 					}
 				}
 			}
-			// TODO is this ok ?
-			return ref;
-			// throwSyntaxError("'(' expected in function call.");
-		}
-		getNextToken();
-		if (token == TokenNameRPAREN) {
+		} else {
 			getNextToken();
-			return ref;
-		}
-		non_empty_function_call_parameter_list();
-		if (token != TokenNameRPAREN) {
-			String functionName;
-			if (ident == null) {
-				functionName = new String(" ");
-			} else {
-				functionName = new String(ident);
+			if (token == TokenNameRPAREN) {
+				getNextToken();
+				return ref;
+			}
+			non_empty_function_call_parameter_list();
+			if (token != TokenNameRPAREN) {
+				String functionName;
+				if (ident == null) {
+					functionName = new String(" ");
+				} else {
+					functionName = new String(ident);
+				}
+				throwSyntaxError("')' expected in function call (" + functionName + ").");
 			}
-			throwSyntaxError("')' expected in function call (" + functionName + ").");
+			getNextToken();
 		}
-		getNextToken();
 		return ref;
 	}
 
@@ -3102,7 +3102,7 @@ public class Parser implements ITerminalSymbols, CompilerModifiers, ParserBasicI
 		return function_call(lefthandside, ignoreVar);
 	}
 
-	private Expression base_variable() {
+	private Expression base_variable(boolean lefthandside) {
 		// base_variable:
 		// reference_variable
 		// | simple_indirect_reference reference_variable
@@ -3117,7 +3117,7 @@ public class Parser implements ITerminalSymbols, CompilerModifiers, ParserBasicI
 			while (token == TokenNameDOLLAR) {
 				getNextToken();
 			}
-			reference_variable(false, false);
+			reference_variable(lefthandside, false);
 		}
 		return ref;
 	}
@@ -3147,11 +3147,8 @@ 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;
+				// To remove "ref = null;" here, is probably better than the patch
+				// commented in #1368081 - axelcl
 				getNextToken();
 				if (token != TokenNameRBRACKET) {
 					expr();
@@ -3422,26 +3419,28 @@ public class Parser implements ITerminalSymbols, CompilerModifiers, ParserBasicI
 				}
 			}
 			// TODO is this ok ?
-			return ref;
+			// return ref;
 			// throwSyntaxError("'(' expected in function call.");
-		}
-		getNextToken();
-		if (token == TokenNameRPAREN) {
+		} else {
 			getNextToken();
-			return ref;
-		}
-		non_empty_function_call_parameter_list();
-		if (token != TokenNameRPAREN) {
-			String functionName;
-			if (ident == null) {
-				functionName = new String(" ");
+
+			if (token == TokenNameRPAREN) {
+				getNextToken();
+				ref = null;
 			} else {
-				functionName = new String(ident);
+				non_empty_function_call_parameter_list();
+				if (token != TokenNameRPAREN) {
+					String functionName;
+					if (ident == null) {
+						functionName = new String(" ");
+					} else {
+						functionName = new String(ident);
+					}
+					throwSyntaxError("')' expected in function call (" + functionName + ").");
+				}
+				getNextToken();
 			}
-			throwSyntaxError("')' expected in function call (" + functionName + ").");
 		}
-		getNextToken();
-
 		if (token == TokenNameMINUS_GREATER) {
 			ref = null;
 			getNextToken();