[Nice-commit] Nice/src/bossa/parser Parser.jj,1.242,1.243

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

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

Modified Files:
	Parser.jj 
Log Message:
Allow 'override' in front of method implementations inside classes.


Index: Parser.jj
===================================================================
RCS file: /cvsroot/nice/Nice/src/bossa/parser/Parser.jj,v
retrieving revision 1.242
retrieving revision 1.243
diff -C2 -d -r1.242 -r1.243
*** Parser.jj	2 Mar 2004 16:02:44 -0000	1.242
--- Parser.jj	3 Mar 2004 14:13:58 -0000	1.243
***************
*** 892,896 ****
  }
  
! Definition internalMethodOrFunction(MethodContainer c):
  {
    LocatedString name;
--- 892,896 ----
  }
  
! Definition internalMethodOrFunction(MethodContainer c, boolean isOverride):
  {
    LocatedString name;
***************
*** 901,908 ****
    Contract contract;
    List statements = new LinkedList();
-   boolean isOverride = false;
  }
  {
-   [ "override" { isOverride = true; } ]
    cst=constraint()
    returnType=monotype()
--- 901,906 ----
***************
*** 1044,1049 ****
        LOOKAHEAD( getField(null, null) )
        overrides = getField(impl, fields, overrides, storeDocString)
!     | { Definition m; Token t = getToken(1); }
        [ "public" | "private" ]
        (
  	LOOKAHEAD( methodBodyDefinitionLookahead() )
--- 1042,1048 ----
        LOOKAHEAD( getField(null, null) )
        overrides = getField(impl, fields, overrides, storeDocString)
!     | { Definition m; Token t = getToken(1); boolean isOverride = false; }
        [ "public" | "private" ]
+       [ "override" { isOverride = true; } ]
        (
  	LOOKAHEAD( methodBodyDefinitionLookahead() )
***************
*** 1051,1055 ****
  	{ definitions.add(m); }
        |
!         m = internalMethodOrFunction(res)
          { 
            if (methods == null)
--- 1050,1054 ----
  	{ definitions.add(m); }
        |
!         m = internalMethodOrFunction(res, isOverride)
          { 
            if (methods == null)
***************
*** 1126,1130 ****
        { Definition m; }
        [ "public" | "private" ]
!       m = internalMethodOrFunction(res)
        { res.addMethod(m); }
      )*
--- 1125,1129 ----
        { Definition m; }
        [ "public" | "private" ]
!       m = internalMethodOrFunction(res, false)
        { res.addMethod(m); }
      )*