[Nice-commit] Nice/src/bossa/parser Parser.jj,1.153,1.154

[<ar...@us...>]

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

Modified Files:
	Parser.jj 
Log Message:
A bit stricter parsing and commented some unused parts.

Index: Parser.jj
===================================================================
RCS file: /cvsroot/nice/Nice/src/bossa/parser/Parser.jj,v
retrieving revision 1.153
retrieving revision 1.154
diff -C2 -d -r1.153 -r1.154
*** Parser.jj	6 Apr 2003 20:45:57 -0000	1.153
--- Parser.jj	24 Apr 2003 13:35:31 -0000	1.154
***************
*** 48,52 ****
      return symb(t.image,t);
    }
! 
    private static final Expression trueExp = 
      new IdentExp(new LocatedString("true", Location.nowhere()));
--- 48,52 ----
      return symb(t.image,t);
    }
! /*
    private static final Expression trueExp = 
      new IdentExp(new LocatedString("true", Location.nowhere()));
***************
*** 54,58 ****
    private static final Expression falseExp = 
      new IdentExp(new LocatedString("false", Location.nowhere()));
! 
    static List globalDefinitions;
  }
--- 54,58 ----
    private static final Expression falseExp = 
      new IdentExp(new LocatedString("false", Location.nowhere()));
! */
    static List globalDefinitions;
  }
***************
*** 111,116 ****
  | < LBRACE:     "{"   >
  | < RBRACE:     "}"   >
! | < LPRAGMA:    "<*"  >
! | < RPRAGMA:    "*>"  >
  | < DOT:        "."   >
  | < COLON:      ":"   >
--- 111,116 ----
  | < LBRACE:     "{"   >
  | < RBRACE:     "}"   >
! // | < LPRAGMA:    "<*"  >
! // | < RPRAGMA:    "*>"  >
  | < DOT:        "."   >
  | < COLON:      ":"   >
***************
*** 128,132 ****
  | < PLUS:    "+"   >
  | < MINUS:   "-"   >
! | < POWER:   "**"  >
  | < MULT:    "*"   >
  | < SLASH:   "/"   >
--- 128,132 ----
  | < PLUS:    "+"   >
  | < MINUS:   "-"   >
! // | < POWER:   "**"  >
  | < MULT:    "*"   >
  | < SLASH:   "/"   >
***************
*** 858,861 ****
--- 858,862 ----
  }
  
+ /* 
  TypeParameters typeParameters():
  {
***************
*** 870,874 ****
    { return new TypeParameters(res); }
  }
! 
  /***********************************************************************/
  /*                          Classes                                    */
--- 871,875 ----
    { return new TypeParameters(res); }
  }
! */
  /***********************************************************************/
  /*                          Classes                                    */
***************
*** 1966,1970 ****
  {
    (
!   ( t="+" | t="-" ) res=UnaryExpression() 
      { res=CallExp.create(symb(t),res); }
  |
--- 1967,1971 ----
  {
    (
!   ( t="+" | t="-" ) res=PrimaryExpression() 
      { res=CallExp.create(symb(t),res); }
  |
***************
*** 1995,1999 ****
  { Expression res; Token t; }
  {
!   ( t="~" | t="!" ) res=UnaryExpression()
    { return CallExp.create(symb(t),res); }
  
--- 1996,2000 ----
  { Expression res; Token t; }
  {
!   ( t="~" | t="!" ) res=PrimaryExpression()
    { return CallExp.create(symb(t),res); }
  
***************
*** 2663,2668 ****
  {
    t = "assert"
!   condition = Expression()
!   ( ":" message = Expression() 
      { call = CallExp.create(symb(t), condition, message); }
    |
--- 2664,2669 ----
  {
    t = "assert"
!   condition = SideEffectFreeExpression()
!   ( ":" message = SideEffectFreeExpression() 
      { call = CallExp.create(symb(t), condition, message); }
    |