Nice/src/bossa/parser Parser.jj,1.317,1.318

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

Modified Files:
	Parser.jj 
Log Message:
Implemented visibility for toplevel variables and values.


Index: Parser.jj
===================================================================
RCS file: /cvsroot/nice/Nice/src/bossa/parser/Parser.jj,v
retrieving revision 1.317
retrieving revision 1.318
diff -C2 -d -r1.317 -r1.318
*** Parser.jj	11 Mar 2005 21:32:00 -0000	1.317
--- Parser.jj	12 Mar 2005 02:41:47 -0000	1.318
***************
*** 32,35 ****
--- 32,36 ----
  import bossa.util.*;
  import bossa.syntax.*;
+ import nice.tools.visibility.Visibility;
  
  import mlsub.typing.TypeSymbol;
***************
*** 1519,1523 ****
  }
  
! Definition globalVariable():
  {
    LocatedString name;
--- 1520,1524 ----
  }
  
! Definition globalVariable(Visibility vis):
  {
    LocatedString name;
***************
*** 1536,1540 ****
    )
    ";"
!   { return bossa.syntax.dispatch.createGlobalVarDeclaration(name,t,value,constant); }
  }
  
--- 1537,1541 ----
    )
    ";"
!   { return bossa.syntax.dispatch.createGlobalVarDeclaration(name,t,value,constant, vis); }
  }
  
***************
*** 1573,1577 ****
  
  Definition definition(List definitions, boolean storeDocString):
! { Definition res; }
  {
    (
--- 1574,1578 ----
  
  Definition definition(List definitions, boolean storeDocString):
! { Definition res; boolean pub = false, priv = false; }
  {
    (
***************
*** 1582,1588 ****
      res=methodBodyDefinition(null)
    |
!     [ "public" | "private" ]
      (
!       res=globalVariable()
      | res=enumDefinition(definitions)
      | "override" { Constraint cst; } cst = constraint()
--- 1583,1590 ----
      res=methodBodyDefinition(null)
    |
!     [ "public" { pub = true; } | "private"  { priv = true; } ]
!     { Visibility vis = dispatch.visibility(pub, priv); }
      (
!       res=globalVariable(vis)
      | res=enumDefinition(definitions)
      | "override" { Constraint cst; } cst = constraint()



-------------------------------------------------------
SF email is sponsored by - The IT Product Guide
Read honest & candid reviews on hundreds of IT Products from real users.
Discover which products truly live up to the hype. Start reading now.
http://ads.osdn.com/?ad_id=6595&alloc_id=14396&op=click