[Nice-commit] Nice/src/bossa/parser Parser.jj,1.274,1.275

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

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

Modified Files:
	Parser.jj 
Log Message:
Converted ClassDefinition. (patch by Luc Perrin)

Index: Parser.jj
===================================================================
RCS file: /cvsroot/nice/Nice/src/bossa/parser/Parser.jj,v
retrieving revision 1.274
retrieving revision 1.275
diff -C2 -d -r1.274 -r1.275
*** Parser.jj	21 Nov 2004 18:33:17 -0000	1.274
--- Parser.jj	25 Nov 2004 19:28:12 -0000	1.275
***************
*** 1006,1012 ****
  // The constraint prefixing the class keyword is optional
  // It is useful for complex constraints
! ClassDefinition classDefinition(Constraint cst, List definitions, boolean storeDocString):
  {
!   ClassDefinition res;
    LocatedString name;
    MethodContainer.Constraint parameters = null;
--- 1006,1012 ----
  // The constraint prefixing the class keyword is optional
  // It is useful for complex constraints
! TypeDefinition typeDefinition(Constraint cst, List definitions, boolean storeDocString):
  {
!   TypeDefinition res;
    LocatedString name;
    MethodContainer.Constraint parameters = null;
***************
*** 1025,1029 ****
    [ "implements" imp=interfaces() ]
    [ "finally" "implements"  abs=interfaces() ]
!   { res = ClassDefinition.makeInterface
        (name, parameters, typeParametersVariances, ext, imp, abs); }
  |
--- 1025,1029 ----
    [ "implements" imp=interfaces() ]
    [ "finally" "implements"  abs=interfaces() ]
!   { res = bossa.syntax.dispatch.makeInterface
        (name, parameters, typeParametersVariances, ext, imp, abs); }
  |
***************
*** 1040,1044 ****
    [ "implements" imp=interfaces() ]
    [ "finally" "implements"  abs=interfaces() ]
!   { res = ClassDefinition.makeClass
  	(name,
  	isFinal,isAbstract,
--- 1040,1044 ----
    [ "implements" imp=interfaces() ]
    [ "finally" "implements"  abs=interfaces() ]
!   { res = bossa.syntax.dispatch.makeClass
  	(name,
  	isFinal,isAbstract,
***************
*** 1564,1568 ****
        | LOOKAHEAD ( "abstract" "interface" )
          res=interfaceDefinition(cst, definitions)
!       | res=classDefinition(cst, definitions, storeDocString)
        | res=methodDeclaration(cst, false)
        )
--- 1564,1568 ----
        | LOOKAHEAD ( "abstract" "interface" )
          res=interfaceDefinition(cst, definitions)
!       | res=typeDefinition(cst, definitions, storeDocString)
        | res=methodDeclaration(cst, false)
        )