[Nice-commit] Nice/src/bossa/parser Parser.jj,1.262,1.263

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

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

Modified Files:
	Parser.jj 
Log Message:
Converted ExpressionStmt to Nice code.

Index: Parser.jj
===================================================================
RCS file: /cvsroot/nice/Nice/src/bossa/parser/Parser.jj,v
retrieving revision 1.262
retrieving revision 1.263
diff -C2 -d -r1.262 -r1.263
*** Parser.jj	2 Sep 2004 19:12:10 -0000	1.262
--- Parser.jj	3 Sep 2004 18:07:24 -0000	1.263
***************
*** 887,891 ****
      Expression exp = bossa.syntax.dispatch.createAssignExp(new TupleExp(parts),new IdentExp(ident));
      exp.setLocation(makeLocation(first,last));
!     statements.add(new ExpressionStmt(exp));
      t = new TupleType(types, makeLocation(first, last));
      t.nullness = Monotype.absent;
--- 887,891 ----
      Expression exp = bossa.syntax.dispatch.createAssignExp(new TupleExp(parts),new IdentExp(ident));
      exp.setLocation(makeLocation(first,last));
!     statements.add(bossa.syntax.dispatch.createExpressionStmt(exp));
      t = new TupleType(types, makeLocation(first, last));
      t.nullness = Monotype.absent;
***************
*** 1133,1137 ****
    "new" name=ident() "(" params=formalParameters(false, statements) ")"
    ( 
!     "=" exp=Expression() ";" { statements.add(new ExpressionStmt(exp)); }
    | 
      "{"
--- 1133,1137 ----
    "new" name=ident() "(" params=formalParameters(false, statements) ")"
    ( 
!     "=" exp=Expression() ";" { statements.add(bossa.syntax.dispatch.createExpressionStmt(exp)); }
    | 
      "{"
***************
*** 1781,1785 ****
      Expression exp = bossa.syntax.dispatch.createAssignExp(new TupleExp(parts),new IdentExp(name));
      exp.setLocation(makeLocation(first,last));
!     statements.add(new ExpressionStmt(exp));
      type = new TupleType(types, makeLocation(first, last));
      type.nullness = Monotype.absent;
--- 1781,1785 ----
      Expression exp = bossa.syntax.dispatch.createAssignExp(new TupleExp(parts),new IdentExp(name));
      exp.setLocation(makeLocation(first,last));
!     statements.add(bossa.syntax.dispatch.createExpressionStmt(exp));
      type = new TupleType(types, makeLocation(first, last));
      type.nullness = Monotype.absent;
***************
*** 2547,2551 ****
    { Expression exp = bossa.syntax.dispatch.createAssignExp(new TupleExp(parts), e);
      exp.setLocation(makeLocation(first,last));
!     return new ExpressionStmt(exp); }
  }
  
--- 2547,2551 ----
    { Expression exp = bossa.syntax.dispatch.createAssignExp(new TupleExp(parts), e);
      exp.setLocation(makeLocation(first,last));
!     return bossa.syntax.dispatch.createExpressionStmt(exp); }
  }
  
***************
*** 2655,2659 ****
      last = getToken(0);
      e1.setLocation(makeLocation(first, last));
!     return new ExpressionStmt(e1); 
    }
  }
--- 2655,2659 ----
      last = getToken(0);
      e1.setLocation(makeLocation(first, last));
!     return bossa.syntax.dispatch.createExpressionStmt(e1); 
    }
  }
***************
*** 2685,2689 ****
      last = getToken(0);
      e1.setLocation(makeLocation(first, last));
!     return new ExpressionStmt(e1); 
    }
  
--- 2685,2689 ----
      last = getToken(0);
      e1.setLocation(makeLocation(first, last));
!     return bossa.syntax.dispatch.createExpressionStmt(e1); 
    }
  
***************
*** 2850,2854 ****
  {
    t="throw" e=Expression()
!   { return new ExpressionStmt(bossa.syntax.dispatch.createCallExp(symb(t),e)); }
  }
  
--- 2850,2854 ----
  {
    t="throw" e=Expression()
!   { return bossa.syntax.dispatch.createExpressionStmt(bossa.syntax.dispatch.createCallExp(symb(t),e)); }
  }
  
***************
*** 2886,2890 ****
      { call = bossa.syntax.dispatch.createCallExp(symb(t), condition); }
    )
!   { return new ExpressionStmt(call); }
  }
  
--- 2886,2890 ----
      { call = bossa.syntax.dispatch.createCallExp(symb(t), condition); }
    )
!   { return bossa.syntax.dispatch.createExpressionStmt(call); }
  }