X-Git-Url: http://secure.phpeclipse.com

diff --git a/net.sourceforge.phpeclipse/src/test/PHPParser.jj b/net.sourceforge.phpeclipse/src/test/PHPParser.jj
index 7648721..205b380 100644
--- a/net.sourceforge.phpeclipse/src/test/PHPParser.jj
+++ b/net.sourceforge.phpeclipse/src/test/PHPParser.jj
@@ -369,7 +369,7 @@ TOKEN_MGR_DECLS:
 | <PHPECHOSTART  : "<?=">   {PHPParser.createNewHTMLCode();} : PHPPARSING
 }
 
-<PHPPARSING> TOKEN :
+<PHPPARSING, IN_SINGLE_LINE_COMMENT> TOKEN :
 {
   <PHPEND :"?>"> {PHPParser.htmlStart = SimpleCharStream.getPosition();} : DEFAULT
 }
@@ -403,7 +403,7 @@ TOKEN_MGR_DECLS:
 <IN_SINGLE_LINE_COMMENT> SPECIAL_TOKEN :
 {
   <SINGLE_LINE_COMMENT: "\n" | "\r" | "\r\n" > : PHPPARSING
-| "?>" : DEFAULT
+| < ~[] >
 }
 
 <IN_SINGLE_LINE_COMMENT,IN_FORMAL_COMMENT,IN_MULTI_LINE_COMMENT> SPECIAL_TOKEN :
@@ -1040,18 +1040,22 @@ Variable Variable() :
 
 Variable Var(final Token dollar) :
 {
-  Variable variable;
+  Variable variable = null;
   final Token token;
   ConstantIdentifier constant;
 }
 {
-  token = <DOLLAR_ID> variable = Var(token)
-  {final StringBuffer buff = new StringBuffer();
+  token = <DOLLAR_ID> [variable = Var(token)]
+  {if (variable == null) {
+     return new Variable(token.image.substring(1),token.sourceStart,token.sourceEnd);
+   }
+   final StringBuffer buff = new StringBuffer();
    buff.append(token.image.substring(1));
    buff.append(variable.toStringExpression());
    return new Variable(buff.toString(),dollar.sourceStart,variable.sourceEnd);
    }
 |
+  LOOKAHEAD(<DOLLAR> <DOLLAR>)
   token = <DOLLAR> variable = Var(token)
   {return new Variable(variable,dollar.sourceStart,variable.sourceEnd);}
 |