added old hover behaviour;

[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 9567e32..271c3d6 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
@@ -1222,38 +1222,38 @@ public class Parser //extends PHPParserSuperclass
       //          getNextToken();
       //        }
       //        return;
-    } else if (token == TokenNamedefine) {
-      getNextToken();
-      if (token == TokenNameLPAREN) {
-        getNextToken();
-      } else {
-        throwSyntaxError("'(' expected after 'define' keyword.");
-      }
-      expr();
-      if (token == TokenNameCOMMA) {
-        getNextToken();
-      } else {
-        throwSyntaxError("',' expected after first 'define' constant.");
-      }
-      expr();
-      if (token == TokenNameCOMMA) {
-        getNextToken();
-        expr();
-      }
-      if (token == TokenNameRPAREN) {
-        getNextToken();
-      } else {
-        throwSyntaxError("')' expected after 'define' statement.");
-      }
-      if (token == TokenNameSEMICOLON) {
-        getNextToken();
-      } else {
-        if (token != TokenNameStopPHP) {
-          throwSyntaxError("';' expected after 'define' statement.");
-        }
-        getNextToken();
-      }
-      return;
+//    } else if (token == TokenNamedefine) {
+//      getNextToken();
+//      if (token == TokenNameLPAREN) {
+//        getNextToken();
+//      } else {
+//        throwSyntaxError("'(' expected after 'define' keyword.");
+//      }
+//      expr();
+//      if (token == TokenNameCOMMA) {
+//        getNextToken();
+//      } else {
+//        throwSyntaxError("',' expected after first 'define' constant.");
+//      }
+//      expr();
+//      if (token == TokenNameCOMMA) {
+//        getNextToken();
+//        expr();
+//      }
+//      if (token == TokenNameRPAREN) {
+//        getNextToken();
+//      } else {
+//        throwSyntaxError("')' expected after 'define' statement.");
+//      }
+//      if (token == TokenNameSEMICOLON) {
+//        getNextToken();
+//      } else {
+//        if (token != TokenNameStopPHP) {
+//          throwSyntaxError("';' expected after 'define' statement.");
+//        }
+//        getNextToken();
+//      }
+//      return;
     } else if (token == TokenNamefunction) {
       MethodDeclaration methodDecl = new MethodDeclaration(
           this.compilationUnit.compilationResult);
@@ -1422,7 +1422,7 @@ public class Parser //extends PHPParserSuperclass
     // | T_FINAL T_CLASS
     if (token == TokenNameclass) {
       getNextToken();
-    } else if (token == TokenNamefinal) {
+    } else if (token == TokenNameabstract) {
       checkAndSetModifiers(AccAbstract);
       getNextToken();
       if (token != TokenNameclass) {
@@ -1431,10 +1431,13 @@ public class Parser //extends PHPParserSuperclass
       getNextToken();
     } else if (token == TokenNamefinal) {
       checkAndSetModifiers(AccFinal);
+      getNextToken();
       if (token != TokenNameclass) {
         throwSyntaxError("Keyword 'class' expected after keyword 'final'.");
       }
       getNextToken();
+    } else {
+        throwSyntaxError("Keyword 'class' 'final' or 'abstract' expected");
     }
   }
   private void interface_extends_list() {