1) Fixed issue #714: PHP Parser bug with $this->oR.

Signed-off-by: robekras <robert.kraske@weihenstephan.org>

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 1626006..caa1d10 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
@@ -3908,6 +3908,11 @@ public class Parser implements ITerminalSymbols, CompilerModifiers,
                        
                        getNextToken();
                } 
+               else if ((token == TokenName.OP_AND_OLD) ||                     // If the found token is e.g $var->and
+                                (token == TokenName.OP_OR_OLD)  ||                     // or is $var->or 
+                                (token == TokenName.OP_XOR_OLD)) {                     // or is $var->xor
+                       getNextToken ();                                                                // get the next token. Maybe we should issue an warning?
+               }
                else {
                        if (token != TokenName.LBRACE) {
                                throwSyntaxError("'{' expected in variable name.");