nice-commit

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

Update of /cvsroot/nice/Nice/src/bossa/parser
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4275/F:/nice/src/bossa/parser

Modified Files:
	Parser.jj 
Log Message:
Converted VarSymbol and Arguments.

Index: Parser.jj
===================================================================
RCS file: /cvsroot/nice/Nice/src/bossa/parser/Parser.jj,v
retrieving revision 1.303
retrieving revision 1.304
diff -C2 -d -r1.303 -r1.304
*** Parser.jj	12 Jan 2005 22:06:50 -0000	1.303
--- Parser.jj	13 Jan 2005 16:47:31 -0000	1.304
***************
*** 2238,2246 ****
  {
    { Token t; List bracketArgs = new ArrayList();
!     bracketArgs.add(new Arguments.Argument(start)); }
!   t="[" res=Expression() {bracketArgs.add(new Arguments.Argument(res));} 
!     ( "," res=Expression() {bracketArgs.add(new Arguments.Argument(res));} )*
    "]"
!   { return bossa.syntax.dispatch.createCallExp(symb("get",t,false),new Arguments(bracketArgs)); }
  |
    "." res=identExp()
--- 2238,2246 ----
  {
    { Token t; List bracketArgs = new ArrayList();
!     bracketArgs.add(new Argument(start)); }
!   t="[" res=Expression() {bracketArgs.add(new Argument(res));} 
!     ( "," res=Expression() {bracketArgs.add(new Argument(res));} )*
    "]"
!   { return bossa.syntax.dispatch.createCallExp(symb("get",t,false),bossa.syntax.dispatch.createArguments(bracketArgs)); }
  |
    "." res=identExp()
***************
*** 2251,2255 ****
  
      if (args == null)
!       args = Arguments.singleArgument(start);
      else
        args.addReceiver(start);
--- 2251,2255 ----
  
      if (args == null)
!       args = new Arguments(new Argument[]{new Argument(start)});
      else
        args.addReceiver(start);
***************
*** 2299,2303 ****
  {
    (t="@")
!   { return bossa.syntax.dispatch.createCallExp(symb(t), Arguments.noArguments()); }
  }
  
--- 2299,2303 ----
  {
    (t="@")
!   { return bossa.syntax.dispatch.createCallExp(symb(t), new Arguments(new Argument[0])); }
  }
  
***************
*** 2335,2339 ****
  }
  
! Arguments.Argument argument():
  {
    Expression e;
--- 2335,2339 ----
  }
  
! Argument argument():
  {
    Expression e;
***************
*** 2348,2352 ****
    e = Expression()
  )
!   { return new Arguments.Argument(e, id); }
  }
  
--- 2348,2352 ----
    e = Expression()
  )
!   { return new Argument(e, id); }
  }
  
***************
*** 2354,2358 ****
  {
    List res = new ArrayList();
!   Arguments.Argument a;
  }
  {
--- 2354,2358 ----
  {
    List res = new ArrayList();
!   Argument a;
  }
  {
***************
*** 2364,2368 ****
    ]
    ")"
!   { return new Arguments(res); }
  }
  
--- 2364,2368 ----
    ]
    ")"
!   { return bossa.syntax.dispatch.createArguments(res); }
  }