[Nice-commit] Nice/src/bossa/syntax retypedMethod.nice,1.9,1.10 methodDeclaration.nice,1.5,1.6

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

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

Modified Files:
	retypedMethod.nice methodDeclaration.nice 
Log Message:
Add retypings in the global java scope, so that packages not directly importing
the retyping package do not fail to see the retyped method completely.


Index: methodDeclaration.nice
===================================================================
RCS file: /cvsroot/nice/Nice/src/bossa/syntax/methodDeclaration.nice,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** methodDeclaration.nice	13 Mar 2005 03:24:05 -0000	1.5
--- methodDeclaration.nice	13 Mar 2005 11:38:18 -0000	1.6
***************
*** 46,53 ****
    buildScope(outer, typeOuter)
    {
!     module.scope.addSymbol(symbol);
      super;
    }
  
    public ?mlsub.typing.Polytype getType()
    {
--- 46,58 ----
    buildScope(outer, typeOuter)
    {
!     this.addToScope();
      super;
    }
  
+   void addToScope()
+   {
+     module.scope.addSymbol(symbol);
+   }
+ 
    public ?mlsub.typing.Polytype getType()
    {

Index: retypedMethod.nice
===================================================================
RCS file: /cvsroot/nice/Nice/src/bossa/syntax/retypedMethod.nice,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** retypedMethod.nice	11 Mar 2005 17:35:52 -0000	1.9
--- retypedMethod.nice	13 Mar 2005 11:38:17 -0000	1.10
***************
*** 36,39 ****
--- 36,47 ----
    }
  
+   addToScope()
+   {
+     // Put the symbol in the java scope, so it's available globally,
+     // even to packages that don't import the current one. See testcase.
+     if (! ignoredRetyping)
+       addJavaSymbol(notNull(reflectMethod), this);
+   }
+ 
    isIgnored() = ignoredRetyping;