[Nice-commit] Nice/src/bossa/parser Parser.jj,1.330,1.331 JavaccParser.java,1.5,1.6

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

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

Modified Files:
	Parser.jj JavaccParser.java 
Log Message:
Implemented static import.


Index: Parser.jj
===================================================================
RCS file: /cvsroot/nice/Nice/src/bossa/parser/Parser.jj,v
retrieving revision 1.330
retrieving revision 1.331
diff -C2 -d -r1.330 -r1.331
*** Parser.jj	25 May 2005 11:52:30 -0000	1.330
--- Parser.jj	18 Jun 2005 13:26:55 -0000	1.331
***************
*** 1944,1953 ****
    [ "package" pkgName=doted_string() ";" ]
    (
!    "import" name=doted_string()
!    ( ".*" { opens.add(name.toString()); }
!      [ "(" "!" ")"
!        { nice.tools.code.Import.addStrictPackage(name.toString()); }
!      ]
!    |      { imports.add(name); }
     )
     ";"
--- 1944,1957 ----
    [ "package" pkgName=doted_string() ";" ]
    (
!    "import"
!    ( "static" doted_string()
!    |
!      name=doted_string()
!      ( ".*" { opens.add(name.toString()); }
!        [ "(" "!" ")"
!          { nice.tools.code.Import.addStrictPackage(name.toString()); }
!        ]
!      | { imports.add(name); }
!      )
     )
     ";"
***************
*** 1956,1965 ****
  }
  
! void readOpens():
! {}
  {
    [ "package" doted_string() ";" ]
    (
!    "import" doted_string() [ ".*" [ "(" "!" ")" ] ]
     ";"
    )*
--- 1960,1975 ----
  }
  
! void readOpens(Module module):
! { LocatedString s; }
  {
    [ "package" doted_string() ";" ]
    (
!    "import"
!    (
!      "static" s=doted_string()
!      { module.addStaticImport(s); }
!    |
!      doted_string() [ ".*" [ "(" "!" ")" ] ]
!    )
     ";"
    )*
***************
*** 1970,1977 ****
   ****************************************************************/
  
! void module(List definitions, boolean storeDocStrings):
  {}
  {
!   readOpens()
    readDefinitions(definitions, storeDocStrings)
  }
--- 1980,1987 ----
   ****************************************************************/
  
! void module(Module module, List definitions, boolean storeDocStrings):
  {}
  {
!   readOpens(module)
    readDefinitions(definitions, storeDocStrings)
  }

Index: JavaccParser.java
===================================================================
RCS file: /cvsroot/nice/Nice/src/bossa/parser/JavaccParser.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** JavaccParser.java	22 Mar 2005 10:55:06 -0000	1.5
--- JavaccParser.java	18 Jun 2005 13:26:55 -0000	1.6
***************
*** 60,64 ****
    }
  
!   public void read(Reader r, List definitions)
    {
      chrono.start();
--- 60,64 ----
    }
  
!   public void read(Reader r, bossa.syntax.Module module, List definitions)
    {
      chrono.start();
***************
*** 68,72 ****
  
        try{
! 	parser.module(definitions, storeDocStrings);
        }
        catch(ParseException e){
--- 68,72 ----
  
        try{
! 	parser.module(module, definitions, storeDocStrings);
        }
        catch(ParseException e){