[Nice-commit] Nice/src/bossa/parser Parser.jj,1.148,1.149

[<bo...@us...>]

Update of /cvsroot/nice/Nice/src/bossa/parser
In directory sc8-pr-cvs1:/tmp/cvs-serv18990/src/bossa/parser

Modified Files:
	Parser.jj 
Log Message:
Handle nullness tests on the right side of && and || expressions.


Index: Parser.jj
===================================================================
RCS file: /cvsroot/nice/Nice/src/bossa/parser/Parser.jj,v
retrieving revision 1.148
retrieving revision 1.149
diff -C2 -d -r1.148 -r1.149
*** Parser.jj	11 Mar 2003 17:14:38 -0000	1.148
--- Parser.jj	12 Mar 2003 03:26:38 -0000	1.149
***************
*** 1838,1843 ****
  {
    e1=ConditionalAndExpression() 
!     ( t="||" e2=ConditionalAndExpression() 
!       { e1=CallExp.create(symb(t), e1, e2); } )*
    { return e1; }
  }
--- 1838,1843 ----
  {
    e1=ConditionalAndExpression() 
!     ( t="||" e2=ConditionalOrExpression() 
!       { e1=CallExp.create(symb(t), e1, e2); } )?
    { return e1; }
  }
***************
*** 1847,1852 ****
  {
    e1=InclusiveOrExpression() 
!     ( t="&&" e2=InclusiveOrExpression() 
!       { e1=CallExp.create(symb(t), e1, e2); } )*
    { return e1; }
  }
--- 1847,1852 ----
  {
    e1=InclusiveOrExpression() 
!     ( t="&&" e2=ConditionalAndExpression()
!       { e1=CallExp.create(symb(t), e1, e2); } )?
    { return e1; }
  }