[Phpeclipse-commits] net.sourceforge.phpeclipse/src/test PHPParser.java,1.62,1.63 PHPParser.jj,1.62,1.63

[<kp...@us...>]

Update of /cvsroot/phpeclipse/net.sourceforge.phpeclipse/src/test
In directory sc8-pr-cvs1:/tmp/cvs-serv3031/src/test

Modified Files:
	PHPParser.java PHPParser.jj 
Log Message:
a little bugfix in the variable parsing

Index: PHPParser.java
===================================================================
RCS file: /cvsroot/phpeclipse/net.sourceforge.phpeclipse/src/test/PHPParser.java,v
retrieving revision 1.62
retrieving revision 1.63
diff -C2 -d -r1.62 -r1.63
*** PHPParser.java	26 Aug 2003 08:11:28 -0000	1.62
--- PHPParser.java	26 Aug 2003 15:05:08 -0000	1.63
***************
*** 926,935 ****
    final Token token;
      token = jj_consume_token(DOLLAR);
!     variable = Var(token);
!     {if (true) return new Variable(variable,token.sourceEnd,variable.sourceEnd);}
      throw new Error("Missing return statement in function");
    }
  
!   static final public Variable Var(final Token dollar) throws ParseException {
    Variable variable = null;
    final Token token,token2;
--- 926,935 ----
    final Token token;
      token = jj_consume_token(DOLLAR);
!     variable = Var();
!     {if (true) return variable;}
      throw new Error("Missing return statement in function");
    }
  
!   static final public Variable Var() throws ParseException {
    Variable variable = null;
    final Token token,token2;
***************
*** 939,944 ****
      case DOLLAR:
        token = jj_consume_token(DOLLAR);
!       variable = Var(token);
!    {if (true) return new Variable(variable,dollar.sourceEnd,variable.sourceEnd);}
        break;
      case LBRACE:
--- 939,944 ----
      case DOLLAR:
        token = jj_consume_token(DOLLAR);
!       variable = Var();
!    {if (true) return new Variable(variable,variable.sourceStart,variable.sourceEnd);}
        break;
      case LBRACE:
***************
*** 947,956 ****
        token2 = jj_consume_token(RBRACE);
     {if (true) return new Variable(expression,
!                        dollar.sourceStart,
                         token2.sourceEnd);}
        break;
      case IDENTIFIER:
        token = jj_consume_token(IDENTIFIER);
!    {if (true) return new Variable(token.image,dollar.sourceStart,token.sourceEnd);}
        break;
      default:
--- 947,956 ----
        token2 = jj_consume_token(RBRACE);
     {if (true) return new Variable(expression,
!                        token.sourceStart,
                         token2.sourceEnd);}
        break;
      case IDENTIFIER:
        token = jj_consume_token(IDENTIFIER);
!    {if (true) return new Variable(token.image,token.sourceStart,token.sourceEnd);}
        break;
      default:

Index: PHPParser.jj
===================================================================
RCS file: /cvsroot/phpeclipse/net.sourceforge.phpeclipse/src/test/PHPParser.jj,v
retrieving revision 1.62
retrieving revision 1.63
diff -C2 -d -r1.62 -r1.63
*** PHPParser.jj	26 Aug 2003 08:11:28 -0000	1.62
--- PHPParser.jj	26 Aug 2003 15:05:09 -0000	1.63
***************
*** 1037,1047 ****
  }
  {
!   token = <DOLLAR> variable = Var(token)
    {
!     return new Variable(variable,token.sourceEnd,variable.sourceEnd);
    }
  }
  
! Variable Var(final Token dollar) :
  {
    Variable variable = null;
--- 1037,1047 ----
  }
  {
!   token = <DOLLAR> variable = Var()
    {
!     return variable;
    }
  }
  
! Variable Var() :
  {
    Variable variable = null;
***************
*** 1051,1066 ****
  }
  {
!   token = <DOLLAR> variable = Var(token)
!   {return new Variable(variable,dollar.sourceEnd,variable.sourceEnd);}
  |
    token = <LBRACE> expression = Expression() token2 = <RBRACE>
    {
     return new Variable(expression,
!                        dollar.sourceStart,
                         token2.sourceEnd);
    }
  |
    token = <IDENTIFIER>
!   {return new Variable(token.image,dollar.sourceStart,token.sourceEnd);}
  }
  
--- 1051,1066 ----
  }
  {
!   token = <DOLLAR> variable = Var()
!   {return new Variable(variable,variable.sourceStart,variable.sourceEnd);}
  |
    token = <LBRACE> expression = Expression() token2 = <RBRACE>
    {
     return new Variable(expression,
!                        token.sourceStart,
                         token2.sourceEnd);
    }
  |
    token = <IDENTIFIER>
!   {return new Variable(token.image,token.sourceStart,token.sourceEnd);}
  }