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 c15c2de..052ec44 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,11 +11,6 @@ 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; @@ -1198,7 +1193,7 @@ public class Parser implements ITerminalSymbols, CompilerModifiers, ParserBasicI // /* empty */ // | T_EXTENDS fully_qualified_class_name if (token == TokenNameextends) { - interface_extends_list(typeDecl); + class_extends_list(typeDecl); // getNextToken(); // if (token != TokenNameIdentifier) { // throwSyntaxError("Class name expected after keyword @@ -1280,6 +1275,15 @@ public class Parser implements ITerminalSymbols, CompilerModifiers, ParserBasicI // | T_EXTENDS interface_list if (token == TokenNameextends) { getNextToken(); + interface_list(typeDecl); + } + } + + private void class_extends_list(TypeDeclaration typeDecl) { + // /* empty */ + // | T_EXTENDS interface_list + if (token == TokenNameextends) { + getNextToken(); class_list(typeDecl); } } @@ -1310,7 +1314,7 @@ public class Parser implements ITerminalSymbols, CompilerModifiers, ParserBasicI throwSyntaxError("Classname expected after keyword 'extends'."); } if (token == TokenNameCOMMA) { - reportSyntaxError("No multiple inheritence allowed. Expected token 'implements' or '{'."); + reportSyntaxError("No multiple inheritance allowed. Expected token 'implements' or '{'."); getNextToken(); continue; } else {