improved parser string handling

[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 238bdbe..80f61c9 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
@@ -2211,8 +2211,13 @@ public class Parser //extends PHPParserSuperclass
         break;
       default :
         if (token != TokenNameINLINE_HTML) {
-          throwSyntaxError("Error in expression (found token '"
-              + scanner.toStringAction(token) + "').");
+          if (token > TokenNameKEYWORD) {
+            getNextToken();
+            break;
+          } else {
+            throwSyntaxError("Error in expression (found token '"
+                + scanner.toStringAction(token) + "').");
+          }
         }
         return;
     }
@@ -3031,7 +3036,7 @@ public class Parser //extends PHPParserSuperclass
         break;
       case TokenNameCURLY_OPEN :
         getNextToken();
-        if (token == TokenNameIdentifier) {
+        if (token == TokenNameIdentifier||token>TokenNameKEYWORD) {
           getNextToken();
           if (token == TokenNameLBRACKET) {
             getNextToken();