[Nice-commit] Nice/src/bossa/parser Parser.jj,1.229,1.230

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

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

Modified Files:
	Parser.jj 
Log Message:
Handle custom constructors for classes with type parameters.


Index: Parser.jj
===================================================================
RCS file: /cvsroot/nice/Nice/src/bossa/parser/Parser.jj,v
retrieving revision 1.229
retrieving revision 1.230
diff -C2 -d -r1.229 -r1.230
*** Parser.jj	17 Dec 2003 14:33:39 -0000	1.229
--- Parser.jj	22 Dec 2003 20:28:10 -0000	1.230
***************
*** 1068,1072 ****
  }
  
! CustomConstructor customConstructor():
  {
    LocatedString name;
--- 1068,1072 ----
  }
  
! CustomConstructor customConstructor(Constraint cst):
  {
    LocatedString name;
***************
*** 1086,1090 ****
    )
    {
!     return CustomConstructor.make(name, params, new Block(statements));
    }
  }
--- 1086,1090 ----
    )
    {
!     return CustomConstructor.make(name, cst, params, new Block(statements));
    }
  }
***************
*** 1527,1536 ****
    |
      [ "public" | "private" ]
!     ( res=customConstructor()
!     | res=globalVariable()
      | res=enumDefinition(definitions)
      | { Constraint cst; } cst = constraint()
        ( 
!         LOOKAHEAD ( "abstract" "interface" )
          res=interfaceDefinition(cst)
        | res=classDefinition(cst, definitions, storeDocString)
--- 1527,1537 ----
    |
      [ "public" | "private" ]
!     ( 
!       res=globalVariable()
      | res=enumDefinition(definitions)
      | { Constraint cst; } cst = constraint()
        ( 
!         res=customConstructor(cst)
!       | LOOKAHEAD ( "abstract" "interface" )
          res=interfaceDefinition(cst)
        | res=classDefinition(cst, definitions, storeDocString)