1) Fixed issue #844: Short form of ternary operator (since PHP 5.3).

[phpeclipse.git] / net.sourceforge.phpeclipse / src / net / sourceforge / phpdt / internal / compiler / parser / Scanner.java

diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/parser/Scanner.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/parser/Scanner.java
index c390b61..20039eb 100644 (file)
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/parser/Scanner.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/compiler/parser/Scanner.java
@@ -1653,7 +1653,12 @@ public class Scanner implements IScanner, ITerminalSymbols {
                                                        }
                                                        return getInlinedHTMLToken(currentPosition - 2);
                                                }
+                                               else if (getNextChar(':')) {
+                                                       return TokenName.TERNARY_SHORT;
+                                               }
+                                               
                                                return TokenName.QUESTION;
+                                               
                                        case ':':
                                                if (getNextChar(':'))
                                                        return TokenName.PAAMAYIM_NEKUDOTAYIM;