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 a9fdbb2..c15c2de 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
@@ -11,6 +11,11 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.HashSet;
 
+import net.sourceforge.phpdt.core.ICompilationUnit;
+import net.sourceforge.phpdt.core.IJavaElement;
+import net.sourceforge.phpdt.core.IType;
+import net.sourceforge.phpdt.core.JavaCore;
+import net.sourceforge.phpdt.core.JavaModelException;
 import net.sourceforge.phpdt.core.compiler.CharOperation;
 import net.sourceforge.phpdt.core.compiler.ITerminalSymbols;
 import net.sourceforge.phpdt.core.compiler.InvalidInputException;
@@ -428,8 +433,13 @@ public class Parser implements ITerminalSymbols, CompilerModifiers, ParserBasicI
 				if (branchStatement && statement != null) {
 					// reportSyntaxError("Unreachable code", statement.sourceStart,
 					// statement.sourceEnd);
-					problemReporter.unreachableCode(new String(scanner.getCurrentIdentifierSource()), statement.sourceStart,
+					if (! (statement instanceof BreakStatement)) {
+						/* don't give an error for break statement following return statement
+						Technically it's unreachable code, but in switch-case it's recommended to
+						avoid accidental fall-through later when editing the code */
+						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)
@@ -1270,7 +1280,7 @@ public class Parser implements ITerminalSymbols, CompilerModifiers, ParserBasicI
 		// | T_EXTENDS interface_list
 		if (token == TokenNameextends) {
 			getNextToken();
-			interface_list();
+			class_list(typeDecl);
 		}
 	}
 
@@ -1279,11 +1289,37 @@ public class Parser implements ITerminalSymbols, CompilerModifiers, ParserBasicI
 		// | T_IMPLEMENTS interface_list
 		if (token == TokenNameimplements) {
 			getNextToken();
-			interface_list();
+			interface_list(typeDecl);
 		}
 	}
 
-	private void interface_list() {
+	private void class_list(TypeDeclaration typeDecl) {
+		// class_list:
+		// fully_qualified_class_name
+		do {
+			if (token == TokenNameIdentifier) {
+				char[] ident = scanner.getCurrentIdentifierSource();
+				// TODO make this code working better:
+				// SingleTypeReference ref = ParserUtil.getTypeReference(scanner,
+				// includesList, ident);
+				// if (ref != null) {
+				// typeDecl.superclass = ref;
+				// }
+				getNextToken();
+			} else {
+				throwSyntaxError("Classname expected after keyword 'extends'.");
+			}
+			if (token == TokenNameCOMMA) {
+				reportSyntaxError("No multiple inheritence allowed. Expected token 'implements' or '{'.");
+				getNextToken();
+				continue;
+			} else {
+				break;
+			}
+		} while (true);
+	}
+
+	private void interface_list(TypeDeclaration typeDecl) {
 		// interface_list:
 		// fully_qualified_class_name
 		// | interface_list ',' fully_qualified_class_name
@@ -1291,7 +1327,7 @@ public class Parser implements ITerminalSymbols, CompilerModifiers, ParserBasicI
 			if (token == TokenNameIdentifier) {
 				getNextToken();
 			} else {
-				throwSyntaxError("Interface name expected after keyword 'implements'.");
+				throwSyntaxError("Interfacename expected after keyword 'implements'.");
 			}
 			if (token != TokenNameCOMMA) {
 				return;
@@ -2862,6 +2898,8 @@ public class Parser implements ITerminalSymbols, CompilerModifiers, ParserBasicI
 			variable(true, false);
 		} else if (token == TokenNameDOLLAR) {
 			variable(false, false);
+		} else if (token == TokenNameIdentifier) {
+			identifier(true, true);
 		} else {
 			if (token == TokenNamelist) {
 				getNextToken();
@@ -3883,8 +3921,10 @@ public class Parser implements ITerminalSymbols, CompilerModifiers, ParserBasicI
 							String ext = file.getRawLocation().getFileExtension();
 							int fileExtensionLength = ext == null ? 0 : ext.length() + 1;
 
+							IFile f = PHPFileUtil.createFile(path, project);
+
 							impt.tokens = CharOperation.splitOn('/', filePath.toCharArray(), 0, filePath.length() - fileExtensionLength);
-							impt.setFile(PHPFileUtil.createFile(path, project));
+							impt.setFile(f);
 						} catch (Exception e) {
 							// the file is outside of the workspace
 						}