[Nice-commit] Nice/src/bossa/parser Parser.jj,1.256,1.257

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

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

Modified Files:
	Parser.jj 
Log Message:
Allow subclasses to have less type parameters than their parent, by
instantiation of some of their type parameters.


Index: Parser.jj
===================================================================
RCS file: /cvsroot/nice/Nice/src/bossa/parser/Parser.jj,v
retrieving revision 1.256
retrieving revision 1.257
diff -C2 -d -r1.256 -r1.257
*** Parser.jj	11 Aug 2004 14:13:02 -0000	1.256
--- Parser.jj	12 Aug 2004 23:21:42 -0000	1.257
***************
*** 935,946 ****
  }
  
! TypeIdent superClass():
! { TypeIdent name; }
  {
!   name=typeIdent() 
      // ignore type parameters
      // they should be checked
!     [ "<" ident() ( "," ident() )* ">" ]
!   { return name; }
  }
  
--- 935,946 ----
  }
  
! MonotypeConstructor superClass():
! { TypeIdent name; List params = null; }
  {
!   name=typeIdent()
      // ignore type parameters
      // they should be checked
!     [ "<" params = monotypes() ">" ]
!   { return new MonotypeConstructor(name, params == null ? null : new TypeParameters(params), name.location()); }
  }
  
***************
*** 948,952 ****
  {
    List res=new LinkedList();
!   TypeIdent name;
  }
  {
--- 948,952 ----
  {
    List res=new LinkedList();
!   MonotypeConstructor name;
  }
  {
***************
*** 1050,1054 ****
    [ parameters=classTypeParameters(cst, typeParametersVariances) ]
  
!   { TypeIdent sup = null; }
  
    [ "extends" sup = superClass() ]
--- 1050,1054 ----
    [ parameters=classTypeParameters(cst, typeParametersVariances) ]
  
!   { MonotypeConstructor sup = null; }
  
    [ "extends" sup = superClass() ]